Keep one flush method in FrameHandler

Author: acogoluegnes

src/main/java/com/rabbitmq/client/impl/DefaultHeartbeatSender.java

@@ -137,7 +137,7 @@ public void run() {
 
                 if (now > (lastActivityTime + this.heartbeatNanos)) {
                     frameHandler.writeFrame(new Frame(AMQP.FRAME_HEARTBEAT, 0));
-                    frameHandler.flush();
+                    frameHandler.flush(null);
                 }
             } catch (IOException e) {
                 // ignore

src/main/java/com/rabbitmq/client/impl/FrameHandler.java

@@ -74,24 +74,13 @@ default void finishConnectionNegotiation() {
      */
     void writeFrame(Frame frame) throws IOException;
 
-    /**
-     * Flush the underlying data connection.
-     * @throws IOException if there is a problem accessing the connection
-     */
-    void flush() throws IOException;
-
     /**
      * Flush the underlying data connection and notify the listener when the write completes.
      * The default implementation flushes synchronously and calls the listener immediately.
      * @param listener called when the flush completes, may be {@code null}
      * @throws IOException if there is a problem accessing the connection
      */
-    default void flush(WriteListener listener) throws IOException {
-        flush();
-        if (listener != null) {
-            listener.done(true, null);
-        }
-    }
+    void flush(WriteListener listener) throws IOException;
 
     /** Close the underlying data connection (complaint not permitted). */
     void close();

src/main/java/com/rabbitmq/client/impl/NettyFrameHandlerFactory.java

@@ -403,11 +403,6 @@ private void doWriteFrame(Frame frame) throws IOException {
       }
     }
 
-    @Override
-    public void flush() {
-      this.channel.flush();
-    }
-
     @Override
     public void flush(WriteListener listener) {
       if (listener == null) {

src/main/java/com/rabbitmq/client/impl/SocketFrameHandler.java

@@ -16,6 +16,7 @@
 package com.rabbitmq.client.impl;
 
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.WriteListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -213,21 +214,21 @@ public void writeFrame(Frame frame) throws IOException {
     }
 
     @Override
-    public void flush() throws IOException {
+    public void flush(WriteListener listener) throws IOException {
         _outputStream.flush();
+        if (listener != null) {
+            listener.done(true, null);
+        }
     }
 
     @Override
     public void close() {
         try { _socket.setSoLinger(true, SOCKET_CLOSING_TIMEOUT); } catch (Exception _e) {}
         // async flush if possible
         // see https://github.com/rabbitmq/rabbitmq-java-client/issues/194
-        Callable<Void> flushCallable = new Callable<Void>() {
-            @Override
-            public Void call() throws Exception {
-                flush();
-                return null;
-            }
+        Callable<Void> flushCallable = () -> {
+            flush(null);
+            return null;
         };
         Future<Void> flushTask = null;
         try {

src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java

@@ -264,7 +264,7 @@ public int getPort() {
             return -1;
         }
 
-        public void flush() throws IOException {
+        public void flush(WriteListener listener) throws IOException {
             // no need to implement this: don't bother writing the frame
         }
 

src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java

@@ -19,6 +19,7 @@
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.UnexpectedFrameError;
+import com.rabbitmq.client.WriteListener;
 import com.rabbitmq.client.impl.AMQConnection;
 import com.rabbitmq.client.impl.AMQImpl.Basic.Publish;
 import com.rabbitmq.client.impl.Frame;
@@ -152,7 +153,7 @@ public int getPort() {
             return -1;
         }
 
-        public void flush() throws IOException {
+        public void flush(WriteListener listener) throws IOException {
             // no need to implement this: don't bother writing the frame
         }