remove confirm.select{multiple} from java API

Author: Alexandru Scvortov

src/com/rabbitmq/client/Channel.java

@@ -660,12 +660,10 @@ Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, b
 
     /**
      * Enables publisher acknowledgements on this channel.
-     * @param multiple determines whether the broker can acknowledge
-     * multiple messages at the same time
      * @see com.rabbitmq.client.AMQP.Confirm.Select
      * @throws java.io.IOException if an error is encountered
      */
-    Confirm.SelectOk confirmSelect(boolean multiple) throws IOException;
+    Confirm.SelectOk confirmSelect() throws IOException;
 
     /**
      * Returns the number of messages published since the channel was

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

@@ -851,13 +851,13 @@ public Tx.RollbackOk txRollback()
     }
 
     /** Public API - {@inheritDoc} */
-    public Confirm.SelectOk confirmSelect(boolean multiple)
+    public Confirm.SelectOk confirmSelect()
         throws IOException
     {
         if (publishedMessageCount.get() == -1)
             publishedMessageCount.set(0);
         return (Confirm.SelectOk)
-            exnWrappingRpc(new Confirm.Select(multiple, false)).getMethod();
+            exnWrappingRpc(new Confirm.Select(false)).getMethod();
 
     }
 

test/src/com/rabbitmq/client/test/functional/Confirm.java

@@ -65,7 +65,7 @@ public void handleAck(long seqNo,
                     }
                 }
             });
-        channel.confirmSelect(true);
+        channel.confirmSelect();
         channel.queueDeclare("confirm-test", true, true, false, null);
         channel.basicConsume("confirm-test", true,
                              new DefaultConsumer(channel));
@@ -217,7 +217,7 @@ public void testConfirmSelect()
     {
         try {
             Channel ch = connection.createChannel();
-            ch.confirmSelect(false);
+            ch.confirmSelect();
             ch.txSelect();
             fail();
         } catch (IOException ioe) {
@@ -226,22 +226,14 @@ public void testConfirmSelect()
         try {
             Channel ch = connection.createChannel();
             ch.txSelect();
-            ch.confirmSelect(false);
-            fail();
-        } catch (IOException ioe) {
-            checkShutdownSignal(AMQP.PRECONDITION_FAILED, ioe);
-        }
-        try {
-            Channel ch = connection.createChannel();
-            ch.confirmSelect(true);
-            ch.confirmSelect(false);
+            ch.confirmSelect();
             fail();
         } catch (IOException ioe) {
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, ioe);
         }
         Channel ch = connection.createChannel();
-        ch.confirmSelect(true);
-        ch.confirmSelect(true);
+        ch.confirmSelect();
+        ch.confirmSelect();
     }
 
     /* Publish NUM_MESSAGES persistent messages and wait for

test/src/com/rabbitmq/examples/ConfirmDontLoseMessages.java

@@ -73,7 +73,7 @@ public void run() {
                 Connection conn = connectionFactory.newConnection();
                 Channel ch = conn.createChannel();
                 ch.queueDeclare(QUEUE_NAME, true, false, true, null);
-                ch.confirmSelect(true);
+                ch.confirmSelect();
                 ch.setAckListener(new AckListener() {
                         public void handleAck(long seqNo,
                                               boolean multiple) {

test/src/com/rabbitmq/examples/MulticastMain.java

@@ -141,7 +141,7 @@ public static void main(String[] args) {
                 producerConnections[i] = conn;
                 Channel channel = conn.createChannel();
                 if (producerTxSize > 0) channel.txSelect();
-                if (pubAck) channel.confirmSelect(false);
+                if (pubAck) channel.confirmSelect();
                 channel.exchangeDeclare(exchangeName, exchangeType);
                 final Producer p = new Producer(channel, exchangeName, id,
                                                 flags, producerTxSize,