diff --git a/client/pom.xml b/client/pom.xml index 12cda4f3..7a6a53ca 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.12.0-rc2 + 4.12.0-rc3 java-client jar diff --git a/client/src/main/java/io/split/engine/common/SplitAPI.java b/client/src/main/java/io/split/engine/common/SplitAPI.java index 229f34cb..adb0500d 100644 --- a/client/src/main/java/io/split/engine/common/SplitAPI.java +++ b/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); } } -} \ No newline at end of file +} diff --git a/client/src/main/java/io/split/service/SplitHttpClient.java b/client/src/main/java/io/split/service/SplitHttpClient.java index 1e44a49b..1c88bcd4 100644 --- a/client/src/main/java/io/split/service/SplitHttpClient.java +++ b/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 * diff --git a/client/src/main/java/io/split/service/SplitHttpClientImpl.java b/client/src/main/java/io/split/service/SplitHttpClientImpl.java index ed4bb5aa..64ca3a55 100644 --- a/client/src/main/java/io/split/service/SplitHttpClientImpl.java +++ b/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(); + } } diff --git a/pluggable-storage/pom.xml b/pluggable-storage/pom.xml index d7262066..d2d75905 100644 --- a/pluggable-storage/pom.xml +++ b/pluggable-storage/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.12.0-rc2 + 4.12.0-rc3 2.1.0 diff --git a/pom.xml b/pom.xml index 06f94991..91f89a44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.split.client java-client-parent - 4.12.0-rc2 + 4.12.0-rc3 diff --git a/redis-wrapper/pom.xml b/redis-wrapper/pom.xml index 498ec361..0beb3ed7 100644 --- a/redis-wrapper/pom.xml +++ b/redis-wrapper/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.12.0-rc2 + 4.12.0-rc3 redis-wrapper 3.1.0 diff --git a/testing/pom.xml b/testing/pom.xml index 4bbe4b31..e49a96c6 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.12.0-rc2 + 4.12.0-rc3 java-client-testing jar