Close OkHttpClient responses #21

Author: jonas-jasas

src/main/java/com/convertapi/client/Http.java

@@ -42,26 +42,32 @@ static HttpUrl.Builder getUrlBuilder(Config config) {
     static CompletableFuture<InputStream> requestGet(String url) {
         return CompletableFuture.supplyAsync(() -> {
             Request request = getRequestBuilder().url(url).build();
-            Response response;
             try {
-                response = getClient().newCall(request).execute();
+                Response response = getClient().newCall(request).execute();
+                ResponseBody body = response.body();
+                if (body != null) {
+                    if (response.code() != 200) {
+                        throw new ConversionException(body.string(), response.code());
+                    }
+                    return body.byteStream();
+                } else {
+                    throw new ConversionException("Response body is empty", response.code());
+                }
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
-            //noinspection ConstantConditions
-            return response.body().byteStream();
         });
     }
 
     static CompletableFuture<Void> requestDelete(String url) {
         return CompletableFuture.supplyAsync(() -> {
             Request request = getRequestBuilder().delete().url(url).build();
             try {
-                getClient().newCall(request).execute();
+                getClient().newCall(request).execute().close();
+                return null;
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
-            return null;
         });
     }
 
@@ -77,8 +83,8 @@ static RemoteUploadResponse remoteUpload(String urlToFile, Config config) {
             .build();
 
         Request request = Http.getRequestBuilder()
-            .url(url)
-            .method("POST", RequestBody.create(null, ""))
+                .url(url)
+                .method("POST", RequestBody.create("", null))
             .addHeader("Accept", "application/json")
             .build();
 
@@ -95,4 +101,4 @@ static RemoteUploadResponse remoteUpload(String urlToFile, Config config) {
 
         return new Gson().fromJson(bodyString, RemoteUploadResponse.class);
     }
-}
+}

src/main/java/com/convertapi/client/Param.java

@@ -2,6 +2,8 @@
 
 import okhttp3.MediaType;
 import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -101,33 +103,43 @@ public List<String> getValue() throws ExecutionException, InterruptedException {
         return this.value.get();
     }
 
-    public CompletableFuture<Void> delete() {
-        return isUploadedFile
-            ? value.thenCompose(urls -> Http.requestDelete(urls.get(0)))
-            : CompletableFuture.completedFuture(null);
-    }
-
     private static CompletableFuture<List<String>> upload(InputStream stream, String fileName, Config config) {
         return CompletableFuture.supplyAsync(() -> {
             Request request = Http.getRequestBuilder()
-                .url(Http.getUrlBuilder(config).addPathSegment("upload")
-                    .addQueryParameter("filename", fileName)
-                    .build())
-                .post(RequestBodyStream.create(MediaType.parse("application/octet-stream"), stream))
-                .build();
-            try {
-                String id = Http.getClient().newCall(request).execute().body().string();
-                return Collections.singletonList(id);
+                    .url(Http.getUrlBuilder(config).addPathSegment("upload")
+                            .addQueryParameter("filename", fileName)
+                            .build())
+                    .post(RequestBodyStream.create(MediaType.parse("application/octet-stream"), stream))
+                    .build();
+
+            try (Response response = Http.getClient().newCall(request).execute()) {
+                ResponseBody body = response.body();
+                if (body != null) {
+                    if (response.code() != 200) {
+                        throw new ConversionException(body.string(), response.code());
+                    }
+                    String id = body.string();
+                    return Collections.singletonList(id);
+                } else {
+                    throw new ConversionException("Response body is empty", response.code());
+                }
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
         });
     }
 
+    @SuppressWarnings("unused")
+    public CompletableFuture<Void> delete() {
+        return isUploadedFile
+                ? value.thenCompose(urls -> Http.requestDelete(urls.get(0)))
+                : CompletableFuture.completedFuture(null);
+    }
+
     public static Param[] concat(Param[] a, Param[] b) {
         Param[] result = new Param[a.length + b.length];
         System.arraycopy(a, 0, result, 0, a.length);
         System.arraycopy(b, 0, result, a.length, b.length);
         return result;
     }
-}
+}