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

Modifications

New apckage added

Testing

Junits added

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

* 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 * Preview ready , addressing open TODOs * Added PublicApi since checkstyle was failing

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

+            try {
+                SSLContext sslcontext = SSLContext.getInstance("TLS");
+                // http://download.java.net/jdk9/docs/technotes/guides/security/jsse/JSSERefGuide.html
+                sslcontext.init(keyManagers, trustManagers, null);


zoewangg · 2025-06-30T21:10:28Z

http-clients/apache5-client/pom.xml

+    <dependency>
+        <groupId>org.apache.httpcomponents.client5</groupId>
+        <artifactId>httpclient5</artifactId>
+        <version>5.5</version>


Can we define this in bom-internal so that it's easier to manage?

zoewangg · 2025-06-30T21:10:32Z

http-clients/apache5-client/pom.xml

+    <dependency>
+        <groupId>org.apache.httpcomponents.core5</groupId>
+        <artifactId>httpcore5</artifactId>
+        <version>5.3.4</version>


zoewangg · 2025-06-30T21:11:10Z

http-clients/apache5-client/pom.xml

+    <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-all</artifactId>
+        <scope>test</scope>


Is there any reason we are using hamcrest? assertJ is preferred

zoewangg · 2025-06-30T21:11:43Z

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

+@SdkPublicApi
+public final class Apache5HttpClient implements SdkHttpClient {
+
+    public static final String CLIENT_NAME = "Apache5";


zoewangg · 2025-06-30T22:06:32Z

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

+
+        public PoolingHttpClientConnectionManager create(Apache5HttpClient.DefaultBuilder configuration,
+                                                  AttributeMap standardOptions) {
+            // TODO : Deprecated method needs to be removed with new replacements


Any plans to address this?

zoewangg · 2025-06-30T22:08:00Z

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

+            Duration connectionTtl = standardOptions.get(SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE);
+            if (!connectionTtl.isZero()) {
+                // Skip TTL=0 to maintain backward compatibility (infinite in 4.x vs immediate expiration in 5.x)
+                builder.setConnectionTimeToLive(TimeValue.of(connectionTtl.toMillis(), TimeUnit.MILLISECONDS));


setConnectionTimeToLive also seems to be deprecated, should we use setDefaultConnectionConfig instead?

zoewangg · 2025-06-30T22:09:48Z

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

+            cm.setDefaultMaxPerRoute(standardOptions.get(SdkHttpConfigurationOption.MAX_CONNECTIONS));
+            cm.setMaxTotal(standardOptions.get(SdkHttpConfigurationOption.MAX_CONNECTIONS));
+            cm.setDefaultSocketConfig(buildSocketConfig(standardOptions));


Seems a bit odd that we are configuring them after PoolingHttpClientConnectionManager has been built. Can we configure them before line 710?

zoewangg · 2025-06-30T22:15:31Z

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

+        return request.getUri();
+    }
+
+    private void addRequestConfig(HttpUriRequestBase base,


Do we need to disable uri normalization as we did in 4.x?

zoewangg · 2025-07-01T00:21:06Z

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

@@ -0,0 +1,43 @@
+[
+  {
+    "name": "import software.amazon.awssdk.http.apache5.ApacheSdkHttpService",


This needs to be updated

zoewangg · 2025-07-01T00:21:19Z

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

+    "name": "org.apache.http.client.config.RequestConfig$Builder",
+    "methods": [
+      {
+        "name": "setNormalizeUri"


Don't think setNormalizeUri is used

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

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 and others added 4 commits June 30, 2025 09:23

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

zoewangg reviewed Jul 1, 2025

View reviewed changes

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge Apache 5.x Preview to Master #6220

Merge Apache 5.x Preview to Master #6220

joviegas commented Jun 30, 2025

Uh oh!

Check failure

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jun 30, 2025

Uh oh!

zoewangg Jul 1, 2025

Uh oh!

zoewangg Jul 1, 2025

Uh oh!

Uh oh!

Merge Apache 5.x Preview to Master #6220

Are you sure you want to change the base?

Merge Apache 5.x Preview to Master #6220

Conversation

joviegas commented Jun 30, 2025

Motivation and Context

Modifications

Testing

Screenshots (if appropriate)

Types of changes

Checklist

License

Uh oh!

Check failure

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!

Choose a reason for hiding this comment

Uh oh!

Uh oh!