move secure connection to http client which is a better fit for managing it

Author: ibalosh

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

@@ -31,6 +31,8 @@ public enum DEFAULTS {
     private final MultivaluedMap<String,Object> headers;
     private final Client client;
 
+    private boolean secureConnection = true;
+
     public HttpClient(MultivaluedMap<String,Object> headers, int connectTimeoutSeconds, int readTimeoutSeconds) {
         this(headers);
         setConnectTimeoutSeconds(connectTimeoutSeconds);
@@ -54,8 +56,9 @@ public HttpClient(MultivaluedMap<String,Object> headers) {
      * @return response from HTTP request
      */
     public ClientResponse execute(REQUEST_TYPES requestType, String url, String data) {
+        String httpUrl = getSecureUrl(url);
         Response response;
-        WebTarget target = client.target(url);
+        WebTarget target = client.target(httpUrl);
 
         switch (requestType) {
             case POST:
@@ -113,6 +116,15 @@ public void setReadTimeoutSeconds(int readTimeoutSeconds) {
         client.property(ClientProperties.READ_TIMEOUT, readTimeoutSeconds * 1000);
     }
 
+    public void setSecureConnection(boolean secureConnection) {
+        this.secureConnection = secureConnection;
+    }
+
+    private String getSecureUrl(String url) {
+        String urlPrefix = this.secureConnection ? "https://" : "http://";
+        return urlPrefix + url;
+    }
+
     /**
      * Access to original HTTP client used for requests
      *

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

@@ -15,7 +15,6 @@ public class HttpClientHandler {
     private final HttpClient httpClient;
     protected final DataHandler dataHandler;
     private final HttpClientErrorHandler httpClientErrorHandler;
-    private boolean secureConnection = true;
 
     protected HttpClientHandler(MultivaluedMap<String,Object> headers) {
         this.dataHandler = new DataHandler(false);
@@ -25,7 +24,7 @@ protected HttpClientHandler(MultivaluedMap<String,Object> headers) {
 
     protected HttpClientHandler(MultivaluedMap<String,Object> headers, boolean secureConnection) {
         this(headers);
-        this.secureConnection = secureConnection;
+        this.getHttpClient().setSecureConnection(secureConnection);
     }
 
     /**
@@ -59,7 +58,7 @@ protected String execute(HttpClient.REQUEST_TYPES request_type, String url) thro
      * @return HTTP response message
      */
     protected String execute(HttpClient.REQUEST_TYPES request_type, String url, Object data) throws PostmarkException, IOException {
-        HttpClient.ClientResponse response = httpClient.execute(request_type, getSecureUrl(url), dataHandler.toJson(data));
+        HttpClient.ClientResponse response = httpClient.execute(request_type, url, dataHandler.toJson(data));
 
         if (response.getCode() == 200) {
             return response.getMessage();
@@ -77,10 +76,6 @@ public void setDebugMode() {
         this.dataHandler.setStrictMapper();
     }
 
-    public void setSecureConnection(boolean secureConnection) {
-        this.secureConnection = secureConnection;
-    }
-
     /**
      * @return HTTP client which processes HTTP requests
      */
@@ -89,7 +84,7 @@ public HttpClient getHttpClient() {
     }
 
     /**
-     * Delegation method for HTTP client connection setttings
+     * Delegation method for HTTP client connection settings
      *
      * @param connectTimeoutSeconds HTTP client connection timeout
      */
@@ -98,21 +93,25 @@ public void setConnectTimeoutSeconds(int connectTimeoutSeconds) {
     }
 
     /**
-     * Delegation method for HTTP client connection setttings
+     * Delegation method for HTTP client connection settings
      *
      * @param readTimeoutSeconds HTTP client read timeout
      */
     public void setReadTimeoutSeconds(int readTimeoutSeconds) {
         getHttpClient().setReadTimeoutSeconds(readTimeoutSeconds);
     }
 
+    /**
+     * Delegation method for HTTP client connection settings
+     *
+     * @param secureConnection - choose http or https
+     */
+    public void setSecureConnection(boolean secureConnection) {
+        getHttpClient().setSecureConnection(secureConnection);
+    }
+
     /**
      * @return DataHandler which processes HTTP requests sent, and HTTP request responses
      */
     public DataHandler getDataHandler() { return dataHandler; }
-    
-    private String getSecureUrl(String url) {
-        String urlPrefix = this.secureConnection ? "https://" : "http://";
-        return urlPrefix + url;
-    }
 }

src/test/java/unit/client/HttpClientTest.java

@@ -17,15 +17,15 @@ public class HttpClientTest {
     @Test
     void execute() throws IOException, PostmarkException {
         HttpClient client = new HttpClient(new MultivaluedHashMap<>());
-        HttpClient.ClientResponse response = client.execute(HttpClient.REQUEST_TYPES.GET, "https://" + Postmark.DEFAULTS.API_URL.value);
+        HttpClient.ClientResponse response = client.execute(HttpClient.REQUEST_TYPES.GET, Postmark.DEFAULTS.API_URL.value);
 
         assertNotNull(response.getMessage());
     }
 
     @Test
     void executeIncorrectLink() throws IOException, PostmarkException {
         HttpClient client = new HttpClient(new MultivaluedHashMap<>());
-        HttpClient.ClientResponse response = client.execute(HttpClient.REQUEST_TYPES.GET, "https://" + Postmark.DEFAULTS.API_URL.value + "/someweirdlink");
+        HttpClient.ClientResponse response = client.execute(HttpClient.REQUEST_TYPES.GET, Postmark.DEFAULTS.API_URL.value + "/someweirdlink");
 
         assertEquals(response.getCode(),404);
     }