Revert "Revert "feat(tls): allow disabling protocol upgrade (Adyen#1409…

…)" (Adyen#1414)" This reverts commit cc52b02.
sp00m · Feb 3, 2025 · eb38bb0 · eb38bb0
1 parent d9f9b11
commit eb38bb0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/com/adyen/Config.java b/src/main/java/com/adyen/Config.java
@@ -18,6 +18,7 @@ public class Config {
     protected String apiKey;
     protected int connectionTimeoutMillis;
     protected int readTimeoutMillis;
+    protected Boolean protocolUpgradeEnabled;
 
     //Terminal API Specific
     protected String terminalApiCloudEndpoint;
@@ -111,6 +112,18 @@ public void setReadTimeoutMillis(int readTimeoutMillis) {
         this.readTimeoutMillis = readTimeoutMillis;
     }
 
+    public Boolean getProtocolUpgradeEnabled() {
+        return protocolUpgradeEnabled;
+    }
+
+    /**
+     * Whether the HTTP requests should automatically attempt to upgrade to a safer/newer version of the protocol.
+     * See also {@link RequestConfig.Builder#setProtocolUpgradeEnabled(boolean)}.
+     */
+    public void setProtocolUpgradeEnabled(Boolean protocolUpgradeEnabled) {
+        this.protocolUpgradeEnabled = protocolUpgradeEnabled;
+    }
+
     public String getLiveEndpointUrlPrefix() {
         return this.liveEndpointUrlPrefix;
     }

diff --git a/src/main/java/com/adyen/httpclient/AdyenHttpClient.java b/src/main/java/com/adyen/httpclient/AdyenHttpClient.java
@@ -121,6 +121,9 @@ private HttpUriRequestBase createRequest(String endpoint, String requestBody, Co
         if (config.getConnectionTimeoutMillis() > 0) {
             builder.setConnectTimeout(config.getConnectionTimeoutMillis(), TimeUnit.MILLISECONDS);
         }
+        if (config.getProtocolUpgradeEnabled() != null) {
+            builder.setProtocolUpgradeEnabled(config.getProtocolUpgradeEnabled());
+        }
         if (proxy != null && proxy.address() instanceof InetSocketAddress) {
             InetSocketAddress inetSocketAddress = (InetSocketAddress) proxy.address();
             builder.setProxy(new HttpHost(inetSocketAddress.getHostName(), inetSocketAddress.getPort()));