Merged bug23214 (basic.consume's 'filter' should be called 'arguments')

Author: Simon MacMullen

src/com/rabbitmq/client/Channel.java

@@ -508,13 +508,13 @@ Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, b
      * @param noLocal flag set to true unless server local buffering is required
      * @param exclusive true if this is an exclusive consumer
      * @param callback an interface to the consumer object
-     * @param filter a set of arguments for the consume. Currently ignored by rabbitmq-server.
+     * @param arguments a set of arguments for the consume
      * @return the consumerTag associated with the new consumer
      * @throws java.io.IOException if an error is encountered
      * @see com.rabbitmq.client.AMQP.Basic.Consume
      * @see com.rabbitmq.client.AMQP.Basic.ConsumeOk
      */
-    String basicConsume(String queue, boolean noAck, String consumerTag, boolean noLocal, boolean exclusive, Map<String, Object> filter, Consumer callback) throws IOException;
+    String basicConsume(String queue, boolean noAck, String consumerTag, boolean noLocal, boolean exclusive, Map<String, Object> arguments, Consumer callback) throws IOException;
 
     /**
      * Cancel a consumer. Calls the consumer's {@link Consumer#handleCancelOk}

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

@@ -670,7 +670,7 @@ public String basicConsume(String queue, boolean noAck, String consumerTag,
 
     /** Public API - {@inheritDoc} */
     public String basicConsume(String queue, boolean noAck, String consumerTag,
-                               boolean noLocal, boolean exclusive, Map<String, Object> filter,
+                               boolean noLocal, boolean exclusive, Map<String, Object> arguments,
                                final Consumer callback)
         throws IOException
     {
@@ -695,7 +695,7 @@ public String transformReply(AMQCommand replyCommand) {
 
         rpc(new Basic.Consume(TICKET, queue, consumerTag,
                               noLocal, noAck, exclusive,
-                              false, filter),
+                              false, arguments),
             k);
 
         try {