Merge pull request #61 from ActiveCampaign/http-client-updates

Http client updates

Author: ibalosh

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.11.1
+
+* small updated to http client connection settings
+
 ## 1.11.0
 
 * Add data removal endpoints

pom.xml

@@ -23,7 +23,7 @@
     </developers>
 
     <properties>
-        <postmark.version>1.11.0</postmark.version>
+        <postmark.version>1.11.1</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>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.2.1</version>
+            <version>5.3</version>
         </dependency>
 
         <!-- Serialization to JSON -->

src/main/java/com/postmarkapp/postmark/client/HttpClient.java

@@ -3,9 +3,9 @@
 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.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
 import org.apache.hc.core5.util.Timeout;
@@ -36,21 +36,17 @@ public enum DEFAULTS {
     // client configuration options like timeouts, forwarding ..
     private RequestConfig.Builder clientConfigBuilder;
 
-    private final PoolingHttpClientConnectionManager connectionManager;
-
     private boolean secureConnection = true;
 
     public HttpClient(Map<String,Object> headers, int connectTimeoutSeconds, int readTimeoutSeconds) {
         this.headers = headers;
         this.clientConfigBuilder = RequestConfig
                 .custom()
                 .setConnectTimeout(Timeout.ofSeconds(connectTimeoutSeconds))
+                .setConnectionRequestTimeout(Timeout.ofSeconds(connectTimeoutSeconds))
+                .setConnectionKeepAlive(Timeout.ofSeconds(connectTimeoutSeconds))
                 .setResponseTimeout(Timeout.ofSeconds(readTimeoutSeconds));
 
-        this.connectionManager = new PoolingHttpClientConnectionManager();
-        connectionManager.setMaxTotal(100);
-        connectionManager.setDefaultMaxPerRoute(25);
-
         this.client = buildClient();
     }
 
@@ -89,7 +85,14 @@ public ClientResponse execute(REQUEST_TYPES requestType, String url, String data
 
         return client.execute(
                 request,
-                response -> new ClientResponse(response.getCode(), EntityUtils.toString(response.getEntity())));
+                response -> {
+                    final HttpEntity entity = response.getEntity();
+                    int code = response.getCode();
+                    String body = EntityUtils.toString(response.getEntity());
+                    EntityUtils.consume(entity);
+
+                    return new ClientResponse(code, body);
+                });
     }
 
     /**
@@ -154,7 +157,6 @@ private CloseableHttpClient buildClient() {
         return HttpClientBuilder
                 .create()
                 .setDefaultRequestConfig(clientConfigBuilder.build())
-                .setConnectionManager(connectionManager)
                 .build();
     }
 

src/test/java/integration/MessageStreamsTest.java

@@ -63,16 +63,16 @@ void edit() throws PostmarkException, IOException {
 
     @Test
     void archive() throws PostmarkException, IOException {
-        String streamId = "bulk-test-stream-1201";
+        String streamId = "test-bulk-test-stream-1201";
         MessageStreams messages = client.getMessageStreams(Parameters.init().build("messageStreamType", "all")
                 .build("includeArchivedStreams", "true"));
 
         MessageStream foundStream = findMessageStream(streamId);
 
         if (foundStream == null) {
-            client.createMessageStream(new MessageStream(streamId, streamId,"Broadcasts"));
+            MessageStream messageStream = new MessageStream(streamId, streamId,"Broadcasts");
+            client.createMessageStream(messageStream);
         }
-
         else if (foundStream.getArchivedAt() != null) {
             client.unarchiveMessageStream(streamId);
         }

src/test/java/integration/MessageTest.java

@@ -31,14 +31,6 @@ void send() throws PostmarkException, IOException {
         assertEquals(response.getMessageId().length(),36);
     }
 
-    @Test
-    void invalidMessagetoSend() throws PostmarkException, IOException {
-        Message message = new Message("from@example.com", null, "Hello from Postmark!", "Hello body");
-
-        Throwable exception = assertThrows(InvalidMessageException.class, () -> client.deliverMessage(message));
-        assertEquals("Zero recipients specified", exception.getMessage());
-    }
-
     @Test
     void invalidApiToken() throws PostmarkException, IOException {
         ApiClient client = Postmark.getApiClient("1991892", true);