Merge pull request #55 from Adyen/issue-53-2

Fixes #53, Make the Client stateless

Author: lancergr

.travis.yml

@@ -1,7 +1,8 @@
 language: java
 
 jdk:
-  - oraclejdk7
+  - oraclejdk8
+  - openjdk7
 
 install: mvn install -Dgpg.skip=true
 

src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############
@@ -34,31 +34,24 @@
 import com.adyen.Config;
 
 public class HttpURLConnectionClient implements ClientInterface {
-    private HttpURLConnection httpConnection;
     private static final String CHARSET = "UTF-8";
-    
+
     /**
      * Does a POST request.
      * config is used to obtain basic auth username, password and User-Agent
-     *
-     * @param requestUrl
-     * @param requestBody
-     * @param config
-     * @return
-     * @throws IOException
      */
     @Override
     public String request(String requestUrl, String requestBody, Config config) throws IOException, HTTPClientException {
-        String response = createRequest(requestUrl, config.getApplicationName())
-                .setBasicAuthentication(config.getUsername(), config.getPassword())
-                .setContentType("application/json")
-                .doPostRequest(requestBody);
+        HttpURLConnection httpConnection = createRequest(requestUrl, config.getApplicationName());
+        setBasicAuthentication(httpConnection, config.getUsername(), config.getPassword());
+        setContentType(httpConnection, "application/json");
+
+        String response = doPostRequest(httpConnection, requestBody);
 
         return response;
     }
 
-    private static String getResponseBody(InputStream responseStream)
-            throws IOException {
+    private static String getResponseBody(InputStream responseStream) throws IOException {
         //\A is the beginning of the stream boundary
         Scanner scanner = new Scanner(responseStream, CHARSET);
         String rBody = scanner.useDelimiter("\\A").next();
@@ -69,39 +62,29 @@ private static String getResponseBody(InputStream responseStream)
 
     /**
      * Does a POST request with HTTP key-value pairs
-     *
-     * @param requestUrl
-     * @param params
-     * @param config
-     * @return
-     * @throws IOException
-     * @throws HTTPClientException
      */
     @Override
     public String post(String requestUrl, Map<String, String> params, Config config) throws IOException, HTTPClientException {
         String postQuery = getQuery(params);
-        String response = createRequest(requestUrl, config.getApplicationName())
-                .doPostRequest(postQuery);
+        HttpURLConnection httpConnection = createRequest(requestUrl, config.getApplicationName());
+        String response = doPostRequest(httpConnection, postQuery);
 
         return response;
     }
 
     /**
      * Get HTTP querystring from Map<String,String>
-     *
-     * @param params
-     * @return
-     * @throws UnsupportedEncodingException
      */
     private String getQuery(Map<String, String> params) throws UnsupportedEncodingException {
         StringBuilder result = new StringBuilder();
         boolean first = true;
 
         for (Map.Entry<String, String> pair : params.entrySet()) {
-            if (first)
+            if (first) {
                 first = false;
-            else
+            } else {
                 result.append("&");
+            }
 
             result.append(URLEncoder.encode(pair.getKey(), CHARSET));
             result.append("=");
@@ -113,65 +96,47 @@ private String getQuery(Map<String, String> params) throws UnsupportedEncodingEx
 
     /**
      * Initialize the httpConnection
-     *
-     * @param requestUrl
-     * @param applicationName
-     * @return
-     * @throws IOException
      */
-    private HttpURLConnectionClient createRequest(String requestUrl, String applicationName) throws IOException {
+    private HttpURLConnection createRequest(String requestUrl, String applicationName) throws IOException {
         URL targetUrl = new URL(requestUrl);
 
         // set configurations
-        httpConnection = (HttpURLConnection) targetUrl.openConnection();
+        HttpURLConnection httpConnection = (HttpURLConnection) targetUrl.openConnection();
         httpConnection.setUseCaches(false);
         httpConnection.setDoOutput(true);
         httpConnection.setRequestMethod("POST");
 
         httpConnection.setRequestProperty("Accept-Charset", CHARSET);
-        httpConnection.setRequestProperty("User-Agent",
-                String.format("%s %s%s", applicationName, Client.USER_AGENT_SUFFIX, Client.LIB_VERSION));
+        httpConnection.setRequestProperty("User-Agent", String.format("%s %s%s", applicationName, Client.USER_AGENT_SUFFIX, Client.LIB_VERSION));
 
-        return this;
+        return httpConnection;
     }
 
     /**
      * Adds Basic Authentication headers
-     *
-     * @param username
-     * @param password
-     * @return
      */
-    private HttpURLConnectionClient setBasicAuthentication(String username, String password) {
+    private HttpURLConnection setBasicAuthentication(HttpURLConnection httpConnection, String username, String password) {
         // set basic authentication
         String authString = username + ":" + password;
         byte[] authEncBytes = Base64.encodeBase64(authString.getBytes());
         String authStringEnc = new String(authEncBytes);
 
         httpConnection.setRequestProperty("Authorization", "Basic " + authStringEnc);
-        return this;
+        return httpConnection;
     }
 
     /**
      * Sets content type
-     *
-     * @param contentType
-     * @return
      */
-    private HttpURLConnectionClient setContentType(String contentType) {
+    private HttpURLConnection setContentType(HttpURLConnection httpConnection, String contentType) {
         httpConnection.setRequestProperty("Content-Type", contentType);
-        return this;
+        return httpConnection;
     }
 
     /**
      * Does a POST request with raw body
-     *
-     * @param requestBody
-     * @return
-     * @throws IOException
-     * @throws HTTPClientException
      */
-    private String doPostRequest(String requestBody) throws IOException, HTTPClientException {
+    private String doPostRequest(HttpURLConnection httpConnection, String requestBody) throws IOException, HTTPClientException {
         String response = null;
 
         OutputStream outputStream = httpConnection.getOutputStream();
@@ -181,16 +146,11 @@ private String doPostRequest(String requestBody) throws IOException, HTTPClientE
         int responseCode = httpConnection.getResponseCode();
         if (responseCode != HttpURLConnection.HTTP_OK) {
             //Read the response from the error stream
-            if(httpConnection.getErrorStream() != null) {
+            if (httpConnection.getErrorStream() != null) {
                 response = getResponseBody(httpConnection.getErrorStream());
             }
 
-            HTTPClientException httpClientException = new HTTPClientException(
-                    responseCode,
-                    "HTTP Exception",
-                    httpConnection.getHeaderFields(),
-                    response
-            );
+            HTTPClientException httpClientException = new HTTPClientException(responseCode, "HTTP Exception", httpConnection.getHeaderFields(), response);
 
             throw httpClientException;
         }