Moving around, tidying up, documentation

Author: Matthew Sackman

src/com/rabbitmq/client/Consumer.java

@@ -49,6 +49,15 @@ public interface Consumer {
      */
     void handleCancelOk(String consumerTag);
 
+    /**
+     * Called when the consumer is cancelled for reasons other than by a
+     * basicCancel: e.g. the queue is deleted. See handleCancelOk for
+     * notification of consumer cancellation due to basicCancel.
+     * 
+     * @throws IOException
+     */
+    void handleCancel(String consumerTag) throws IOException;
+
     /**
      * Called to the consumer that either the channel or the undelying connection has been shut down.
      * @param consumerTag the defined consumerTag (either client- or server-generated)
@@ -82,6 +91,4 @@ void handleDelivery(String consumerTag,
                         AMQP.BasicProperties properties,
                         byte[] body)
         throws IOException;
-    
-    void handleCancelNotification() throws IOException;
 }

src/com/rabbitmq/client/DefaultConsumer.java

@@ -53,6 +53,14 @@ public void handleCancelOk(String consumerTag) {
         // no work to do
     }
 
+    /**
+     * No-op implementation of {@link Consumer#handleCancel(String)}
+     * @param consumerTag the defined consumer tag (client- or server-generated)
+     */
+    public void handleCancel(String consumerTag) throws IOException {
+        // no work to do
+    }
+
     /**
      * No-op implementation of {@link Consumer#handleShutdownSignal}.
      */
@@ -79,10 +87,6 @@ public void handleDelivery(String consumerTag,
             // no work to do
     }
 
-    public void handleCancelNotification() throws IOException {
-        // no work to do
-    }
-
     /**
     *  Retrieve the channel.
      * @return the channel this consumer is attached to.

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

@@ -347,12 +347,12 @@ public void releaseChannelNumber() {
                 }
                 if (callback != null) {
                     try {
-                        callback.handleCancelNotification();
+                        callback.handleCancel(m.getConsumerTag());
                     } catch (Throwable ex) {
                         _connection.getExceptionHandler().handleConsumerException(this,
                                                                                   ex,
                                                                                   callback,
-                                                                                  m.consumerTag,
+                                                                                  m.getConsumerTag(),
                                                                                   "handleCancelNotification");
                     }
                 }

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

@@ -55,12 +55,6 @@ public void handleConsumerException(Channel channel, Throwable exception,
                                               + " for channel " + channel);
     }
 
-    public void handleConsumerCancellationException(Channel channel,
-            Throwable exception) {
-        handleChannelKiller(channel, exception, "ConsumerCancellationListener.handleConsumerCancellation");
-
-    }
-
     protected void handleChannelKiller(Channel channel,
                                        Throwable exception,
                                        String what)

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

@@ -78,5 +78,4 @@ void handleConsumerException(Channel channel,
                                  Consumer consumer,
                                  String consumerTag,
                                  String methodName);
-
 }

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

@@ -46,7 +46,7 @@ public void testConsumerCancellationNotification() throws IOException {
         channel.queueDeclare(queue, false, true, false, null);
         Consumer consumer = new QueueingConsumer(channel) {
             @Override
-            public void handleCancelNotification() throws IOException {
+            public void handleCancel(String consumerTag) throws IOException {
                 synchronized (lock) {
                     notified = !notified;
                     lock.notifyAll();