Extract HTTP client logic to HttpClient and JavaHttpClient. Make Http…

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## Unreleased
+* Extract HTTP client logic to `HttpClient` and `JavaHttpClient`
+* Make `HttpClient` configurable.
+
 ## 3.40.0
 * Add prepaid_reloadable from bin data in credit card responses
 * Add support for `PayPalPaymentResource` requests

src/main/java/com/braintreegateway/Configuration.java

@@ -2,6 +2,9 @@
 
 import com.braintreegateway.exceptions.ConfigurationException;
 import com.braintreegateway.util.ClientLibraryProperties;
+import com.braintreegateway.util.HttpClient;
+import com.braintreegateway.util.JavaHttpClient;
+
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.util.logging.Level;
@@ -18,6 +21,7 @@ public class Configuration {
     private String merchantId;
     private String privateKey;
     private String publicKey;
+    private HttpClient httpClient;
     private static Logger logger;
 
     static {
@@ -155,4 +159,16 @@ public int getConnectTimeout() {
     public void setConnectTimeout(Integer timeout) {
         this.connectTimeout = timeout;
     }
+
+    public HttpClient getHttpClient() {
+        if (httpClient == null) {
+            this.httpClient = new JavaHttpClient(this);
+        }
+
+        return httpClient;
+    }
+
+    public void setHttpClient(HttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
 }

src/main/java/com/braintreegateway/ThreeDSecureGateway.java

@@ -3,15 +3,16 @@
 import com.braintreegateway.exceptions.BraintreeException;
 import com.braintreegateway.exceptions.UnexpectedException;
 import com.braintreegateway.util.Http;
-import com.braintreegateway.util.StringUtils;
+import com.braintreegateway.util.HttpClient;
 import com.fasterxml.jackson.jr.ob.JSON;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.zip.GZIPInputStream;
+
+import static com.braintreegateway.util.HttpClient.HttpResponse;
+import static com.braintreegateway.util.HttpClient.Payload;
+import static com.braintreegateway.util.HttpClient.RequestMethod;
 
 public class ThreeDSecureGateway {
     private final Configuration configuration;
@@ -28,27 +29,19 @@ public Result<ThreeDSecureLookupResponse> lookup(ThreeDSecureLookupRequest reque
         }
 
         try {
-            URL url = new URL(configuration.getBaseURL() + configuration.getMerchantPath() +
-                    "/client_api/v1/payment_methods/" + request.getNonce() + "/three_d_secure/lookup");
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("POST");
-            connection.addRequestProperty("X-ApiVersion", Configuration.apiVersion());
-            connection.addRequestProperty("Content-Type", "application/json");
-            connection.setDoOutput(true);
-            connection.getOutputStream().write(request.toJSON().getBytes(StandardCharsets.UTF_8));
-            connection.getOutputStream().close();
+            Map<String, String> headers = new HashMap<>();
+            headers.put("X-ApiVersion", Configuration.apiVersion());
 
-            boolean isError = connection.getResponseCode() != 201;
-            InputStream responseStream = isError ? connection.getErrorStream() : connection.getInputStream();
-            if ("gzip".equalsIgnoreCase(connection.getContentEncoding())) {
-                responseStream = new GZIPInputStream(responseStream);
-            }
+            String url = configuration.getBaseURL() + configuration.getMerchantPath() + "/client_api/v1/payment_methods/" + request.getNonce()
+                + "/three_d_secure/lookup";
 
-            String rawResponse = StringUtils.inputStreamToString(responseStream);
-            responseStream.close();
+            HttpClient httpClient = configuration.getHttpClient();
+            HttpResponse httpResponse = httpClient.request(RequestMethod.POST, url, Payload.json(headers, request.toJSON()));
 
-            if (isError) {
-                Http.throwExceptionIfErrorStatusCode(connection.getResponseCode(), rawResponse);
+            int responseCode = httpResponse.getResponseCode();
+            String rawResponse = httpResponse.getResponseBody();
+            if (responseCode != 201) {
+                Http.throwExceptionIfErrorStatusCode(responseCode, rawResponse);
             }
 
             Map<String, Object> jsonResponse = JSON.std.mapFrom(rawResponse);

src/main/java/com/braintreegateway/util/GraphQLClient.java

@@ -15,12 +15,14 @@
 import com.braintreegateway.exceptions.UpgradeRequiredException;
 import com.fasterxml.jackson.jr.ob.JSON;
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import static com.braintreegateway.util.HttpClient.Payload;
+import static com.braintreegateway.util.HttpClient.RequestMethod;
+
 public class GraphQLClient extends Http {
     private Configuration configuration;
     public enum ErrorClass {
@@ -52,22 +54,14 @@ public Map<String, Object> query(String definition) {
     // little difference to the consumer of the SDK, but should make developing
     // it a little easier
     public Map<String, Object> query(String definition, Map<String, Object> variables) {
-        HttpURLConnection connection = null;
         Map<String, Object> jsonMap = null;
 
         String requestString = formatGraphQLRequest(definition, variables);
-        String contentType = "application/json";
 
-        Map<String, String> headers = constructHeaders(contentType, contentType);
+        Map<String, String> headers = constructHeaders("application/json");
         headers.put("Braintree-Version", Configuration.GRAPHQL_API_VERSION);
 
-        try {
-            connection = buildConnection(Http.RequestMethod.POST, configuration.getGraphQLURL(), headers);
-        } catch (IOException e) {
-            throw new UnexpectedException(e.getMessage(), e);
-        }
-
-        String jsonString = httpDo(Http.RequestMethod.POST, "/graphql", requestString, null, connection, headers, null);
+        String jsonString = httpDo(RequestMethod.POST, configuration.getGraphQLURL(), "/graphql", Payload.json(headers, requestString));
 
         try {
             jsonMap = JSON.std.mapFrom(jsonString);