merge bug19129 into default

Author: tonyg

src/com/rabbitmq/client/Channel.java

@@ -40,10 +40,9 @@
  * ConnectionFactory factory = new ConnectionFactory(params);
  * Connection conn = factory.newConnection(hostName, AMQP.PROTOCOL.PORT);
  *
- * // Then open a channel and retrieve an access ticket:
+ * // Then open a channel:
  *
  * Channel channel = conn.createChannel();
- * int ticket = channel.accessRequest(realmName);
  * </pre>
  *
  * Current implementations are thread-safe for code at the client API level,

src/com/rabbitmq/client/Connection.java

@@ -59,22 +59,12 @@ private static String safeGetProperty(String key, String def) {
     /** Default value for desired heartbeat interval; zero for none */
     public static final int DEFAULT_HEARTBEAT = 3;
 
-    /**
-     * Default value for suppressAccessRequest flag. Retrieved from
-     * system property
-     * "com.rabbitmq.client.ConnectionParameters.suppressAccessRequest"
-     * and defaulting to true.
-     */
-    public static final boolean DEFAULT_SUPPRESS_ACCESS_REQUEST =
-        safeGetProperty("com.rabbitmq.client.ConnectionParameters.suppressAccessRequest", new Boolean(false).toString()).equals("true");
-
     private String _userName = DEFAULT_USER;
     private String _password = DEFAULT_PASS;
     private String _virtualHost = DEFAULT_VHOST;
     private int _requestedChannelMax = DEFAULT_CHANNEL_MAX;
     private int _requestedFrameMax = DEFAULT_FRAME_MAX;
     private int _requestedHeartbeat = DEFAULT_HEARTBEAT;
-    private boolean _suppressAccessRequest = DEFAULT_SUPPRESS_ACCESS_REQUEST;
 
     /**
      * Instantiate a set of parameters with all values set to the defaults
@@ -177,21 +167,4 @@ public void setRequestedChannelMax(int requestedChannelMax) {
         _requestedChannelMax = requestedChannelMax;
     }
 
-    /**
-     * Retrieve the setting for the suppression of sending
-     * "access.request" methods.
-     * @return true of "access.request" methods are suppressed, false otherwise.
-     */
-    public boolean getSuppressAccessRequest() {
-        return _suppressAccessRequest;
-    }
-
-    /**
-     * Enable or disable the suppression of sending "access.request"
-     * methods.
-     * @param suppressAccessRequest true of "access.request" methods are suppressed, false otherwise.
-     */
-    public void setSuppressAccessRequest(boolean suppressAccessRequest) {
-        _suppressAccessRequest = suppressAccessRequest;
-    }
 }

src/com/rabbitmq/client/ConnectionParameters.java

@@ -41,11 +41,11 @@
  * requests and replies.
  */
 public class MapRpcServer extends RpcServer {
-    public MapRpcServer(Channel channel, int ticket) throws IOException
-    { super(channel, ticket); }
+    public MapRpcServer(Channel channel) throws IOException
+    { super(channel); }
 
-    public MapRpcServer(Channel channel, int ticket, String queueName) throws IOException
-    { super(channel, ticket, queueName); }
+    public MapRpcServer(Channel channel, String queueName) throws IOException
+    { super(channel, queueName); }
 
     /**
      * Overridden to delegate to handleMapCall.

src/com/rabbitmq/client/MapRpcServer.java

@@ -49,8 +49,6 @@
 public class RpcClient {
     /** Channel we are communicating on */
     private final Channel _channel;
-    /** Access ticket this RpcClient uses */
-    private final int _ticket;
     /** Exchange to send requests to */
     private final String _exchange;
     /** Routing key to use for requests */
@@ -67,21 +65,18 @@ public class RpcClient {
     private DefaultConsumer _consumer;
 
     /**
-     * Construct a new RpcClient that will communicate on the given
-     * channel, using the given ticket for permission, sending
+     * Construct a new RpcClient that will communicate on the given channel, sending
      * requests to the given exchange with the given routing key.
      * <p>
      * Causes the creation of a temporary private autodelete queue.
      * @param channel the channel to use for communication
-     * @param ticket the access ticket for the appropriate realm
      * @param exchange the exchange to connect to
      * @param routingKey the routing key
      * @throws IOException if an error is encountered
      * @see #setupReplyQueue
      */
-    public RpcClient(Channel channel, int ticket, String exchange, String routingKey) throws IOException {
+    public RpcClient(Channel channel, String exchange, String routingKey) throws IOException {
         _channel = channel;
-        _ticket = ticket;
         _exchange = exchange;
         _routingKey = routingKey;
         _correlationId = 0;
@@ -118,7 +113,7 @@ public void close() throws IOException {
      * @return the name of the reply queue
      */
     private String setupReplyQueue() throws IOException {
-        return _channel.queueDeclare(_ticket, "", false, false, true, true, null).getQueue();
+        return _channel.queueDeclare("", false, false, true, true, null).getQueue();
     }
 
     /**
@@ -153,14 +148,14 @@ public void handleDelivery(String consumerTag,
                 }
             }
         };
-        _channel.basicConsume(_ticket, _replyQueue, true, consumer);
+        _channel.basicConsume(_replyQueue, true, consumer);
         return consumer;
     }
 
     public void publish(AMQP.BasicProperties props, byte[] message)
         throws IOException
     {
-        _channel.basicPublish(_ticket, _exchange, _routingKey, props, message);
+        _channel.basicPublish(_exchange, _routingKey, props, message);
     }
 
     public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message)
@@ -279,14 +274,6 @@ public Channel getChannel() {
         return _channel;
     }
 
-    /**
-     * Retrieve the access ticket.
-     * @return the access ticket for the appropriate realm
-     */
-    public int getTicket() {
-        return _ticket;
-    }
-
     /**
      * Retrieve the exchange.
      * @return the exchange to which this client is connected

src/com/rabbitmq/client/RpcClient.java

@@ -34,8 +34,6 @@
 public class RpcServer {
     /** Channel we are communicating on */
     protected final Channel _channel;
-    /** Access ticket this RpcServer uses */
-    protected final int _ticket;
     /** Queue to receive requests from */
     protected final String _queueName;
     /** Boolean controlling the exit from the mainloop. */
@@ -48,24 +46,23 @@ public class RpcServer {
      * Creates an RpcServer listening on a temporary exclusive
      * autodelete queue.
      */
-    public RpcServer(Channel channel, int ticket)
+    public RpcServer(Channel channel)
         throws IOException
     {
-        this(channel, ticket, null);
+        this(channel, null);
     }
 
     /**
      * If the passed-in queue name is null, creates a server-named
      * temporary exclusive autodelete queue to use; otherwise expects
      * the queue to have already been declared.
      */
-    public RpcServer(Channel channel, int ticket, String queueName)
+    public RpcServer(Channel channel, String queueName)
         throws IOException
     {
         _channel = channel;
-        _ticket = ticket;
         if (queueName == null || queueName.equals("")) {
-            _queueName = _channel.queueDeclare(_ticket).getQueue();
+            _queueName = _channel.queueDeclare().getQueue();
         } else {
             _queueName = queueName;
         }
@@ -96,7 +93,7 @@ protected QueueingConsumer setupConsumer()
         throws IOException
     {
         QueueingConsumer consumer = new QueueingConsumer(_channel);
-        _channel.basicConsume(_ticket, _queueName, consumer);
+        _channel.basicConsume(_queueName, consumer);
         return consumer;
     }
 
@@ -157,7 +154,7 @@ public void processRequest(QueueingConsumer.Delivery request)
             AMQP.BasicProperties replyProperties = new AMQP.BasicProperties();
             byte[] replyBody = handleCall(request, replyProperties);
             replyProperties.correlationId = requestProperties.correlationId;
-            _channel.basicPublish(_ticket, "", requestProperties.replyTo,
+            _channel.basicPublish("", requestProperties.replyTo,
                                   replyProperties, replyBody);
         } else {
             handleCast(request);
@@ -234,14 +231,6 @@ public Channel getChannel() {
         return _channel;
     }
 
-    /**
-     * Retrieve the access ticket.
-     * @return the access ticket for the appropriate realm
-     */
-    public int getTicket() {
-        return _ticket;
-    }
-
     /**
      * Retrieve the queue name.
      * @return the queue which this server is consuming from

src/com/rabbitmq/client/RpcServer.java

@@ -32,11 +32,11 @@
  * Subclass of RpcServer which accepts UTF-8 string requests.
  */
 public class StringRpcServer extends RpcServer {
-    public StringRpcServer(Channel channel, int ticket) throws IOException
-    { super(channel, ticket); }
+    public StringRpcServer(Channel channel) throws IOException
+    { super(channel); }
 
-    public StringRpcServer(Channel channel, int ticket, String queueName) throws IOException
-    { super(channel, ticket, queueName); }
+    public StringRpcServer(Channel channel, String queueName) throws IOException
+    { super(channel, queueName); }
 
     /**
      * Overridden to do UTF-8 processing, and delegate to

src/com/rabbitmq/client/StringRpcServer.java

@@ -54,12 +54,9 @@
  * conn.open(userName, portNumber, virtualHost);
  * </pre>
  *
- * Then open a channel and retrieve an access ticket:
- *
  * <pre>
  * ChannelN ch1 = conn.createChannel(1);
  * ch1.open(&quot;&quot;);
- * int ticket = ch1.accessRequest(realmName);
  * </pre>
  */
 public class AMQConnection extends ShutdownNotifierComponent implements Connection {