Make apache5.x as default client if in class path

Author: joviegas

core/aws-core/pom.xml

@@ -191,6 +191,12 @@
             <version>${awsjavasdk.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache5-client</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

core/sdk-core/pom.xml

@@ -112,6 +112,12 @@
             <version>${awsjavasdk.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache5-client</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java

@@ -38,9 +38,10 @@ final class ClasspathSdkHttpServiceProvider<T> implements SdkHttpServiceProvider
 
     static final Map<String, Integer> SYNC_HTTP_SERVICES_PRIORITY =
         ImmutableMap.<String, Integer>builder()
-                    .put("software.amazon.awssdk.http.apache.ApacheSdkHttpService", 1)
-                    .put("software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService", 2)
-                    .put("software.amazon.awssdk.http.crt.AwsCrtSdkHttpService", 3)
+                    .put("software.amazon.awssdk.http.apache5.Apache5SdkHttpService", 1)
+                    .put("software.amazon.awssdk.http.apache.ApacheSdkHttpService", 2)
+                    .put("software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService", 3)
+                    .put("software.amazon.awssdk.http.crt.AwsCrtSdkHttpService", 4)
                     .build();
 
     static final Map<String, Integer> ASYNC_HTTP_SERVICES_PRIORITY =

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

@@ -166,7 +166,9 @@ private ConnectionManagerAwareHttpClient createClient(Apache5HttpClient.DefaultB
                .setUserAgent("") // SDK will set the user agent header in the pipeline. Don't let Apache waste time
                .setConnectionManager(ClientConnectionManagerFactory.wrap(cm))
                //This is done to keep backward compatibility with Apache 4.x
-               .disableRedirectHandling();
+               .disableRedirectHandling()
+               // SDK handle retries , this we do not need the http clients to handle the reties by itself
+               .disableAutomaticRetries();
 
         addProxyConfig(builder, configuration);
 

services/pom.xml

@@ -516,6 +516,12 @@
             <version>${awsjavasdk.version}</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <artifactId>apache5-client</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <artifactId>netty-nio-client</artifactId>
             <groupId>software.amazon.awssdk</groupId>

test/codegen-generated-classes-test/pom.xml

@@ -235,6 +235,12 @@
             <version>${awsjavasdk.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache5-client</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

test/module-path-tests/pom.xml

@@ -59,6 +59,11 @@
             <artifactId>apache-client</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache5-client</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>netty-nio-client</artifactId>

test/protocol-tests/pom.xml

@@ -93,6 +93,12 @@
             <version>${awsjavasdk.version}</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache5-client</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>http-client-spi</artifactId>

test/sdk-benchmarks/pom.xml

@@ -158,6 +158,11 @@
             <artifactId>apache-client</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache5-client</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>protocol-tests</artifactId>

test/sdk-native-image-test/pom.xml

@@ -67,6 +67,11 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache5-client</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>