From bf1bf1a391222d6f3a70e84ffc0d25abf3d7cdad Mon Sep 17 00:00:00 2001
From: Israel Colomer <israelcolomer@gmail.com>
Date: Fri, 13 May 2016 16:49:43 +0100
Subject: [PATCH] Allow datamill client to perform PATCH requests Applied
 review comments.

---
 .../org/chodavarapu/datamill/http/Client.java | 67 ++++++++-----------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/core/src/main/java/org/chodavarapu/datamill/http/Client.java b/core/src/main/java/org/chodavarapu/datamill/http/Client.java
index 4be6820..d8537b5 100644
--- a/core/src/main/java/org/chodavarapu/datamill/http/Client.java
+++ b/core/src/main/java/org/chodavarapu/datamill/http/Client.java
@@ -48,7 +48,7 @@
  */
 public class Client {
     private static final Logger logger = LoggerFactory.getLogger(Client.class);
-    private final TemplateBasedUriBuilder uriBuilder = new TemplateBasedUriBuilder();
+    private final TemplateBasedUriBuilder templateBasedUriBuilder = new TemplateBasedUriBuilder();
 
     public Observable<Response> request(Function<RequestBuilder, Request> builder) {
         Request request = builder.apply(new RequestBuilderImpl());
@@ -72,38 +72,30 @@ public Observable<Response> request(
             Multimap<String, String> queryParameters,
             Map<String, ?> options,
             Entity entity) {
+
         if (uriParameters != null && uriParameters.size() > 0) {
-            uri = uriBuilder.build(uri, uriParameters);
+            uri = templateBasedUriBuilder.build(uri, uriParameters);
         }
-        URIBuilder uriBuilder = new URIBuilder();
-
-
-        int firstSlash = uri.indexOf('/');
-        uriBuilder.setScheme(uri.substring(0, firstSlash - 1));
-
-        String uriNoScheme = uri.substring(firstSlash + 1, uri.length());
-        uriBuilder.setHost(uriNoScheme.substring(1));
 
-        URI anURI = null;
+        URI parsedURI;
         try {
-            anURI = appendQueryParameters(uriBuilder, queryParameters);
+            URIBuilder uriBuilder = new URIBuilder(uri);
+            parsedURI = appendQueryParameters(uriBuilder, queryParameters);
         } catch (URISyntaxException e) {
-            e.printStackTrace();
+            throw new IllegalStateException("Could not build URI for " + uri);
         }
 
-        final URI theURI = anURI;
+        final URI targetURI = parsedURI;
         final String composedUri = uri;
 
         return Async.fromCallable(() -> {
-            PipedOutputStream pipedOutputStream = null;
-            PipedInputStream pipedInputStream = null;
-
-            try {
 
+            try (PipedOutputStream pipedOutputStream = buildPipedOutputStream();
+                 PipedInputStream pipedInputStream = buildPipedInputStream()) {
 
                 CloseableHttpClient httpclient = HttpClients.createDefault();
 
-                HttpUriRequest request = buildHttpRequest(method, theURI);
+                HttpUriRequest request = buildHttpRequest(method, targetURI);
 
                 if (options != null && options.size() > 0) {
                     Object connectTimeout = options.get(Request.OPTION_CONNECT_TIMEOUT);
@@ -126,8 +118,6 @@ public Observable<Response> request(
                         throw new IllegalArgumentException("Expecting to write an entity for a request type that does not support it!");
                     }
 
-                    pipedOutputStream = buildPipedOutputStream();
-                    pipedInputStream = buildPipedInputStream();
                     pipedInputStream.connect(pipedOutputStream);
 
                     BasicHttpEntity httpEntity = new BasicHttpEntity();
@@ -145,27 +135,28 @@ public Observable<Response> request(
                     }
                 }
 
-                CloseableHttpResponse httpResponse = httpclient.execute(request);
+                CloseableHttpResponse httpResponse = null;
 
-                int responseCode = httpResponse.getStatusLine().getStatusCode();
-                Map<String, String> combinedHeaders = new HashMap<>();
+                try {
 
-                for (Header header : httpResponse.getAllHeaders()) {
-                    combinedHeaders.put(header.getName(), header.getValue());
-                }
+                    httpResponse = httpclient.execute(request);
 
-                return new ResponseImpl(Status.valueOf(responseCode), combinedHeaders, new InputStreamEntity(httpResponse.getEntity().getContent()));
-            } finally {
-                if (pipedInputStream != null) {
-                    try {
-                        pipedInputStream.close();
-                    } catch (IOException e) {}
-                }
-                if (pipedOutputStream != null) {
-                    try {
-                        pipedOutputStream.close();
-                    } catch (IOException e) {}
+                    int responseCode = httpResponse.getStatusLine().getStatusCode();
+                    Map<String, String> combinedHeaders = new HashMap<>();
+
+                    for (Header header : httpResponse.getAllHeaders()) {
+                        combinedHeaders.put(header.getName(), header.getValue());
+                    }
+
+                    return new ResponseImpl(Status.valueOf(responseCode), combinedHeaders, new InputStreamEntity(httpResponse.getEntity().getContent()));
+                } finally {
+                    if (httpResponse != null) {
+                        try {
+                            httpResponse.close();
+                        } catch (IOException e) {}
+                    }
                 }
+
             }
         }, Schedulers.io());
     }