simplified http client config updates

ActiveCampaign · Mar 2, 2023 · a3fc8f7 · a3fc8f7
1 parent b8f1cb5
commit a3fc8f7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,12 +23,11 @@
     </developers>
 
     <properties>
-        <postmark.version>1.9.12</postmark.version>
+        <postmark.version>1.9.2</postmark.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <jackson.minimum.version>2.9.7</jackson.minimum.version>
         <jackson.version>2.14.1</jackson.version>
-        <jersey.version>2.39</jersey.version>
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <junit.platform.version>1.3.2</junit.platform.version>
     </properties>

diff --git a/src/main/java/com/postmarkapp/postmark/client/HttpClient.java b/src/main/java/com/postmarkapp/postmark/client/HttpClient.java
@@ -3,7 +3,6 @@
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
@@ -32,21 +31,23 @@ public enum DEFAULTS {
 
     private final Map<String,Object> headers;
     private CloseableHttpClient client;
+    // client configuration options like timeouts, forwarding ..
+    private RequestConfig.Builder clientConfigBuilder;
 
     private boolean secureConnection = true;
-    private int connectTimeoutSeconds = DEFAULTS.CONNECT_TIMEOUT_SECONDS.value;
-    private int readTimeoutSeconds = DEFAULTS.READ_TIMEOUT_SECONDS.value;
 
     public HttpClient(Map<String,Object> headers, int connectTimeoutSeconds, int readTimeoutSeconds) {
         this.headers = headers;
-        this.connectTimeoutSeconds = connectTimeoutSeconds;
-        this.readTimeoutSeconds = readTimeoutSeconds;
-        buildClientWithCustomConfig();
+        this.clientConfigBuilder = RequestConfig
+                .custom()
+                .setConnectTimeout(Timeout.ofSeconds(connectTimeoutSeconds))
+                .setResponseTimeout(Timeout.ofSeconds(readTimeoutSeconds));
+
+        this.client = buildClient();
     }
 
     public HttpClient(Map<String,Object> headers) {
-        this.headers = headers;
-        buildClientWithCustomConfig();
+        this(headers, DEFAULTS.CONNECT_TIMEOUT_SECONDS.value, DEFAULTS.READ_TIMEOUT_SECONDS.value);
     }
 
     /**
@@ -108,13 +109,13 @@ public ClientResponse execute(REQUEST_TYPES requestType, String url, String data
     // Setters and Getters
 
     public void setConnectTimeoutSeconds(int connectTimeoutSeconds) {
-        this.connectTimeoutSeconds = connectTimeoutSeconds;
-        buildClientWithCustomConfig();
+        clientConfigBuilder.setConnectTimeout(Timeout.ofSeconds(connectTimeoutSeconds));
+        this.client = buildClient();
     }
 
     public void setReadTimeoutSeconds(int readTimeoutSeconds) {
-        this.readTimeoutSeconds = readTimeoutSeconds;
-        buildClientWithCustomConfig();
+        clientConfigBuilder.setResponseTimeout(Timeout.ofSeconds(readTimeoutSeconds));
+        this.client = buildClient();
     }
 
     public void setSecureConnection(boolean secureConnection) {
@@ -141,22 +142,7 @@ public CloseableHttpClient getClient() {
      * @return initialized HTTP client
      */
     private CloseableHttpClient buildClient() {
-        return HttpClients.createDefault();
-    }
-
-    /**
-     * Build HTTP client used for requests with custom config settings
-     *
-     * @return initialized HTTP client
-     */
-    private void buildClientWithCustomConfig() {
-        RequestConfig requestConfig = RequestConfig
-                .custom()
-                .setConnectTimeout(Timeout.ofSeconds(connectTimeoutSeconds))
-                .setResponseTimeout(Timeout.ofSeconds(readTimeoutSeconds))
-                .build();
-
-        this.client = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+        return HttpClientBuilder.create().setDefaultRequestConfig(clientConfigBuilder.build()).build();
     }
 
     /**