Merge pull request #773 from commercetools/upgrade_httpasyncclient

jenschude · web-flow · commit d157f9a04a9c · 2024-12-19T10:57:20.000+01:00
Update Apache AsyncHttpClient
diff --git a/commercetools/commercetools-apachehttp-client/build.gradle b/commercetools/commercetools-apachehttp-client/build.gradle
@@ -1,9 +1,9 @@
 
 dependencies {
     api project(":rmf:rmf-java-base")
-    api "org.apache.httpcomponents.client5:httpclient5:5.3.1" version {
-        strictly "[5.0,6.0["
-        prefer "5.1.3"
+    api "org.apache.httpcomponents.client5:httpclient5:5.4.1" version {
+        strictly "[5.4.1,6.0["
+        prefer "5.4.1"
     }
 
     api commons.io version commons.io_version
diff --git a/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java b/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java
@@ -0,0 +1,13 @@
+
+package com.commercetools.http.apachehttp;
+
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.core5.util.VersionInfo;
+
+public class ApacheHttpClientSolutionInfo extends io.vrap.rmf.base.client.SolutionInfo {
+    public ApacheHttpClientSolutionInfo() {
+        setName("ApacheHttpAsyncClient");
+        setVersion(
+            VersionInfo.loadVersionInfo("org.apache.hc.client5", HttpClient.class.getClassLoader()).getRelease());
+    }
+}
diff --git a/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java b/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java
@@ -19,6 +19,7 @@
 import org.apache.hc.client5.http.async.methods.SimpleBody;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.async.methods.SimpleResponseConsumer;
+import org.apache.hc.client5.http.config.TlsConfig;
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
@@ -32,7 +33,6 @@
 import org.apache.hc.core5.http.nio.support.AsyncRequestBuilder;
 import org.apache.hc.core5.http2.HttpVersionPolicy;
 import org.apache.hc.core5.reactor.IOReactorStatus;
-import org.apache.hc.core5.reactor.ssl.TlsDetails;
 
 public class CtApacheHttpClient extends HttpClientBase {
     public static final int MAX_REQUESTS = 64;
@@ -46,19 +46,19 @@ public static HttpAsyncClientBuilder createClientBuilder() {
     }
 
     public static HttpAsyncClientBuilder createClientBuilder(AsyncClientConnectionManager cm) {
-        return HttpAsyncClientBuilder.create().setVersionPolicy(HttpVersionPolicy.NEGOTIATE).setConnectionManager(cm);
+        return HttpAsyncClientBuilder.create().setConnectionManager(cm);
     }
 
     public static PoolingAsyncClientConnectionManagerBuilder createConnectionManager(final int maxConnTotal,
             final int maxConnPerRoute) {
-        final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
-                .useSystemProperties()
-                .setTlsDetailsFactory(
-                    sslEngine -> new TlsDetails(sslEngine.getSession(), sslEngine.getApplicationProtocol()))
+        final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create().useSystemProperties().build();
+        final TlsConfig tlsConfig = TlsConfig.copy(TlsConfig.DEFAULT)
+                .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
                 .build();
         return PoolingAsyncClientConnectionManagerBuilder.create()
                 .setMaxConnPerRoute(maxConnPerRoute)
                 .setMaxConnTotal(maxConnTotal)
+                .setDefaultTlsConfig(tlsConfig)
                 .setTlsStrategy(tlsStrategy);
     }
 
diff --git a/commercetools/commercetools-apachehttp-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo b/commercetools/commercetools-apachehttp-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo
@@ -0,0 +1 @@
+com.commercetools.http.apachehttp.ApacheHttpClientSolutionInfo
diff --git a/licenses/commercetools-apachehttp-client/index.json b/licenses/commercetools-apachehttp-client/index.json
@@ -78,19 +78,6 @@
                 }
             ]
         },
-        {
-            "moduleName": "commons-codec:commons-codec",
-            "moduleVersion": "1.15",
-            "moduleUrls": [
-                "https://commons.apache.org/proper/commons-codec/"
-            ],
-            "moduleLicenses": [
-                {
-                    "moduleLicense": "Apache License, Version 2.0",
-                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
-                }
-            ]
-        },
         {
             "moduleName": "commons-io:commons-io",
             "moduleVersion": "2.11.0",
@@ -155,7 +142,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.client5:httpclient5",
-            "moduleVersion": "5.1.3",
+            "moduleVersion": "5.4.1",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -165,7 +152,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5",
-            "moduleVersion": "5.1.3",
+            "moduleVersion": "5.3.1",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -175,7 +162,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5-h2",
-            "moduleVersion": "5.1.3",
+            "moduleVersion": "5.3.1",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
diff --git a/licenses/index.json b/licenses/index.json
@@ -563,19 +563,6 @@
                 }
             ]
         },
-        {
-            "moduleName": "commons-codec:commons-codec",
-            "moduleVersion": "1.15",
-            "moduleUrls": [
-                "https://commons.apache.org/proper/commons-codec/"
-            ],
-            "moduleLicenses": [
-                {
-                    "moduleLicense": "Apache License, Version 2.0",
-                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
-                }
-            ]
-        },
         {
             "moduleName": "commons-io:commons-io",
             "moduleVersion": "2.11.0",
@@ -1220,7 +1207,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.client5:httpclient5",
-            "moduleVersion": "5.1.3",
+            "moduleVersion": "5.4.1",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -1230,7 +1217,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5",
-            "moduleVersion": "5.1.3",
+            "moduleVersion": "5.3.1",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -1240,7 +1227,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5-h2",
-            "moduleVersion": "5.1.3",
+            "moduleVersion": "5.3.1",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+com.commercetools.http.apachehttp.ApacheHttpClientSolutionInfo`
Original file line number	Diff line number	Diff line change
`@@ -78,19 +78,6 @@`
`78`	`78`	`}`
`79`	`79`	`]`
`80`	`80`	`},`
`81`		`- {`
`82`		`- "moduleName": "commons-codec:commons-codec",`
`83`		`- "moduleVersion": "1.15",`
`84`		`- "moduleUrls": [`
`85`		`- "https://commons.apache.org/proper/commons-codec/"`
`86`		`- ],`
`87`		`- "moduleLicenses": [`
`88`		`- {`
`89`		`- "moduleLicense": "Apache License, Version 2.0",`
`90`		`- "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"`
`91`		`- }`
`92`		`- ]`
`93`		`- },`
`94`	`81`	`{`
`95`	`82`	`"moduleName": "commons-io:commons-io",`
`96`	`83`	`"moduleVersion": "2.11.0",`
`@@ -155,7 +142,7 @@`
`155`	`142`	`},`
`156`	`143`	`{`
`157`	`144`	`"moduleName": "org.apache.httpcomponents.client5:httpclient5",`
`158`		`- "moduleVersion": "5.1.3",`
	`145`	`+ "moduleVersion": "5.4.1",`
`159`	`146`	`"moduleLicenses": [`
`160`	`147`	`{`
`161`	`148`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -165,7 +152,7 @@`
`165`	`152`	`},`
`166`	`153`	`{`
`167`	`154`	`"moduleName": "org.apache.httpcomponents.core5:httpcore5",`
`168`		`- "moduleVersion": "5.1.3",`
	`155`	`+ "moduleVersion": "5.3.1",`
`169`	`156`	`"moduleLicenses": [`
`170`	`157`	`{`
`171`	`158`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -175,7 +162,7 @@`
`175`	`162`	`},`
`176`	`163`	`{`
`177`	`164`	`"moduleName": "org.apache.httpcomponents.core5:httpcore5-h2",`
`178`		`- "moduleVersion": "5.1.3",`
	`165`	`+ "moduleVersion": "5.3.1",`
`179`	`166`	`"moduleLicenses": [`
`180`	`167`	`{`
`181`	`168`	`"moduleLicense": "Apache License, Version 2.0",`
Original file line number	Diff line number	Diff line change
`@@ -563,19 +563,6 @@`
`563`	`563`	`}`
`564`	`564`	`]`
`565`	`565`	`},`
`566`		`- {`
`567`		`- "moduleName": "commons-codec:commons-codec",`
`568`		`- "moduleVersion": "1.15",`
`569`		`- "moduleUrls": [`
`570`		`- "https://commons.apache.org/proper/commons-codec/"`
`571`		`- ],`
`572`		`- "moduleLicenses": [`
`573`		`- {`
`574`		`- "moduleLicense": "Apache License, Version 2.0",`
`575`		`- "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"`
`576`		`- }`
`577`		`- ]`
`578`		`- },`
`579`	`566`	`{`
`580`	`567`	`"moduleName": "commons-io:commons-io",`
`581`	`568`	`"moduleVersion": "2.11.0",`
`@@ -1220,7 +1207,7 @@`
`1220`	`1207`	`},`
`1221`	`1208`	`{`
`1222`	`1209`	`"moduleName": "org.apache.httpcomponents.client5:httpclient5",`
`1223`		`- "moduleVersion": "5.1.3",`
	`1210`	`+ "moduleVersion": "5.4.1",`
`1224`	`1211`	`"moduleLicenses": [`
`1225`	`1212`	`{`
`1226`	`1213`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -1230,7 +1217,7 @@`
`1230`	`1217`	`},`
`1231`	`1218`	`{`
`1232`	`1219`	`"moduleName": "org.apache.httpcomponents.core5:httpcore5",`
`1233`		`- "moduleVersion": "5.1.3",`
	`1220`	`+ "moduleVersion": "5.3.1",`
`1234`	`1221`	`"moduleLicenses": [`
`1235`	`1222`	`{`
`1236`	`1223`	`"moduleLicense": "Apache License, Version 2.0",`
`@@ -1240,7 +1227,7 @@`
`1240`	`1227`	`},`
`1241`	`1228`	`{`
`1242`	`1229`	`"moduleName": "org.apache.httpcomponents.core5:httpcore5-h2",`
`1243`		`- "moduleVersion": "5.1.3",`
	`1230`	`+ "moduleVersion": "5.3.1",`
`1244`	`1231`	`"moduleLicenses": [`
`1245`	`1232`	`{`
`1246`	`1233`	`"moduleLicense": "Apache License, Version 2.0",`