From d4ea74c238617d24f9c5242d8b52068c505a65c6 Mon Sep 17 00:00:00 2001
From: "Jose M. Palomar" <josem.palomar@energiaplus.es>
Date: Tue, 22 Jun 2021 15:46:24 +0200
Subject: [PATCH] Change to close Response instances

---
 src/main/java/com/convertapi/client/ConvertApi.java | 8 +++-----
 src/main/java/com/convertapi/client/Http.java       | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/convertapi/client/ConvertApi.java b/src/main/java/com/convertapi/client/ConvertApi.java
index 98dbcd3..c26c5c7 100644
--- a/src/main/java/com/convertapi/client/ConvertApi.java
+++ b/src/main/java/com/convertapi/client/ConvertApi.java
@@ -40,7 +40,7 @@ public static CompletableFuture<ConversionResult> convert(String fromFormat, Str
                     .addPathSegment(toFormat);
 
             for (Param param : params) {
-                if (param.getName().toLowerCase().equals("converter")) {
+                if (param.getName().equalsIgnoreCase("converter")) {
                     try {
                         urlBuilder = urlBuilder
                                 .addPathSegment("converter")
@@ -77,8 +77,7 @@ public static CompletableFuture<ConversionResult> convert(String fromFormat, Str
                     .build();
 
             String bodyString;
-            try {
-                Response response = Http.getClient(config).newCall(request).execute();
+            try (Response response = Http.getClient(config).newCall(request).execute()) {
                 //noinspection ConstantConditions
                 bodyString = response.body().string();
                 if (response.code() != 200) {
@@ -107,8 +106,7 @@ public static User getUser(Config config) {
                 .build();
 
         String bodyString;
-        try {
-            Response response = Http.getClient().newCall(request).execute();
+        try (Response response = Http.getClient().newCall(request).execute()) {
             //noinspection ConstantConditions
             bodyString = response.body().string();
             if (response.code() != 200) {
diff --git a/src/main/java/com/convertapi/client/Http.java b/src/main/java/com/convertapi/client/Http.java
index e8a9635..38c7aca 100644
--- a/src/main/java/com/convertapi/client/Http.java
+++ b/src/main/java/com/convertapi/client/Http.java
@@ -49,8 +49,7 @@ static CompletableFuture<InputStream> requestGet(String url) {
     static CompletableFuture<Void> requestDelete(String url) {
         return CompletableFuture.supplyAsync(() -> {
             Request request = getRequestBuilder().delete().url(url).build();
-            try {
-                getClient().newCall(request).execute();
+            try (Response response = getClient().newCall(request).execute()) {
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -76,8 +75,7 @@ static RemoteUploadResponse remoteUpload(String urlToFile, Config config) {
                 .build();
 
         String bodyString;
-        try {
-            Response response = Http.getClient().newCall(request).execute();
+        try (Response response = Http.getClient().newCall(request).execute()) {
             //noinspection ConstantConditions
             bodyString = response.body().string();
             if (response.code() != 200) {