Drop markUnderlyingConnectionAsToBeClosed , close connection when AsyncHandler.onBodyPartReceived doesn't say to continue, close AsyncHttpClient#982

Author: slandelle

client/src/main/java/org/asynchttpclient/AsyncHandler.java

@@ -74,7 +74,7 @@ enum State {
      * Beware that, depending on the provider (Netty) this can be notified with empty body parts.
      *
      * @param bodyPart response's body part.
-     * @return a {@link State} telling to CONTINUE or ABORT the current processing.
+     * @return a {@link State} telling to CONTINUE or ABORT the current processing. Aborting will also close the connection.
      * @throws Exception if something wrong happens
      */
     State onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exception;

client/src/main/java/org/asynchttpclient/HttpResponseBodyPart.java

@@ -42,16 +42,4 @@ public interface HttpResponseBodyPart {
      * @return true if this is the last part.
      */
     boolean isLast();
-
-    /**
-     * Close the underlying connection once the processing has completed. Invoking that method means the
-     * underlying TCP connection will be closed as soon as the processing of the response is completed. That
-     * means the underlying connection will never get pooled.
-     */
-    void markUnderlyingConnectionAsToBeClosed();
-
-    /**
-     * @return true of the underlying connection will be closed once the response has been fully processed.
-     */
-    boolean isUnderlyingConnectionToBeClosed();
 }

client/src/main/java/org/asynchttpclient/netty/NettyResponseBodyPart.java

@@ -21,7 +21,6 @@
 public abstract class NettyResponseBodyPart implements HttpResponseBodyPart {
 
     private final boolean last;
-    private boolean closeConnection;
 
     public NettyResponseBodyPart(boolean last) {
         this.last = last;
@@ -34,20 +33,4 @@ public NettyResponseBodyPart(boolean last) {
     public boolean isLast() {
         return last;
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void markUnderlyingConnectionAsToBeClosed() {
-        closeConnection = true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isUnderlyingConnectionToBeClosed() {
-        return closeConnection;
-    }
 }

client/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java

@@ -151,7 +151,7 @@ private void finishUpdate(final NettyResponseFuture<?> future, Channel channel,
 
     private boolean updateBodyAndInterrupt(NettyResponseFuture<?> future, AsyncHandler<?> handler, NettyResponseBodyPart bodyPart) throws Exception {
         boolean interrupt = handler.onBodyPartReceived(bodyPart) != State.CONTINUE;
-        if (bodyPart.isUnderlyingConnectionToBeClosed())
+        if (interrupt)
             future.setKeepAlive(false);
         return interrupt;
     }

client/src/test/java/org/asynchttpclient/AsyncStreamHandlerTest.java

@@ -447,11 +447,7 @@ public void onThrowable(Throwable t) {
 
                 public State onBodyPartReceived(HttpResponseBodyPart content) throws Exception {
                     builder.accumulate(content);
-
-                    if (content.isLast()) {
-                        content.markUnderlyingConnectionAsToBeClosed();
-                    }
-                    return State.CONTINUE;
+                    return content.isLast() ? State.ABORT : State.CONTINUE;
                 }
 
                 public State onStatusReceived(HttpResponseStatus responseStatus) throws Exception {