Keep only 1 ByteBuffer basicPublish method

Author: acogoluegnes

src/main/java/com/rabbitmq/client/Channel.java

@@ -300,61 +300,12 @@ void basicPublish(String exchange, String routingKey, boolean mandatory, BasicPr
     void basicPublish(String exchange, String routingKey, boolean mandatory, boolean immediate, BasicProperties props, byte[] body)
             throws IOException;
 
-    /**
-     * Publish a message with a {@link ByteBuffer} body for zero-copy transmission.
-     *
-     * <p>The buffer's content between its current position and its limit will be sent.
-     * The caller must not modify the buffer after this call returns.
-     *
-     * @see #basicPublish(String, String, BasicProperties, byte[])
-     * @param exchange the exchange to publish the message to
-     * @param routingKey the routing key
-     * @param props other properties for the message - routing headers etc
-     * @param body the message body
-     * @throws java.io.IOException if an error is encountered
-     */
-    default void basicPublish(String exchange, String routingKey, BasicProperties props, ByteBuffer body) throws IOException {
-        basicPublish(exchange, routingKey, false, false, props, body, null);
-    }
-
-    /**
-     * Publish a message with a {@link ByteBuffer} body for zero-copy transmission.
-     *
-     * @see #basicPublish(String, String, boolean, BasicProperties, byte[])
-     * @param exchange the exchange to publish the message to
-     * @param routingKey the routing key
-     * @param mandatory true if the 'mandatory' flag is to be set
-     * @param props other properties for the message - routing headers etc
-     * @param body the message body
-     * @throws java.io.IOException if an error is encountered
-     */
-    default void basicPublish(String exchange, String routingKey, boolean mandatory, BasicProperties props, ByteBuffer body)
-            throws IOException {
-        basicPublish(exchange, routingKey, mandatory, false, props, body, null);
-    }
-
-    /**
-     * Publish a message with a {@link ByteBuffer} body for zero-copy transmission.
-     *
-     * @see #basicPublish(String, String, boolean, boolean, BasicProperties, byte[])
-     * @param exchange the exchange to publish the message to
-     * @param routingKey the routing key
-     * @param mandatory true if the 'mandatory' flag is to be set
-     * @param immediate true if the 'immediate' flag is to be
-     * set. Note that the RabbitMQ server does not support this flag.
-     * @param props other properties for the message - routing headers etc
-     * @param body the message body
-     * @throws java.io.IOException if an error is encountered
-     */
-    default void basicPublish(String exchange, String routingKey, boolean mandatory, boolean immediate, BasicProperties props, ByteBuffer body)
-            throws IOException {
-        basicPublish(exchange, routingKey, mandatory, immediate, props, body, null);
-    }
-
     /**
      * Publish a message with a {@link ByteBuffer} body and a {@link WriteListener} for
      * write completion notification.
      *
+     * <p>The buffer's content between its current position and its limit will be sent.
+     *
      * <p>The listener is called when the network layer has finished writing the body to the
      * socket. This is useful for off-heap buffers that must be released after the write completes.
      *
@@ -363,39 +314,6 @@ default void basicPublish(String exchange, String routingKey, boolean mandatory,
      *
      * @param exchange the exchange to publish the message to
      * @param routingKey the routing key
-     * @param props other properties for the message - routing headers etc
-     * @param body the message body
-     * @param listener called when the write completes, may be {@code null}
-     * @throws java.io.IOException if an error is encountered
-     */
-    default void basicPublish(String exchange, String routingKey, BasicProperties props, ByteBuffer body, WriteListener listener)
-            throws IOException {
-        basicPublish(exchange, routingKey, false, false, props, body, listener);
-    }
-
-    /**
-     * Publish a message with a {@link ByteBuffer} body and a {@link WriteListener} for
-     * write completion notification.
-     *
-     * @param exchange the exchange to publish the message to
-     * @param routingKey the routing key
-     * @param mandatory true if the 'mandatory' flag is to be set
-     * @param props other properties for the message - routing headers etc
-     * @param body the message body
-     * @param listener called when the write completes, may be {@code null}
-     * @throws java.io.IOException if an error is encountered
-     */
-    default void basicPublish(String exchange, String routingKey, boolean mandatory, BasicProperties props, ByteBuffer body, WriteListener listener)
-            throws IOException {
-        basicPublish(exchange, routingKey, mandatory, false, props, body, listener);
-    }
-
-    /**
-     * Publish a message with a {@link ByteBuffer} body and a {@link WriteListener} for
-     * write completion notification.
-     *
-     * @param exchange the exchange to publish the message to
-     * @param routingKey the routing key
      * @param mandatory true if the 'mandatory' flag is to be set
      * @param immediate true if the 'immediate' flag is to be
      * set. Note that the RabbitMQ server does not support this flag.

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

@@ -720,56 +720,6 @@ public void basicPublish(String exchange, String routingKey,
                 body == null ? null : ByteBuffer.wrap(body), null);
     }
 
-    /** Public API - {@inheritDoc} */
-    @Override
-    public void basicPublish(String exchange, String routingKey,
-                             BasicProperties props, ByteBuffer body)
-        throws IOException
-    {
-        basicPublish(exchange, routingKey, false, false, props, body, null);
-    }
-
-    /** Public API - {@inheritDoc} */
-    @Override
-    public void basicPublish(String exchange, String routingKey,
-                             boolean mandatory,
-                             BasicProperties props, ByteBuffer body)
-        throws IOException
-    {
-        basicPublish(exchange, routingKey, mandatory, false, props, body, null);
-    }
-
-    /** Public API - {@inheritDoc} */
-    @Override
-    public void basicPublish(String exchange, String routingKey,
-                             boolean mandatory, boolean immediate,
-                             BasicProperties props, ByteBuffer body)
-        throws IOException
-    {
-        basicPublish(exchange, routingKey, mandatory, immediate, props, body, null);
-    }
-
-    /** Public API - {@inheritDoc} */
-    @Override
-    public void basicPublish(String exchange, String routingKey,
-                             BasicProperties props, ByteBuffer body,
-                             WriteListener listener)
-        throws IOException
-    {
-        basicPublish(exchange, routingKey, false, false, props, body, listener);
-    }
-
-    /** Public API - {@inheritDoc} */
-    @Override
-    public void basicPublish(String exchange, String routingKey,
-                             boolean mandatory,
-                             BasicProperties props, ByteBuffer body,
-                             WriteListener listener)
-        throws IOException
-    {
-        basicPublish(exchange, routingKey, mandatory, false, props, body, listener);
-    }
-
     /** Public API - {@inheritDoc} */
     @Override
     public void basicPublish(String exchange, String routingKey,

src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java

@@ -222,31 +222,6 @@ public void basicPublish(String exchange, String routingKey, boolean mandatory,
         delegate.basicPublish(exchange, routingKey, mandatory, immediate, props, body);
     }
 
-    @Override
-    public void basicPublish(String exchange, String routingKey, AMQP.BasicProperties props, ByteBuffer body) throws IOException {
-        delegate.basicPublish(exchange, routingKey, props, body);
-    }
-
-    @Override
-    public void basicPublish(String exchange, String routingKey, boolean mandatory, AMQP.BasicProperties props, ByteBuffer body) throws IOException {
-        delegate.basicPublish(exchange, routingKey, mandatory, props, body);
-    }
-
-    @Override
-    public void basicPublish(String exchange, String routingKey, boolean mandatory, boolean immediate, AMQP.BasicProperties props, ByteBuffer body) throws IOException {
-        delegate.basicPublish(exchange, routingKey, mandatory, immediate, props, body);
-    }
-
-    @Override
-    public void basicPublish(String exchange, String routingKey, AMQP.BasicProperties props, ByteBuffer body, WriteListener listener) throws IOException {
-        delegate.basicPublish(exchange, routingKey, props, body, listener);
-    }
-
-    @Override
-    public void basicPublish(String exchange, String routingKey, boolean mandatory, AMQP.BasicProperties props, ByteBuffer body, WriteListener listener) throws IOException {
-        delegate.basicPublish(exchange, routingKey, mandatory, props, body, listener);
-    }
-
     @Override
     public void basicPublish(String exchange, String routingKey, boolean mandatory, boolean immediate, AMQP.BasicProperties props, ByteBuffer body, WriteListener listener) throws IOException {
         delegate.basicPublish(exchange, routingKey, mandatory, immediate, props, body, listener);