Introduce Channel#queueDeclareNowait and #exchangeDeclareNowait

Author: michaelklishin

src/com/rabbitmq/client/Channel.java

@@ -343,6 +343,28 @@ Exchange.DeclareOk exchangeDeclare(String exchange,
                                               boolean internal,
                                               Map<String, Object> arguments) throws IOException;
 
+    /**
+     * Like {@link Channel#exchangeDeclare(String, String, boolean, boolean, java.util.Map)} but
+     * sets nowait parameter to true and returns nothing (as there will be no response from
+     * the server).
+     *
+     * @param exchange the name of the exchange
+     * @param type the exchange type
+     * @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 internal true if the exchange is internal, i.e. can't be directly
+     * published to by a client.
+     * @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
+     */
+    void exchangeDeclareNowait(String exchange,
+                               String type,
+                               boolean durable,
+                               boolean autoDelete,
+                               boolean internal,
+                               Map<String, Object> arguments) throws IOException;
+
     /**
      * Declare an exchange passively; that is, check if the named exchange exists.
      * @param name check the existence of an exchange named this
@@ -446,6 +468,19 @@ Exchange.DeclareOk exchangeDeclare(String exchange,
     Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, boolean autoDelete,
                                  Map<String, Object> arguments) throws IOException;
 
+    /**
+     * Like {@link Channel#queueDeclare(String, boolean, boolean, boolean, java.util.Map)} but sets nowait
+     * flag to true and returns no result (as there will be no response from the server).
+     * @param queue the name of the queue
+     * @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 (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
+     * @throws java.io.IOException if an error is encountered
+     */
+    void queueDeclareNowait(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

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

@@ -664,6 +664,24 @@ public Exchange.DeclareOk exchangeDeclare(String exchange, String type,
                                arguments);
     }
 
+    public void exchangeDeclareNowait(String exchange,
+                                      String type,
+                                      boolean durable,
+                                      boolean autoDelete,
+                                      boolean internal,
+                                      Map<String, Object> arguments) throws IOException {
+        transmit(new AMQCommand(new Exchange.Declare.Builder()
+                                .exchange(exchange)
+                                .type(type)
+                                .durable(durable)
+                                .autoDelete(autoDelete)
+                                .internal(internal)
+                                .arguments(arguments)
+                                .passive(false)
+                                .nowait(true)
+                                .build()));
+    }
+
     /** Public API - {@inheritDoc} */
     public Exchange.DeclareOk exchangeDeclare(String exchange, String type,
                                               boolean durable,
@@ -794,6 +812,23 @@ public com.rabbitmq.client.AMQP.Queue.DeclareOk queueDeclare()
         return queueDeclare("", false, true, true, null);
     }
 
+    /** Public API - {@inheritDoc} */
+    public void queueDeclareNowait(String queue,
+                                   boolean durable,
+                                   boolean exclusive,
+                                   boolean autoDelete,
+                                   Map<String, Object> arguments) throws IOException {
+        transmit(new AMQCommand(new Queue.Declare.Builder()
+                                .queue(queue)
+                                .durable(durable)
+                                .exclusive(exclusive)
+                                .autoDelete(autoDelete)
+                                .arguments(arguments)
+                                .passive(false)
+                                .nowait(true)
+                                .build()));
+    }
+
     /** Public API - {@inheritDoc} */
     public Queue.DeclareOk queueDeclarePassive(String queue)
         throws IOException

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

@@ -190,6 +190,11 @@ public AMQP.Exchange.DeclareOk exchangeDeclare(String exchange, String type, boo
         return ok;
     }
 
+    @Override
+    public void exchangeDeclareNowait(String exchange, String type, boolean durable, boolean autoDelete, boolean internal, Map<String, Object> arguments) throws IOException {
+        delegate.exchangeDeclareNowait(exchange, type, durable, autoDelete, internal, arguments);
+    }
+
     public AMQP.Exchange.DeclareOk exchangeDeclarePassive(String name) throws IOException {
         return delegate.exchangeDeclarePassive(name);
     }
@@ -240,6 +245,14 @@ public AMQP.Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean
         return ok;
     }
 
+    public void queueDeclareNowait(String queue,
+                                   boolean durable,
+                                   boolean exclusive,
+                                   boolean autoDelete,
+                                   Map<String, Object> arguments) throws IOException {
+        delegate.queueDeclareNowait(queue, durable, exclusive, autoDelete, arguments);
+    }
+
     public AMQP.Queue.DeclareOk queueDeclarePassive(String queue) throws IOException {
         return delegate.queueDeclarePassive(queue);
     }

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

@@ -18,6 +18,7 @@
 package com.rabbitmq.client.test;
 
 import java.io.IOException;
+import java.util.UUID;
 
 import junit.framework.TestCase;
 
@@ -263,4 +264,12 @@ protected void unblock() throws IOException, InterruptedException {
         Host.rabbitmqctl("set_vm_memory_high_watermark 0.4");
         clearResourceAlarm("disk");
     }
+
+    protected String generateQueueName() {
+        return "queue" + UUID.randomUUID().toString();
+    }
+
+    protected String generateExchangeName() {
+        return "exchange" + UUID.randomUUID().toString();
+    }
 }

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

@@ -187,10 +187,6 @@ public void testExchangeToExchangeBindingRecovery() throws IOException, Interrup
         }
     }
 
-    private String generateExchangeName() {
-        return "java-client.test.recovery." + UUID.randomUUID().toString();
-    }
-
     public void testThatDeletedQueueBindingsDontReappearOnRecovery() throws IOException, InterruptedException {
         String q = channel.queueDeclare("", false, false, false, null).getQueue();
         String x1 = "amq.fanout";