Merge Apache 5.x Preview to Master #6220

joviegas · 2025-06-30T21:07:12Z

Motivation and Context

Create a new client package with Apache 5.x

Add the Apache 5 client dependency

To begin using the Apache 5 HTTP client implementation, add the following dependency to your project:

<dependency>
    <groupId>software.amazon.awssdk</groupId>
    <artifactId>apache5-client</artifactId>
    <version>2.TO_BE_UPDATED_-PREVIEW</version>
</dependency>

Configure your AWS service client
You can easily configure any AWS service client to use the new AWS SDK Apache 5 HTTP client:

S3Client s3Client = S3Client.builder()
    .httpClient(Apache5HttpClient.create())
    .build();

Advanced configuration example

Apache5HttpClient httpClient = Apache5HttpClient.builder()
    .connectionTimeout(Duration.ofSeconds(30))
    .maxConnections(100)
    .build();

DynamoDbClient dynamoDbClient = DynamoDbClient.builder()
    .httpClient(httpClient)
    .build();

Modifications

New package added
Please refer the commits for individual PRs

Testing

Junits added
Integ test with Make apache5.x as default client if in class path #6190 with Apache5.x as default

Please refer #6206 for relative benchmark comparisons

Screenshots (if appropriate)

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

Checklist

I have read the CONTRIBUTING document
Local run of mvn install succeeds
My code follows the code style of this project
My change requires a change to the Javadoc documentation
I have updated the Javadoc documentation accordingly
I have added tests to cover my changes
All new and existing tests passed
I have added a changelog entry. Adding a new entry must be accomplished by running the scripts/new-change script and following the instructions. Commit the new file created by the script in .changes/next-release with your changes.
My change is to implement 1.11 parity feature and I have updated LaunchChangelog

License

I confirm that this pull request can be released under the Apache 2 license

* Add initial module for Apache5x for seting up package * Add based on new module checklist

…pache5SDKHttpClient (#6088) * Add initial module for Apache5x for seting up package * Add based on new module checklist * Baseline all the classes from Apache4 SDK client to the new Apache5 module

…aring Checkstyles and spotbug issues (#6100) * Phase 2 , getting Apache 5 compilation and Junit ready along with clearing Checkstyles and spotbug issues * Handle comments from review * Handle comments from Zoe

…reamRequestEntity repeatability (#6132) * Fix HTTP authentication retry failures by improving RepeatableInputStreamRequestEntity repeatability * Upated test cases * Handled comments

This reverts commit 64f7d33.

* Fix architecture test failures for apache5.x * Checkstyle issues

…ientConnectionManager for Connection Manager (#6147) * Fix architecture test failures for apache5.x * Checkstyle issues * Update to use PoolingHttpClientConnectionManager class reference that is implementation of HttpClientConnectionManager

…6154) * Fix architecture test failures for apache5.x * Checkstyle issues * Update to use PoolingHttpClientConnectionManager class reference that is implementation of HttpClientConnectionManager * Fix stream reset failure in RepeatableInputStreamRequestEntity by storing content reference to avoid multiple ContentStreamProvider.newStream() calls that cause IOException when retrying requests with non-resettable streams * writeTo_ConcurrentWrites_HandlesCorrectly no longer needed since even Apache 4.x doesnot suports this

…zil.json (#6191) * Fix architecture test failures for apache5.x * Checkstyle issues * Update to use PoolingHttpClientConnectionManager class reference that is implementation of HttpClientConnectionManager * Fix stream reset failure in RepeatableInputStreamRequestEntity by storing content reference to avoid multiple ContentStreamProvider.newStream() calls that cause IOException when retrying requests with non-resettable streams * writeTo_ConcurrentWrites_HandlesCorrectly no longer needed since even Apache 4.x doesnot suports this * Fix connectionPoolingWorks by setting skipping setConnectionTimeToLive is value is set to 0 since 0 is treated as Infinite timeToLive in Sdk and Apache 4.x but treated as immediate closeConnection in apache 5.x * disableAutomaticRetries in Apache 5.x since SDK handles retries , also define Apache5 dependencies in .brazil.json * Added Test case for Async , handled review ocmments

…-v2 into feature/master/apache5x

* Fix architecture test failures for apache5.x * Checkstyle issues * Update to use PoolingHttpClientConnectionManager class reference that is implementation of HttpClientConnectionManager * Fix stream reset failure in RepeatableInputStreamRequestEntity by storing content reference to avoid multiple ContentStreamProvider.newStream() calls that cause IOException when retrying requests with non-resettable streams * writeTo_ConcurrentWrites_HandlesCorrectly no longer needed since even Apache 4.x doesnot suports this * Fix connectionPoolingWorks by setting skipping setConnectionTimeToLive is value is set to 0 since 0 is treated as Infinite timeToLive in Sdk and Apache 4.x but treated as immediate closeConnection in apache 5.x * disableAutomaticRetries in Apache 5.x since SDK handles retries , also define Apache5 dependencies in .brazil.json * Added Test case for Async , handled review ocmments * Donot do buffer the response using BufferedHttpEntity since it might cause memory issue, this behaviour is same as Apache4.x * Fix compilation issues * Fix checkstyle issues * Remove test which are specific to apache http

* Fix architecture test failures for apache5.x * Checkstyle issues * Update to use PoolingHttpClientConnectionManager class reference that is implementation of HttpClientConnectionManager * Fix stream reset failure in RepeatableInputStreamRequestEntity by storing content reference to avoid multiple ContentStreamProvider.newStream() calls that cause IOException when retrying requests with non-resettable streams * writeTo_ConcurrentWrites_HandlesCorrectly no longer needed since even Apache 4.x doesnot suports this * Fix connectionPoolingWorks by setting skipping setConnectionTimeToLive is value is set to 0 since 0 is treated as Infinite timeToLive in Sdk and Apache 4.x but treated as immediate closeConnection in apache 5.x * disableAutomaticRetries in Apache 5.x since SDK handles retries , also define Apache5 dependencies in .brazil.json * Added Test case for Async , handled review ocmments * Donot do buffer the response using BufferedHttpEntity since it might cause memory issue, this behaviour is same as Apache4.x * Fix compilation issues * Fix checkstyle issues * Remove test which are specific to apache http * Add benchmark for Apache5 and add Streaming Api test cases

… alternatives (#6211) * Clean up unused APIs and add test to make sure it can be handled with alternatives * Added NTCredentials to keep backward compatibilty with Apache4.x

… version (#6214) * Fix architecture test failures for apache5.x * Checkstyle issues * Update to use PoolingHttpClientConnectionManager class reference that is implementation of HttpClientConnectionManager * Fix stream reset failure in RepeatableInputStreamRequestEntity by storing content reference to avoid multiple ContentStreamProvider.newStream() calls that cause IOException when retrying requests with non-resettable streams * writeTo_ConcurrentWrites_HandlesCorrectly no longer needed since even Apache 4.x doesnot suports this * Fix connectionPoolingWorks by setting skipping setConnectionTimeToLive is value is set to 0 since 0 is treated as Infinite timeToLive in Sdk and Apache 4.x but treated as immediate closeConnection in apache 5.x * disableAutomaticRetries in Apache 5.x since SDK handles retries , also define Apache5 dependencies in .brazil.json * Added Test case for Async , handled review ocmments * Donot do buffer the response using BufferedHttpEntity since it might cause memory issue, this behaviour is same as Apache4.x * Fix compilation issues * Fix checkstyle issues * Remove test which are specific to apache http * Add benchmark for Apache5 and add Streaming Api test cases * Update Apache5 to 5.5

...ents/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java

http-clients/apache5-client/pom.xml

...ents/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java

...c/main/java/software/amazon/awssdk/http/apache5/internal/impl/Apache5HttpRequestFactory.java

...ain/resources/META-INF/native-image/software.amazon.awssdk/apache-client/reflect-config.json

) * Updated Version as -PREVIEW * japi cmp needs to be disables since this is a new version and we dont have old version to compare

* Handled Surface API review comments * Added a single test for localaddress , handled review comments * Removing internal package name as -preview after internal discussion * Fix transient text case failures

* Handled Surface API review comments * Added a single test for localaddress , handled review comments * Removing internal package name as -preview after internal discussion * Fix transient text case failures * Handled comment for merge to master PR for apache 5.x

dagnir · 2025-07-14T21:22:42Z

...ache5-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService

@@ -0,0 +1,46 @@
+#


Multiple copies of the license header here

Removed it now , this got copied over while migrating from https://github.com/aws/aws-sdk-java-v2/blob/master/http-clients/apache-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService

zoewangg · 2025-07-14T21:15:43Z

pom.xml

@@ -823,7 +824,7 @@
                <spotbugs.skip>true</spotbugs.skip>
                <skip.unit.tests>true</skip.unit.tests>
                <mdep.analyze.skip>true</mdep.analyze.skip>
-                <japicmp.skip>true</japicmp.skip>
+                <japicmp.skip>false</japicmp.skip>


Is there any reason this was changed to false?

Since its a preview version and can have backward incompatible changes i had changed it to false, I can move it to true and update whenever backward incompatible changes are added

Hmm, this is specifically for quick profile, right? japicmp is an opt-in check anyway, so it's not enabled for apache http client 5 if it's not in includedModules

oh my bad , I got it... I got confused with includedModules I think I enabled it to do a quick check locally and forgot to turn if off, Thanks Zoe

zoewangg · 2025-07-14T21:34:55Z

.changes/next-release/feature-AWSSDKforJavav2-65d4de2.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",


nit: Apache HTTP Client 5?

I was thinking since Apache HTTP Client 5 did not exist yet and we are introducing a new feature in "AWS SDK for Java v2" I added category as "AWS SDK for Java v2"
Will change this to Apache HTTP Client 5

sonarqubecloud · 2025-07-14T23:55:50Z

Quality Gate failed

Failed conditions
62.9% Coverage on New Code (required ≥ 80%)
19.1% Duplication on New Code (required ≤ 3%)
B Security Rating on New Code (required ≥ A)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

github-actions · 2025-07-15T00:48:29Z

This pull request has been closed and the conversation has been locked. Comments on closed PRs are hard for our team to see. If you need more assistance, please open a new issue that references this one.

joviegas and others added 30 commits April 30, 2025 08:27

Add initial empty module for Apache5x for seting up package (#6075)

f3fc974

* Add initial module for Apache5x for seting up package * Add based on new module checklist

Baseline or Copy all the ApacheSDKHttpClient classes to newly added A…

5092cc4

…pache5SDKHttpClient (#6088) * Add initial module for Apache5x for seting up package * Add based on new module checklist * Baseline all the classes from Apache4 SDK client to the new Apache5 module

Phase 2 , getting Apache 5 compilation and Junit ready along with cle…

6e9939f

…aring Checkstyles and spotbug issues (#6100) * Phase 2 , getting Apache 5 compilation and Junit ready along with clearing Checkstyles and spotbug issues * Handle comments from review * Handle comments from Zoe

Merge branch 'master' into feature/master/apache5x

4dda3f7

Update the snap shot

3053d09

Fix HTTP authentication retry failures by improving RepeatableInputSt…

985ca35

…reamRequestEntity repeatability (#6132) * Fix HTTP authentication retry failures by improving RepeatableInputStreamRequestEntity repeatability * Upated test cases * Handled comments

Merge branch 'master' into feature/master/apache5x

b97c9da

Updated snap shot after merge from master

64f7d33

Revert "Updated snap shot after merge from master"

24438e8

This reverts commit 64f7d33.

Updated snap shot after merge from master

62150d6

Fix architecture test failures for apache5.x (#6140)

fbfb70f

* Fix architecture test failures for apache5.x * Checkstyle issues

Merge branch 'master' into feature/master/apache5x

3c4433c

Updated snap shot after merge from master

6d8b5f4

Merge branch 'master' into feature/master/apache5x

0bdf878

Merge branch 'master' into feature/master/apache5x

4671831

Merge branch 'master' into feature/master/apache5x

2f72282

Merge PR#6165 #6165

79f6f0f

Merge branch 'master' into feature/master/apache5x

716a6db

Update snapshots

09e8ee4

Merge branch 'feature/master/apache5x' of github.com:aws/aws-sdk-java…

ad30c25

…-v2 into feature/master/apache5x

Merge branch 'master' into feature/master/apache5x

959605c

Merge from master

a959581

Clean up unused APIs and add test to make sure it can be handled with…

3cc94bb

… alternatives (#6211) * Clean up unused APIs and add test to make sure it can be handled with alternatives * Added NTCredentials to keep backward compatibilty with Apache4.x

Merge branch 'master' into feature/master/apache5x

45f630d

joviegas added 3 commits June 30, 2025 10:20

Merge branch 'master' into feature/master/apache5x

bb372da

Updated the snapshot

d336053

Updated thr Brazil package nma e to have preview as suffix

397f330

joviegas requested a review from a team as a code owner June 30, 2025 21:07

github-advanced-security bot found potential problems Jun 30, 2025

View reviewed changes

...ents/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java Dismissed Show resolved Hide resolved

zoewangg reviewed Jul 1, 2025

View reviewed changes

joviegas and others added 4 commits July 1, 2025 10:06

Updated Version as -PREVIEW to release apache5 as preview release (#6219

a21356a

) * Updated Version as -PREVIEW * japi cmp needs to be disables since this is a new version and we dont have old version to compare

Handled Surface API review comments (#6224)

4aa1fdb

* Handled Surface API review comments * Added a single test for localaddress , handled review comments * Removing internal package name as -preview after internal discussion * Fix transient text case failures

Merge branch 'master' into feature/master/apache5x

198a814

update pom.xml for apache5.x

661b152

joviegas mentioned this pull request Jul 8, 2025

Handled commed for merge to master PR 6220 #6240

Merged

1 task

joviegas and others added 2 commits July 8, 2025 15:18

Merge branch 'master' into feature/master/apache5x

7a7e4cd

joviegas force-pushed the feature/master/apache5x branch from 12b025c to 7a7e4cd Compare July 10, 2025 15:25

Added change logs

6383c44

joviegas added the api-surface-area-approved-by-team Indicate API surface area introduced by this PR has been approved by team label Jul 10, 2025

Merge branch 'master' into feature/master/apache5x

ee93292

dagnir requested changes Jul 14, 2025

View reviewed changes

Review comment

061b5fb

dagnir approved these changes Jul 14, 2025

View reviewed changes

zoewangg approved these changes Jul 14, 2025

View reviewed changes

joviegas added 2 commits July 14, 2025 16:08

Handled Review comments

f26f7bb

Merge branch 'master' into feature/master/apache5x

dfcfdcb

joviegas enabled auto-merge July 14, 2025 23:18

joviegas added this pull request to the merge queue Jul 14, 2025

Merged via the queue into master with commit 3fb3881 Jul 15, 2025
34 of 36 checks passed

github-actions bot locked as resolved and limited conversation to collaborators Jul 15, 2025

Merge Apache 5.x Preview to Master #6220

Merge Apache 5.x Preview to Master #6220

Uh oh!

Conversation

joviegas commented Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation and Context

Modifications

Testing

Screenshots (if appropriate)

Types of changes

Checklist

License

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jul 14, 2025

Quality Gate failed

Uh oh!

Uh oh!

github-actions bot commented Jul 15, 2025

Uh oh!

Uh oh!

joviegas commented Jun 30, 2025 •

edited

Loading