Add arguments(Map) method to exchange and queue specification

Fixes #153

Author: acogoluegnes

src/main/java/com/rabbitmq/client/amqp/Management.java

@@ -296,6 +296,16 @@ interface QueueSpecification {
      */
     QueueSpecification argument(String key, Object value);
 
+    /**
+     * Set the queue arguments.
+     *
+     * <p>The argument map will replace any existing arguments.
+     *
+     * @param arguments arguments
+     * @return the queue specification
+     */
+    QueueSpecification arguments(Map<String, Object> arguments);
+
     /**
      * Declare the queue.
      *
@@ -662,6 +672,16 @@ interface ExchangeSpecification {
      */
     ExchangeSpecification argument(String key, Object value);
 
+    /**
+     * Set the exchange arguments.
+     *
+     * <p>The argument map will replace any existing arguments.
+     *
+     * @param arguments arguments
+     * @return the exchange specification
+     */
+    ExchangeSpecification arguments(Map<String, Object> arguments);
+
     /** Declare the exchange. */
     void declare();
   }
@@ -769,7 +789,9 @@ interface BindingSpecification {
     BindingSpecification argument(String key, Object value);
 
     /**
-     * Binding arguments.
+     * Set the binding arguments.
+     *
+     * <p>The argument map will replace any existing arguments.
      *
      * @param arguments arguments
      * @return the binding specification
@@ -826,7 +848,9 @@ interface UnbindSpecification {
     UnbindSpecification argument(String key, Object value);
 
     /**
-     * Binding arguments.
+     * Set the binding arguments.
+     *
+     * <p>The argument map will replace any existing arguments.
      *
      * @param arguments arguments
      * @return the unbind specification

src/main/java/com/rabbitmq/client/amqp/impl/AmqpBindingManagement.java

@@ -101,6 +101,7 @@ public Management.BindingSpecification argument(String key, Object value) {
 
     @Override
     public Management.BindingSpecification arguments(Map<String, Object> arguments) {
+      Assert.notNull(arguments, "Arguments");
       this.state.arguments.clear();
       this.state.arguments.putAll(arguments);
       return this;
@@ -169,6 +170,7 @@ public Management.UnbindSpecification argument(String key, Object value) {
 
     @Override
     public Management.UnbindSpecification arguments(Map<String, Object> arguments) {
+      Assert.notNull(arguments, "Arguments");
       this.state.arguments.clear();
       this.state.arguments.putAll(arguments);
       return this;

src/main/java/com/rabbitmq/client/amqp/impl/AmqpConsumerBuilder.java

@@ -152,19 +152,19 @@ public StreamOptions offset(long offset) {
 
     @Override
     public StreamOptions offset(Instant timestamp) {
-      notNull(timestamp, "Timestamp offset cannot be null");
+      notNull(timestamp, "Timestamp offset");
       return this.offsetSpecification(Date.from(timestamp));
     }
 
     @Override
     public StreamOptions offset(StreamOffsetSpecification specification) {
-      notNull(specification, "Offset specification cannot be null");
+      notNull(specification, "Offset specification");
       return this.offsetSpecification(specification.name().toLowerCase(Locale.ENGLISH));
     }
 
     @Override
     public StreamOptions offset(String interval) {
-      notNull(interval, "Interval offset cannot be null");
+      notNull(interval, "Interval offset");
       if (!Utils.validateMaxAge(interval)) {
         throw new IllegalArgumentException(
             "Invalid value for interval: "

src/main/java/com/rabbitmq/client/amqp/impl/AmqpExchangeSpecification.java

@@ -73,6 +73,14 @@ public Management.ExchangeSpecification argument(String key, Object value) {
     return this;
   }
 
+  @Override
+  public Management.ExchangeSpecification arguments(Map<String, Object> arguments) {
+    Assert.notNull(arguments, "Arguments");
+    this.arguments.clear();
+    this.arguments.putAll(arguments);
+    return this;
+  }
+
   @Override
   public void declare() {
     // TODO check name is specified (server-named entities not allowed)

src/main/java/com/rabbitmq/client/amqp/impl/AmqpQueueSpecification.java

@@ -183,6 +183,14 @@ public Management.QueueSpecification argument(String key, Object value) {
     return this;
   }
 
+  @Override
+  public Management.QueueSpecification arguments(Map<String, Object> arguments) {
+    Assert.notNull(arguments, "Arguments");
+    this.arguments.clear();
+    this.arguments.putAll(arguments);
+    return this;
+  }
+
   @Override
   public Management.QueueInfo declare() {
     Map<String, Object> body = new LinkedHashMap<>();

src/main/java/com/rabbitmq/client/amqp/impl/Assert.java

@@ -21,9 +21,9 @@ abstract class Assert {
 
   private Assert() {}
 
-  static void notNull(Object object, String message) {
+  static void notNull(Object object, String label) {
     if (object == null) {
-      throw new IllegalArgumentException(message);
+      throw new IllegalArgumentException(label + " cannot be null");
     }
   }
 }

src/main/java/com/rabbitmq/client/amqp/impl/DefaultConnectionSettings.java

@@ -486,7 +486,7 @@ public Affinity<T> reuse(boolean reuse) {
 
     @Override
     public Affinity<T> strategy(AffinityStrategy strategy) {
-      Assert.notNull(strategy, "Affinity strategy cannot be null");
+      Assert.notNull(strategy, "Affinity strategy");
       this.strategy = strategy;
       return this;
     }

src/test/java/com/rabbitmq/client/amqp/impl/AmqpConnectionAffinityUnitTest.java

@@ -316,7 +316,7 @@ AffinityCacheAssert contains(Management.QueueInfo info) {
     }
 
     AffinityCacheAssert doesNotContainInfoFor(String queue) {
-      Assert.notNull(queue, "Queue argument cannot be null");
+      Assert.notNull(queue, "Queue argument");
       isNotNull();
 
       Management.QueueInfo queueInfo = actual.queueInfo(queue);

src/test/java/com/rabbitmq/client/amqp/impl/Assertions.java

@@ -161,7 +161,7 @@ QueueInfoAssert is(Management.QueueType type) {
     }
 
     QueueInfoAssert hasLeader(String leader) {
-      Assert.notNull(leader, "Expected leader cannot be null");
+      Assert.notNull(leader, "Expected leader");
       isNotNull();
       if (!leader.equals(actual.leader())) {
         fail("Queue leader should be '%s' but is '%s'", leader, actual.leader());
@@ -170,7 +170,7 @@ QueueInfoAssert hasLeader(String leader) {
     }
 
     QueueInfoAssert doesNotHaveLeader(String leader) {
-      Assert.notNull(leader, "Leader cannot be null");
+      Assert.notNull(leader, "Leader");
       isNotNull();
       if (leader.equals(actual.leader())) {
         fail("Queue leader should not be '%s'", leader);
@@ -368,7 +368,7 @@ private ConnectionAssert(AmqpConnection connection) {
     }
 
     ConnectionAssert hasNodename(String nodename) {
-      Assert.notNull(nodename, "Expected nodename cannot be null");
+      Assert.notNull(nodename, "Expected nodename");
       isNotNull();
       if (!actual.connectionNodename().equals(nodename)) {
         fail(
@@ -379,7 +379,7 @@ ConnectionAssert hasNodename(String nodename) {
     }
 
     ConnectionAssert isOnLeader(Management.QueueInfo info) {
-      Assert.notNull(info, "Queue info cannot be null");
+      Assert.notNull(info, "Queue info");
       String actualLeader = info.leader();
       if (!actualLeader.equals(actual.connectionNodename())) {
         fail(
@@ -390,7 +390,7 @@ ConnectionAssert isOnLeader(Management.QueueInfo info) {
     }
 
     ConnectionAssert isOnFollower(Management.QueueInfo info) {
-      Assert.notNull(info, "Queue info cannot be null");
+      Assert.notNull(info, "Queue info");
       List<String> followers =
           info.members().stream()
               .filter(n -> !n.equals(info.leader()))

src/test/java/com/rabbitmq/client/amqp/impl/Cli.java

@@ -240,7 +240,7 @@ static void restartStream(String stream) {
 
   static void pauseNode(String node) {
     String containerId = DOCKER_NODES_TO_CONTAINERS.get(node);
-    Assert.notNull(containerId, "No container for node " + node);
+    Assert.notNull(containerId, "Container ID for node " + node);
     executeCommand("docker pause " + containerId);
   }
 
@@ -291,7 +291,7 @@ static List<String> nodes() {
 
   private static String nodeToDockerContainer(String node) {
     String containerId = DOCKER_NODES_TO_CONTAINERS.get(node);
-    Assert.notNull(containerId, "No container for node " + node);
+    Assert.notNull(containerId, "Container ID for node " + node);
     return containerId;
   }