fix: always close pure OkHttp3 response (#151)

Author: bednar

CHANGELOG.md

@@ -6,6 +6,9 @@
 ### API
 1. [#139](https://github.com/influxdata/influxdb-client-java/pull/148): Changed default port from 9999 to 8086
 
+### Bug Fixes
+1. [#151](https://github.com/influxdata/influxdb-client-java/pull/151): Fixed closing OkHttp3 response body
+
 ## 1.11.0 [2020-08-14]
 
 ### Features

client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java

@@ -27,6 +27,7 @@
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Response;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.assertj.core.api.Assertions;
@@ -57,13 +58,14 @@ void setUp() {
     @Test
     public void userAgent() throws IOException, InterruptedException {
 
-        mockServer.enqueue(new MockResponse()                );
+        mockServer.enqueue(new MockResponse());
 
         Request request = new Request.Builder()
                 .url(url)
                 .build();
 
-        client.newCall(request).execute();
+        Response response = client.newCall(request).execute();
+        response.close();
 
         RecordedRequest recordedRequest = mockServer.takeRequest();
         String userAgent = recordedRequest.getHeader("User-Agent");

client-test/src/main/java/com/influxdb/test/AbstractTest.java

@@ -159,9 +159,7 @@ private void influxDBRequest(@Nonnull final Request request) {
         Assertions.assertThat(request).isNotNull();
 
         OkHttpClient okHttpClient = new OkHttpClient.Builder().build();
-        Response response;
-        try {
-            response = okHttpClient.newCall(request).execute();
+        try (Response response = okHttpClient.newCall(request).execute()) {
             Assertions.assertThat(response.isSuccessful())
                     .withFailMessage("Failed response <%s>. Body: <%s>", response, response.body())
                     .isTrue();

client/src/main/java/com/influxdb/client/internal/AuthenticateInterceptor.java

@@ -122,21 +122,18 @@ void initToken(@Nonnull final OkHttpClient okHttpClient) {
                     .post(RequestBody.create(null, ""))
                     .build();
 
-            Response authResponse;
-            try {
-                authResponse = this.okHttpClient.newCall(authRequest).execute();
-            } catch (IOException e) {
-                LOG.log(Level.WARNING, "Cannot retrieve the Session token!", e);
-                return;
-            }
+            try (Response authResponse = this.okHttpClient.newCall(authRequest).execute()) {
 
-            Cookie sessionCookie = Cookie.parseAll(authRequest.url(), authResponse.headers()).stream()
-                    .filter(cookie -> "session".equals(cookie.name()))
-                    .findFirst()
-                    .orElse(null);
+                Cookie sessionCookie = Cookie.parseAll(authRequest.url(), authResponse.headers()).stream()
+                        .filter(cookie -> "session".equals(cookie.name()))
+                        .findFirst()
+                        .orElse(null);
 
-            if (sessionCookie != null) {
-                sessionToken = sessionCookie.value().toCharArray();
+                if (sessionCookie != null) {
+                    sessionToken = sessionCookie.value().toCharArray();
+                }
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, "Cannot retrieve the Session token!", e);
             }
         }
     }
@@ -162,7 +159,8 @@ void signout() throws IOException {
                 .post(RequestBody.create(null, ""))
                 .build();
 
-        this.okHttpClient.newCall(authRequest).execute();
+        Response response = this.okHttpClient.newCall(authRequest).execute();
+        response.close();
     }
 
     @Nonnull

client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java

@@ -31,6 +31,7 @@
 import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Response;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.assertj.core.api.Assertions;
@@ -67,7 +68,8 @@ void authorizationNone() throws IOException, InterruptedException {
                 .get()
                 .build();
 
-        buildOkHttpClient(options).newCall(request).execute();
+        Response response = buildOkHttpClient(options).newCall(request).execute();
+        response.close();
 
         Assertions.assertThat(mockServer.getRequestCount()).isEqualTo(1);
 
@@ -103,7 +105,8 @@ void authorizationSession() throws IOException, InterruptedException {
                 .get()
                 .build();
 
-        buildOkHttpClient(options).newCall(request).execute();
+        Response response = buildOkHttpClient(options).newCall(request).execute();
+        response.close();
 
         // Sign in request
         RecordedRequest requestToSignIn = mockServer.takeRequest();
@@ -138,7 +141,8 @@ void authorizationSessionWithoutCookie() throws IOException, InterruptedExceptio
                 .get()
                 .build();
 
-        buildOkHttpClient(options).newCall(request).execute();
+        Response response = buildOkHttpClient(options).newCall(request).execute();
+        response.close();
 
         // Sign in request in init
         RecordedRequest requestToSignIn = mockServer.takeRequest();
@@ -213,7 +217,8 @@ void authorizationToken() throws IOException, InterruptedException {
                 .get()
                 .build();
 
-        buildOkHttpClient(options).newCall(request).execute();
+        Response response = buildOkHttpClient(options).newCall(request).execute();
+        response.close();
 
         RecordedRequest recordedRequest = mockServer.takeRequest();
         Assertions.assertThat(recordedRequest.getHeader("Authorization")).isEqualTo("Token xyz");

client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java

@@ -30,6 +30,7 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
+import okhttp3.Response;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.assertj.core.api.Assertions;
@@ -111,7 +112,8 @@ private RecordedRequest newCall(@Nonnull final String path) throws IOException,
                 .post(RequestBody.create(MediaType.parse("application/json"), "{name: \"Tom Type\"}"))
                 .build();
 
-        okHttpClient.newCall(request).execute();
+        Response execute = okHttpClient.newCall(request).execute();
+        execute.close();
 
         return mockServer.takeRequest();
     }