rename pubAck -> confirm

Author: Alexandru Scvortov

build.xml

@@ -28,7 +28,7 @@
 
   <property name="AMQP_SPEC_JSON_PATH" value="${codegen.dir}/amqp-rabbitmq-${spec.version}.json"/>
 
-  <property name="RABBIT_SPEC_EXTENSIONS" value="${codegen.dir}/puback-extension.json"/>
+  <property name="RABBIT_SPEC_EXTENSIONS" value="${codegen.dir}/confirm-extension.json"/>
 
   <target name="amqp-generate-check" description="check if codegen needs to be run">
     <uptodate property="amqp.generate.notRequired">

src/com/rabbitmq/client/Channel.java

@@ -38,7 +38,7 @@
 import com.rabbitmq.client.AMQP.Queue;
 import com.rabbitmq.client.AMQP.Tx;
 import com.rabbitmq.client.AMQP.Basic;
-import com.rabbitmq.client.AMQP.PubAck;
+import com.rabbitmq.client.AMQP.Confirm;
 import com.rabbitmq.client.AMQP.Channel.FlowOk;
 
 /**
@@ -602,16 +602,19 @@ Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, b
      * Enables publisher acknowledgements on this channel.
      * @param many determines whether the broker can acknowledge
      * multiple messages at the same time
-     * @see com.rabbitmq.client.AMQP.PubAck.Select
+     * @see com.rabbitmq.client.AMQP.Confirm.Select
      * @throws java.io.IOException if an error is encountered
      */
-    void pubAckSelect(boolean many) throws IOException;
+    Confirm.SelectOk confirmSelect(boolean multiple) throws IOException;
 
     /**
-     * Disables publisher acknowledgements on this channel.
-     * @see com.rabbitmq.client.AMQP.PubAck.Deselect
-     * @see com.rabbitmq.client.AMQP.PubAck.DeselectOk
+     * Enables publisher acknowledgements on this channel.
+     * @param many determines whether the broker can acknowledge
+     * multiple messages at the same time
+     * @param nowait whether to await completion of the request
+     * @see com.rabbitmq.client.AMQP.Confirm.Select
      * @throws java.io.IOException if an error is encountered
      */
-    PubAck.DeselectOk pubAckDeselect() throws IOException;
+    Confirm.SelectOk confirmSelect(boolean multiple, boolean nowait)
+        throws IOException;
 }

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

@@ -46,10 +46,10 @@
 import com.rabbitmq.client.UnexpectedMethodError;
 import com.rabbitmq.client.impl.AMQImpl.Basic;
 import com.rabbitmq.client.impl.AMQImpl.Channel;
+import com.rabbitmq.client.impl.AMQImpl.Confirm;
 import com.rabbitmq.client.impl.AMQImpl.Exchange;
 import com.rabbitmq.client.impl.AMQImpl.Queue;
 import com.rabbitmq.client.impl.AMQImpl.Tx;
-import com.rabbitmq.client.impl.AMQImpl.PubAck;
 import com.rabbitmq.utility.Utility;
 
 import java.io.IOException;
@@ -813,17 +813,18 @@ public Tx.RollbackOk txRollback()
     }
 
     /** Public API - {@inheritDoc} */
-    public void pubAckSelect(boolean many)
+    public Confirm.SelectOk confirmSelect(boolean multiple)
         throws IOException
     {
-        transmit(new PubAck.Select(many));
+        return confirmSelect(multiple, false);
     }
 
     /** Public API - {@inheritDoc} */
-    public PubAck.DeselectOk pubAckDeselect()
+    public Confirm.SelectOk confirmSelect(boolean multiple, boolean nowait)
         throws IOException
     {
-        return (PubAck.DeselectOk) exnWrappingRpc(new PubAck.Deselect()).getMethod();
+        return (Confirm.SelectOk)
+            exnWrappingRpc(new Confirm.Select(multiple, nowait)).getMethod();
     }
 
     /** Public API - {@inheritDoc} */

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

@@ -201,6 +201,10 @@ public void handleFlowListenerException(Channel ch, Throwable ex) {
             fail("handleFlowListenerException: " + ex);
         }
 
+        public void handleAckListenerException(Channel ch, Throwable ex) {
+            fail("handleAckListenerException: " + ex);
+        }
+
         public void handleConsumerException(Channel ch,
                                             Throwable ex,
                                             Consumer c,