abort sse request before closing response

Author: mredolatti

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.1.2</version>
+        <version>4.1.3-rc1</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>

client/src/main/java/io/split/engine/sse/client/SSEClient.java

@@ -2,12 +2,8 @@
 
 import com.google.common.base.Strings;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.core5.util.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,6 +46,7 @@ private enum ConnectionState {
     private final Function<StatusMessage, Void> _statusCallback;
     private final AtomicReference<ConnectionState> _state = new AtomicReference<>(ConnectionState.CLOSED);
     private final AtomicReference<CloseableHttpResponse> _ongoingResponse = new AtomicReference<>();
+    private final AtomicReference<HttpGet> _ongoingRequest = new AtomicReference<>();
 
     public SSEClient(Function<RawEvent, Void> eventCallback,
                      Function<StatusMessage, Void> statusCallback,
@@ -91,6 +88,7 @@ public synchronized void close() {
         if (_state.compareAndSet(ConnectionState.OPEN, ConnectionState.CLOSED)) {
             if (_ongoingResponse.get() != null) {
                 try {
+                    _ongoingRequest.get().abort();
                     _ongoingResponse.get().close();
                 } catch (IOException e) {
                     _log.debug(String.format("Error closing SSEClient: %s", e.getMessage()));
@@ -145,10 +143,11 @@ private void connectAndLoop(URI uri, CountDownLatch signal) {
     }
 
     private boolean establishConnection(URI uri, CountDownLatch signal) {
-        HttpGet request = new HttpGet(uri);
+
+        _ongoingRequest.set(new HttpGet(uri));
 
         try {
-            _ongoingResponse.set(_client.execute(request));
+            _ongoingResponse.set(_client.execute(_ongoingRequest.get()));
             if (_ongoingResponse.get().getCode() != 200) {
                 return false;
             }

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.split.client</groupId>
     <artifactId>java-client-parent</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3-rc1</version>
     <dependencyManagement>
         <dependencies>
             <dependency>

testing/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.1.2</version>
+        <version>4.1.3-rc1</version>
     </parent>
 
     <artifactId>java-client-testing</artifactId>