Merging bug22828 onto default

Author: Matthew Sackman

build.xml

@@ -388,6 +388,19 @@
     </junit>
   </target>
 
+  <target name="test-single" depends="test-build">
+    <junit printSummary="withOutAndErr"
+        haltOnFailure="${haltOnFailureJunit}"
+        failureproperty="test.failure"
+        fork="yes">
+      <classpath refid="test.classpath"/>
+
+      <formatter type="plain"/>
+      <formatter type="xml"/>
+      <test todir="${build.out}" name="${test}"/>
+    </junit>
+  </target>
+
   <target name="jar" depends="build">
     <mkdir dir="${lib.out}"/>
     <antcall target="doJarWithTags">

src/com/rabbitmq/client/Channel.java

@@ -37,6 +37,7 @@
 import com.rabbitmq.client.AMQP.Exchange;
 import com.rabbitmq.client.AMQP.Queue;
 import com.rabbitmq.client.AMQP.Tx;
+import com.rabbitmq.client.AMQP.Basic;
 import com.rabbitmq.client.AMQP.Channel.FlowOk;
 
 /**
@@ -91,10 +92,10 @@ public interface Channel extends ShutdownNotifier {
      * @throws java.io.IOException if an error is encountered
      */
     void close(int closeCode, String closeMessage) throws IOException;
-    
+
     /**
      * Set flow on the channel
-     * 
+     *
      * @param active if true, the server is asked to start sending. If false, the server is asked to stop sending.
      * @throws IOException
      */
@@ -183,38 +184,17 @@ public interface Channel extends ShutdownNotifier {
     void basicPublish(String exchange, String routingKey, boolean mandatory, boolean immediate, BasicProperties props, byte[] body)
             throws IOException;
 
-    /**
-     * Delete an exchange, without regard for whether it is in use or not
-     * @see com.rabbitmq.client.AMQP.Exchange.Delete
-     * @see com.rabbitmq.client.AMQP.Exchange.DeleteOk
-     * @param exchange the name of the exchange
-     * @return a deletion-confirm method to indicate the exchange was successfully deleted
-     * @throws java.io.IOException if an error is encountered
-     */
-    Exchange.DeleteOk exchangeDelete(String exchange) throws IOException;
-
     /**
      * Actively declare a non-autodelete, non-durable exchange with no extra arguments
      * @see com.rabbitmq.client.AMQP.Exchange.Declare
      * @see com.rabbitmq.client.AMQP.Exchange.DeclareOk
      * @param exchange the name of the exchange
      * @param type the exchange type
-     * @return a deletion-confirm method to indicate the exchange was successfully deleted
+     * @return a declaration-confirm method to indicate the exchange was successfully declared
      * @throws java.io.IOException if an error is encountered
      */
     Exchange.DeclareOk exchangeDeclare(String exchange, String type) throws IOException;
 
-    /**
-     * Delete an exchange
-     * @see com.rabbitmq.client.AMQP.Exchange.Delete
-     * @see com.rabbitmq.client.AMQP.Exchange.DeleteOk
-     * @param exchange the name of the exchange
-     * @param ifUnused true to indicate that the exchange is only to be deleted if it is unused
-     * @return a deletion-confirm method to indicate the exchange was successfully deleted
-     * @throws java.io.IOException if an error is encountered
-     */
-    Exchange.DeleteOk exchangeDelete(String exchange, boolean ifUnused) throws IOException;
-
     /**
      * Actively declare a non-autodelete exchange with no extra arguments
      * @see com.rabbitmq.client.AMQP.Exchange.Declare
@@ -228,70 +208,88 @@ void basicPublish(String exchange, String routingKey, boolean mandatory, boolean
     Exchange.DeclareOk exchangeDeclare(String exchange, String type, boolean durable) throws IOException;
 
     /**
-     * Declare an exchange, via an interface that allows the complete set of arguments
-     * The name of the new queue is held in the "queue" field of the {@link com.rabbitmq.client.AMQP.Queue.DeclareOk} result.
+     * Declare an exchange, via an interface that allows the complete set of arguments.
      * @see com.rabbitmq.client.AMQP.Exchange.Declare
      * @see com.rabbitmq.client.AMQP.Exchange.DeclareOk
      * @param exchange the name of the exchange
      * @param type the exchange type
-     * @param passive true if we are passively declaring a exchange (asserting the exchange already exists)
      * @param durable true if we are declaring a durable exchange (the exchange will survive a server restart)
      * @param autoDelete true if the server should delete the exchange when it is no longer in use
      * @param arguments other properties (construction arguments) for the exchange
      * @return a declaration-confirm method to indicate the exchange was successfully declared
      * @throws java.io.IOException if an error is encountered
      */
-    Exchange.DeclareOk exchangeDeclare(String exchange, String type, boolean passive, boolean durable, boolean autoDelete,
+    Exchange.DeclareOk exchangeDeclare(String exchange, String type, boolean durable, boolean autoDelete,
                                        Map<String, Object> arguments) throws IOException;
 
     /**
-     * Actively declare a server-named exclusive, autodelete, non-durable queue.
-     * The name of the new queue is held in the "queue" field of the {@link com.rabbitmq.client.AMQP.Queue.DeclareOk} result.
-     * @see com.rabbitmq.client.AMQP.Queue.Declare
-     * @see com.rabbitmq.client.AMQP.Queue.DeclareOk
-     * @return a declaration-confirm method to indicate the exchange was successfully declared
+     * Declare an exchange passively; that is, check if the named exchange exists.
+     * @param name check the existence of an exchange named this
+     * @param type the exchange type
+     * @throws IOException the server will raise a 404 channel exception if the named exchange does not exist.
+     */
+    Exchange.DeclareOk exchangeDeclarePassive(String name, String type) throws IOException;
+
+    /**
+     * Delete an exchange
+     * @see com.rabbitmq.client.AMQP.Exchange.Delete
+     * @see com.rabbitmq.client.AMQP.Exchange.DeleteOk
+     * @param exchange the name of the exchange
+     * @param ifUnused true to indicate that the exchange is only to be deleted if it is unused
+     * @return a deletion-confirm method to indicate the exchange was successfully deleted
      * @throws java.io.IOException if an error is encountered
      */
-    Queue.DeclareOk queueDeclare() throws IOException;
+    Exchange.DeleteOk exchangeDelete(String exchange, boolean ifUnused) throws IOException;
 
     /**
-     * Actively declare a non-exclusive, non-autodelete, non-durable queue
-     * @see com.rabbitmq.client.AMQP.Queue.Declare
-     * @see com.rabbitmq.client.AMQP.Queue.DeclareOk
-     * @param queue the name of the queue
-     * @return a declaration-confirm method to indicate the queue was successfully declared
+     * Delete an exchange, without regard for whether it is in use or not
+     * @see com.rabbitmq.client.AMQP.Exchange.Delete
+     * @see com.rabbitmq.client.AMQP.Exchange.DeleteOk
+     * @param exchange the name of the exchange
+     * @return a deletion-confirm method to indicate the exchange was successfully deleted
      * @throws java.io.IOException if an error is encountered
      */
-    Queue.DeclareOk queueDeclare(String queue) throws IOException;
+    Exchange.DeleteOk exchangeDelete(String exchange) throws IOException;
 
     /**
-     * Actively declare a non-exclusive, non-autodelete queue
+     * Actively declare a server-named exclusive, autodelete, non-durable queue.
      * The name of the new queue is held in the "queue" field of the {@link com.rabbitmq.client.AMQP.Queue.DeclareOk} result.
      * @see com.rabbitmq.client.AMQP.Queue.Declare
      * @see com.rabbitmq.client.AMQP.Queue.DeclareOk
-     * @param queue the name of the queue
-     * @param durable true if we are declaring a durable exchange (the exchange will survive a server restart)
-     * @return a declaration-confirm method to indicate the exchange was successfully declared
+     * @return a declaration-confirm method to indicate the queue was successfully declared
      * @throws java.io.IOException if an error is encountered
      */
-    Queue.DeclareOk queueDeclare(String queue, boolean durable) throws IOException;
+    Queue.DeclareOk queueDeclare() throws IOException;
 
     /**
      * Declare a queue
      * @see com.rabbitmq.client.AMQP.Queue.Declare
      * @see com.rabbitmq.client.AMQP.Queue.DeclareOk
      * @param queue the name of the queue
-     * @param passive true if we are passively declaring a queue (asserting the queue already exists)
      * @param durable true if we are declaring a durable queue (the queue will survive a server restart)
-     * @param exclusive true if we are declaring an exclusive queue
+     * @param exclusive true if we are declaring an exclusive queue (restricted to this connection)
      * @param autoDelete true if we are declaring an autodelete queue (server will delete it when no longer in use)
      * @param arguments other properties (construction arguments) for the queue
      * @return a declaration-confirm method to indicate the queue was successfully declared
      * @throws java.io.IOException if an error is encountered
      */
-    Queue.DeclareOk queueDeclare(String queue, boolean passive, boolean durable, boolean exclusive, boolean autoDelete,
+    Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, boolean autoDelete,
                                  Map<String, Object> arguments) throws IOException;
 
+    /**
+     * Declare a queue passively; i.e., check if it exists.  In AMQP
+     * 0-9-1, all arguments aside from nowait are ignored; and sending
+     * nowait makes this method a no-op, so we default it to false.
+     * @see com.rabbitmq.client.AMQP.Queue.Declare
+     * @see com.rabbitmq.client.AMQP.Queue.DeclareOk
+     * @param queue the name of the queue
+     * @return a declaration-confirm method to indicate the queue exists
+     * @throws java.io.IOException if an error is encountered,
+     * including if the queue does not exist and if the queue is
+     * exclusively owned by another connection.
+     */
+    Queue.DeclareOk queueDeclarePassive(String queue) throws IOException;
+
     /**
      * Delete a queue, without regard for whether it is in use or has messages on it
      * @see com.rabbitmq.client.AMQP.Queue.Delete

src/com/rabbitmq/client/RpcClient.java

@@ -119,7 +119,7 @@ public void close() throws IOException {
      * @return the name of the reply queue
      */
     protected String setupReplyQueue() throws IOException {
-        return _channel.queueDeclare("", false, false, true, true, null).getQueue();
+        return _channel.queueDeclare("", false, true, true, null).getQueue();
     }
 
     /**

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

@@ -285,21 +285,21 @@ public void close()
     {
         close(AMQP.REPLY_SUCCESS, "OK");
     }
-    
+
     /** Public API - {@inheritDoc} */
     public void close(int closeCode, String closeMessage)
         throws IOException
     {
         close(closeCode, closeMessage, true, null, false);
     }
-    
+
     /** Public API - {@inheritDoc} */
     public void abort()
         throws IOException
     {
         abort(AMQP.REPLY_SUCCESS, "OK");
     }
-    
+
     /** Public API - {@inheritDoc} */
     public void abort(int closeCode, String closeMessage)
         throws IOException
@@ -331,7 +331,7 @@ public void close(int closeCode,
         if (cause != null) {
             signal.initCause(cause);
         }
-        
+
         BlockingRpcContinuation<AMQCommand> k = new SimpleBlockingRpcContinuation();
         boolean notify = false;
         try {
@@ -341,7 +341,7 @@ public void close(int closeCode,
                 processShutdownSignal(signal, !initiatedByApplication, true);
                 quiescingRpc(reason, k);
             }
-            
+
             // Now that we're in quiescing state, channel.close was sent and
             // we wait for the reply. We ignore the result. (It's always
             // close-ok.)
@@ -366,7 +366,7 @@ public void close(int closeCode,
                 notifyListeners();
             }
         }
-    }    
+    }
 
     /** Public API - {@inheritDoc} */
     public void basicQos(int prefetchSize, int prefetchCount, boolean global)
@@ -407,13 +407,13 @@ public void basicPublish(String exchange, String routingKey,
 
     /** Public API - {@inheritDoc} */
     public Exchange.DeclareOk exchangeDeclare(String exchange, String type,
-                                              boolean passive, boolean durable,
-                                              boolean autoDelete, Map<String, Object> arguments)
+                                              boolean durable, boolean autoDelete,
+                                              Map<String, Object> arguments)
         throws IOException
     {
         return (Exchange.DeclareOk)
             exnWrappingRpc(new Exchange.Declare(TICKET, exchange, type,
-                                                passive, durable, autoDelete,
+                                                false, durable, autoDelete,
                                                 false, false, arguments)).getMethod();
     }
 
@@ -422,14 +422,24 @@ public Exchange.DeclareOk exchangeDeclare(String exchange, String type,
                                               boolean durable)
         throws IOException
     {
-        return exchangeDeclare(exchange, type, false, durable, false, null);
+        return exchangeDeclare(exchange, type, durable, false, null);
     }
 
     /** Public API - {@inheritDoc} */
     public Exchange.DeclareOk exchangeDeclare(String exchange, String type)
         throws IOException
     {
-        return exchangeDeclare(exchange, type, false, false, false, null);
+        return exchangeDeclare(exchange, type, false, false, null);
+    }
+
+    /** Public API - {@inheritDoc} */
+    public Exchange.DeclareOk exchangeDeclarePassive(String exchange, String type)
+        throws IOException
+    {
+        return (Exchange.DeclareOk)
+            exnWrappingRpc(new Exchange.Declare(TICKET, exchange, type,
+                                                true, false, false,
+                                                false, false, null)).getMethod();
     }
 
     /** Public API - {@inheritDoc} */
@@ -448,35 +458,29 @@ public Exchange.DeleteOk exchangeDelete(String exchange)
     }
 
     /** Public API - {@inheritDoc} */
-    public Queue.DeclareOk queueDeclare(String queue, boolean passive,
-                                        boolean durable, boolean exclusive,
+    public Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive,
                                         boolean autoDelete, Map<String, Object> arguments)
         throws IOException
     {
         return (Queue.DeclareOk)
-            exnWrappingRpc(new Queue.Declare(TICKET, queue, passive, durable,
+            exnWrappingRpc(new Queue.Declare(TICKET, queue, false, durable,
                                              exclusive, autoDelete, false, arguments)).getMethod();
     }
 
     /** Public API - {@inheritDoc} */
-    public Queue.DeclareOk queueDeclare(String queue, boolean durable)
-        throws IOException
-    {
-        return queueDeclare(queue, false, durable, false, false, null);
-    }
-
-    /** Public API - {@inheritDoc} */
-    public Queue.DeclareOk queueDeclare(String queue)
+    public com.rabbitmq.client.AMQP.Queue.DeclareOk queueDeclare()
         throws IOException
     {
-        return queueDeclare(queue, false, false, false, false, null);
+        return queueDeclare("", false, true, true, null);
     }
 
     /** Public API - {@inheritDoc} */
-    public com.rabbitmq.client.AMQP.Queue.DeclareOk queueDeclare()
+    public Queue.DeclareOk queueDeclarePassive(String queue)
         throws IOException
     {
-        return queueDeclare("", false, false, true, true, null);
+        return (Queue.DeclareOk)
+            exnWrappingRpc(new Queue.Declare(TICKET, queue, true, false,
+                                             true, true, false, null)).getMethod();
     }
 
     /** Public API - {@inheritDoc} */
@@ -486,7 +490,7 @@ public Queue.DeleteOk queueDelete(String queue, boolean ifUnused, boolean ifEmpt
         return (Queue.DeleteOk)
             exnWrappingRpc(new Queue.Delete(TICKET, queue, ifUnused, ifEmpty, false)).getMethod();
     }
-    
+
     /** Public API - {@inheritDoc} */
     public Queue.DeleteOk queueDelete(String queue)
         throws IOException
@@ -674,7 +678,7 @@ public void basicRecoverAsync(boolean requeue)
     {
         transmit(new Basic.Recover(requeue));
     }
-  
+
     /** Public API - {@inheritDoc} */
     public Tx.SelectOk txSelect()
         throws IOException
@@ -698,6 +702,6 @@ public Tx.RollbackOk txRollback()
 
     /** Public API - {@inheritDoc} */
     public Channel.FlowOk flow(final boolean a) throws IOException {
-        return (Channel.FlowOk) exnWrappingRpc(new Channel.Flow() {{active = a;}}).getMethod();        
+        return (Channel.FlowOk) exnWrappingRpc(new Channel.Flow() {{active = a;}}).getMethod();
     }
 }

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

@@ -201,7 +201,7 @@ protected void declareDurableDirectExchange(String x) throws IOException {
   }
 
   protected void declareDurableQueue(String q) throws IOException {
-    channel.queueDeclare(q, true);
+    channel.queueDeclare(q, true, false, false, null);
   }
 
   protected void declareDurableTopicExchange(String x) throws IOException {

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

@@ -61,7 +61,7 @@ public void testBug20004()
                 public void run() {
                     try {
                         synchronized (channel) {
-                            channel.queueDeclare("Bug20004Test");
+                          channel.queueDeclare("Bug20004Test", false, false, false, null);
                             testInstance.created = true;
                         }
                     } catch (Exception e) {