configurable protocol version for HTTP clients

commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/CtApacheHttpClient.java

@@ -51,10 +51,13 @@ public static HttpAsyncClientBuilder createClientBuilder(AsyncClientConnectionMa
 
     public static PoolingAsyncClientConnectionManagerBuilder createConnectionManager(final int maxConnTotal,
             final int maxConnPerRoute) {
+        return createConnectionManager(HttpVersionPolicy.NEGOTIATE, maxConnTotal, maxConnPerRoute);
+    }
+
+    public static PoolingAsyncClientConnectionManagerBuilder createConnectionManager(
+            final HttpVersionPolicy httpVersionPolicy, final int maxConnTotal, final int maxConnPerRoute) {
         final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create().useSystemProperties().build();
-        final TlsConfig tlsConfig = TlsConfig.copy(TlsConfig.DEFAULT)
-                .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
-                .build();
+        final TlsConfig tlsConfig = TlsConfig.copy(TlsConfig.DEFAULT).setVersionPolicy(httpVersionPolicy).build();
         return PoolingAsyncClientConnectionManagerBuilder.create()
                 .setMaxConnPerRoute(maxConnPerRoute)
                 .setMaxConnTotal(maxConnTotal)
@@ -74,12 +77,27 @@ public CtApacheHttpClient() {
         init();
     }
 
+    public CtApacheHttpClient(final HttpVersionPolicy versionPolicy) {
+        super();
+        apacheHttpClient = createClientBuilder(
+            createConnectionManager(versionPolicy, MAX_REQUESTS, MAX_REQUESTS).build()).build();
+        init();
+    }
+
     public CtApacheHttpClient(final int maxConnTotal, final int maxConnPerRoute) {
         super();
         apacheHttpClient = createClientBuilder(createConnectionManager(maxConnTotal, maxConnPerRoute).build()).build();
         init();
     }
 
+    public CtApacheHttpClient(final HttpVersionPolicy versionPolicy, final int maxConnTotal,
+            final int maxConnPerRoute) {
+        super();
+        apacheHttpClient = createClientBuilder(
+            createConnectionManager(versionPolicy, maxConnTotal, maxConnPerRoute).build()).build();
+        init();
+    }
+
     public CtApacheHttpClient(final BuilderOptions options) {
         super();
         apacheHttpClient = options.plus(clientBuilder.get()).build();
@@ -94,6 +112,16 @@ public CtApacheHttpClient(final int maxConnTotal, final int maxConnPerRoute, fin
         init();
     }
 
+    public CtApacheHttpClient(final HttpVersionPolicy versionPolicy, final int maxConnTotal, final int maxConnPerRoute,
+            final BuilderOptions options) {
+        super();
+        apacheHttpClient = options
+                .plus(
+                    createClientBuilder(createConnectionManager(versionPolicy, maxConnTotal, maxConnPerRoute).build()))
+                .build();
+        init();
+    }
+
     public CtApacheHttpClient(final Supplier<HttpAsyncClientBuilder> builderSupplier) {
         super();
         apacheHttpClient = builderSupplier.get().build();
@@ -112,6 +140,14 @@ public CtApacheHttpClient(final ExecutorService executor, final int maxConnTotal
         init();
     }
 
+    public CtApacheHttpClient(final ExecutorService executor, final HttpVersionPolicy versionPolicy,
+            final int maxConnTotal, final int maxConnPerRoute) {
+        super(executor);
+        apacheHttpClient = createClientBuilder(
+            createConnectionManager(versionPolicy, maxConnTotal, maxConnPerRoute).build()).build();
+        init();
+    }
+
     public CtApacheHttpClient(final ExecutorService executor, final BuilderOptions options) {
         super(executor);
         apacheHttpClient = options.plus(clientBuilder.get()).build();
@@ -127,6 +163,16 @@ public CtApacheHttpClient(final ExecutorService executor, final int maxConnTotal
         init();
     }
 
+    public CtApacheHttpClient(final ExecutorService executor, final HttpVersionPolicy versionPolicy,
+            final int maxConnTotal, final int maxConnPerRoute, final BuilderOptions options) {
+        super(executor);
+        apacheHttpClient = options
+                .plus(
+                    createClientBuilder(createConnectionManager(versionPolicy, maxConnTotal, maxConnPerRoute).build()))
+                .build();
+        init();
+    }
+
     public CtApacheHttpClient(final ExecutorService executor, final Supplier<HttpAsyncClientBuilder> builderSupplier) {
         super(executor);
         apacheHttpClient = builderSupplier.get().build();

commercetools/commercetools-async-http-client/src/main/java/com/commercetools/http/asynchttp/AsyncHttpClientSolutionInfo.java

@@ -2,13 +2,13 @@
 package com.commercetools.http.asynchttp;
 
 import io.vrap.rmf.base.client.SolutionInfo;
-import io.vrap.rmf.base.client.VersionLoader;
+
+import org.asynchttpclient.config.AsyncHttpClientConfigDefaults;
 
 public class AsyncHttpClientSolutionInfo extends SolutionInfo {
 
     public AsyncHttpClientSolutionInfo() {
         setName("AsyncHttpAsyncClient");
-        setVersion(VersionLoader.loadVersionInfo("org.asynchttpclient", "async-http-client", "pom.properties",
-            "version", this.getClass().getClassLoader()));
+        setVersion(AsyncHttpClientConfigDefaults.AHC_VERSION);
     }
 }

commercetools/commercetools-javanet-client/src/main/java/com/commercetools/http/javanet/CtJavaNetHttpClient.java

@@ -30,6 +30,11 @@ public CtJavaNetHttpClient() {
         javaHttpClient = clientBuilder.get().build();
     }
 
+    public CtJavaNetHttpClient(HttpClient.Version version) {
+        super();
+        javaHttpClient = clientBuilder.get().version(version).build();
+    }
+
     public CtJavaNetHttpClient(final BuilderOptions options) {
         super();
         javaHttpClient = options.plus(clientBuilder.get()).build();

commercetools/commercetools-reactornetty-client/src/main/java/com/commercetools/http/netty/CtNettyHttpClient.java

@@ -25,6 +25,7 @@
 import reactor.core.publisher.Mono;
 import reactor.netty.ByteBufMono;
 import reactor.netty.NettyOutbound;
+import reactor.netty.http.HttpProtocol;
 import reactor.netty.http.client.HttpClient;
 import reactor.netty.http.client.HttpClientRequest;
 import reactor.netty.http.client.HttpClientResponse;
@@ -41,12 +42,22 @@ public CtNettyHttpClient() {
         this(MAX_REQUESTS);
     }
 
-    public CtNettyHttpClient(int maxConnections) {
+    public CtNettyHttpClient(HttpProtocol protocol) {
+        this(protocol, MAX_REQUESTS);
+    }
+
+    public CtNettyHttpClient(final int maxConnections) {
         super();
         this.nettyClient = createDefaultClient(maxConnections);
         this.nettyClient.warmup();
     }
 
+    public CtNettyHttpClient(final HttpProtocol protocol, final int maxConnections) {
+        super();
+        this.nettyClient = createDefaultClient(protocol, maxConnections);
+        this.nettyClient.warmup();
+    }
+
     public CtNettyHttpClient(final BuilderOptions options) {
         this(MAX_REQUESTS, options);
     }
@@ -73,6 +84,12 @@ public CtNettyHttpClient(final ExecutorService executor, final int maxConnection
         this.nettyClient.warmup();
     }
 
+    public CtNettyHttpClient(final ExecutorService executor, final HttpProtocol protocol, final int maxConnections) {
+        super(executor);
+        this.nettyClient = createDefaultClient(protocol, maxConnections);
+        this.nettyClient.warmup();
+    }
+
     public CtNettyHttpClient(final ExecutorService executor, final BuilderOptions options) {
         this(executor, MAX_REQUESTS, options);
     }
@@ -83,6 +100,13 @@ public CtNettyHttpClient(final ExecutorService executor, final int maxConnection
         this.nettyClient.warmup();
     }
 
+    public CtNettyHttpClient(final ExecutorService executor, final HttpProtocol protocol, final int maxConnections,
+            final BuilderOptions options) {
+        super(executor);
+        this.nettyClient = options.plus(createDefaultClient(protocol, maxConnections));
+        this.nettyClient.warmup();
+    }
+
     public CtNettyHttpClient(final ExecutorService executor, final Supplier<HttpClient> httpClientSupplier) {
         super(executor);
         this.nettyClient = httpClientSupplier.get();
@@ -97,6 +121,10 @@ public static HttpClient createDefaultClient(final int maxConnections) {
                 .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 10000);
     }
 
+    public static HttpClient createDefaultClient(final HttpProtocol httpProtocol, final int maxConnections) {
+        return createDefaultClient(maxConnections).protocol(httpProtocol);
+    }
+
     @Override
     public CompletableFuture<ApiHttpResponse<byte[]>> execute(ApiHttpRequest request) {
         final HttpMethod method = HttpMethod.valueOf(request.getMethod().name());