Alter signatures to the latest 0-91 draft XML

Author: tonyg

src/com/rabbitmq/client/Channel.java

@@ -320,31 +320,29 @@ Queue.DeclareOk queueDeclare(int ticket, String queue, boolean passive, boolean
     Queue.BindOk queueBind(int ticket, String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
 
     /**
-     * Uninds a queue from an exchange, with no extra arguments.
+     * Unbinds a queue from an exchange, with no extra arguments.
      * @see com.rabbitmq.client.AMQP.Queue.Unbind
      * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
-     * @param ticket an access ticket for the appropriate realm
      * @param queue the name of the queue
      * @param exchange the name of the exchange
      * @param routingKey the routine key to use for the binding
      * @return an unbinding-confirm method if the binding was successfully deleted
      * @throws java.io.IOException if an error is encountered
      */
-    Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange, String routingKey) throws IOException;
+    Queue.UnbindOk queueUnbind(String queue, String exchange, String routingKey) throws IOException;
 
     /**
      * Unbind a queue from an exchange.
      * @see com.rabbitmq.client.AMQP.Queue.Unbind
      * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
-     * @param ticket an access ticket for the appropriate realm
      * @param queue the name of the queue
      * @param exchange the name of the exchange
      * @param routingKey the routine key to use for the binding
      * @param arguments other properties (binding parameters)
      * @return an unbinding-confirm method if the binding was successfully deleted
      * @throws java.io.IOException if an error is encountered
      */
-    Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
+    Queue.UnbindOk queueUnbind(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
 
     /**
      * Retrieve a message from a queue using {@link com.rabbitmq.client.AMQP.Basic.Get}

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

@@ -540,13 +540,13 @@ public Queue.BindOk queueBind(int ticket, String queue, String exchange,
      * @see com.rabbitmq.client.AMQP.Queue.Unbind
      * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
      */
-    public Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange,
-                                  String routingKey, Map<String, Object> arguments)
+    public Queue.UnbindOk queueUnbind(String queue, String exchange, String routingKey,
+                                      Map<String, Object> arguments)
         throws IOException
     {
         return (Queue.UnbindOk)
-            exnWrappingRpc(new Queue.Unbind(ticket, queue, exchange, routingKey,
-                                          arguments)).getMethod();
+            exnWrappingRpc(new Queue.Unbind(queue, exchange, routingKey,
+                                            arguments, false)).getMethod();
     }
 
     /**
@@ -565,10 +565,10 @@ public Queue.BindOk queueBind(int ticket, String queue, String exchange, String
      * @see com.rabbitmq.client.AMQP.Queue.Unbind
      * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
      */
-    public Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange, String routingKey)
+    public Queue.UnbindOk queueUnbind(String queue, String exchange, String routingKey)
         throws IOException
     {
-        return queueUnbind(ticket, queue, exchange, routingKey, null);
+        return queueUnbind(queue, exchange, routingKey, null);
     }
 
     /**

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

@@ -132,7 +132,7 @@ public void testUnbind() throws Exception {
         channel.basicPublish(ticket, x, routingKey, null, "foobar".getBytes());
         checkGet(queue, true);
 
-        channel.queueUnbind(ticket, queue, x, routingKey);
+        channel.queueUnbind(queue, x, routingKey);
 
         channel.basicPublish(ticket, x, routingKey, null, "foobar".getBytes());
         checkGet(queue, false);