Merge pull request #494 from splitio/fix/close_http_client

Fix/close http client

Author: mmelograno

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.12.0-rc2</version>
+        <version>4.12.0-rc3</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>

client/src/main/java/io/split/engine/common/SplitAPI.java

@@ -19,7 +19,8 @@ private SplitAPI(SplitHttpClient httpClient, CloseableHttpClient sseHttpClient,
         _requestDecorator = requestDecorator;
     }
 
-    public static SplitAPI build(SplitHttpClient httpClient, CloseableHttpClient sseHttpClient, RequestDecorator requestDecorator){
+    public static SplitAPI build(SplitHttpClient httpClient, CloseableHttpClient sseHttpClient,
+            RequestDecorator requestDecorator) {
         return new SplitAPI(httpClient, sseHttpClient, requestDecorator);
     }
 
@@ -31,13 +32,20 @@ public CloseableHttpClient getSseHttpClient() {
         return _sseHttpClient;
     }
 
-    public RequestDecorator getRequestDecorator() { return  _requestDecorator; }
+    public RequestDecorator getRequestDecorator() {
+        return _requestDecorator;
+    }
 
-    public void close(){
+    public void close() {
+        try {
+            _httpClient.close();
+        } catch (Exception e) {
+            _log.error("Error trying to close regular http client", e);
+        }
         try {
             _sseHttpClient.close();
-        } catch (Exception e){
+        } catch (Exception e) {
             _log.error("Error trying to close sseHttpClient", e);
         }
     }
-}
+}

client/src/main/java/io/split/service/SplitHttpClient.java

@@ -4,12 +4,14 @@
 import io.split.client.dtos.SplitHttpResponse;
 
 import org.apache.hc.core5.http.HttpEntity;
+
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
-public interface SplitHttpClient {
+public interface SplitHttpClient extends Closeable {
     /**
      * Wrapper for HTTP get method
      * 

client/src/main/java/io/split/service/SplitHttpClientImpl.java

@@ -140,4 +140,9 @@ private void setBasicHeaders(HttpRequest request) {
                 ? _apikey.substring(_apikey.length() - 4)
                 : _apikey);
     }
+
+    @Override
+    public void close() throws IOException {
+        _client.close();
+    }
 }

pluggable-storage/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.12.0-rc2</version>
+        <version>4.12.0-rc3</version>
     </parent>
 
     <version>2.1.0</version>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.split.client</groupId>
     <artifactId>java-client-parent</artifactId>
-    <version>4.12.0-rc2</version>
+    <version>4.12.0-rc3</version>
     <dependencyManagement>
         <dependencies>
             <dependency>

redis-wrapper/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.12.0-rc2</version>
+        <version>4.12.0-rc3</version>
     </parent>
     <artifactId>redis-wrapper</artifactId>
     <version>3.1.0</version>

testing/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.12.0-rc2</version>
+        <version>4.12.0-rc3</version>
     </parent>
     <artifactId>java-client-testing</artifactId>
     <packaging>jar</packaging>