Merge bug23682 with default

Author: Rob Harrop

src/com/rabbitmq/client/ReturnListener.java

@@ -26,7 +26,7 @@
  * @see Channel#basicPublish
  */
 public interface ReturnListener {
-    void handleBasicReturn(int replyCode,
+    void handleReturn(int replyCode,
             String replyText,
             String exchange,
             String routingKey,

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

@@ -279,7 +279,7 @@ public void releaseChannelNumber() {
                 if (l != null) {
                     Basic.Return basicReturn = (Basic.Return) method;
                     try {
-                        l.handleBasicReturn(basicReturn.replyCode,
+                        l.handleReturn(basicReturn.replyCode,
                                             basicReturn.replyText,
                                             basicReturn.exchange,
                                             basicReturn.routingKey,

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

@@ -34,7 +34,7 @@ public void handleUnexpectedConnectionDriverException(Connection conn, Throwable
     }
 
     public void handleReturnListenerException(Channel channel, Throwable exception) {
-        handleChannelKiller(channel, exception, "ReturnListener.handleBasicReturn");
+        handleChannelKiller(channel, exception, "ReturnListener.handleReturn");
     }
 
     public void handleFlowListenerException(Channel channel, Throwable exception) {

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

@@ -36,10 +36,10 @@ public interface ExceptionHandler {
     /**
      * Perform any required exception processing for the situation
      * when the driver thread for the connection has called a
-     * ReturnListener's handleBasicReturn method, and that method has
+     * ReturnListener's handleReturn method, and that method has
      * thrown an exception.
      * @param channel the ChannelN that held the ReturnListener
-     * @param exception the exception thrown by ReturnListener.handleBasicReturn
+     * @param exception the exception thrown by ReturnListener.handleReturn
      */
     void handleReturnListenerException(Channel channel, Throwable exception);
 

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

@@ -58,12 +58,12 @@ private static boolean[] expected(String key) {
     @Override protected void setUp() throws IOException {
         super.setUp();
         channel.setReturnListener(new ReturnListener() {
-                public void handleBasicReturn(int replyCode,
-                                              String replyText,
-                                              String exchange,
-                                              String routingKey,
-                                              AMQP.BasicProperties properties,
-                                              byte[] body)
+                public void handleReturn(int replyCode,
+                                         String replyText,
+                                         String exchange,
+                                         String routingKey,
+                                         AMQP.BasicProperties properties,
+                                         byte[] body)
                     throws IOException {
                     gotReturn.set(true);
                 }

test/src/com/rabbitmq/client/test/performance/ScalabilityTest.java

@@ -285,9 +285,9 @@ private float timeRouting(Channel channel, String[] routingKeys)
         boolean immdediate = true;
         final CountDownLatch latch = new CountDownLatch(params.messageCount);
         channel.setReturnListener(new ReturnListener() {
-                public void handleBasicReturn(int replyCode, String replyText,
-                                              String exchange, String routingKey,
-                                              AMQP.BasicProperties properties, byte[] body) throws IOException {
+                public void handleReturn(int replyCode, String replyText,
+                                         String exchange, String routingKey,
+                                         AMQP.BasicProperties properties, byte[] body) throws IOException {
                     latch.countDown();
                 }
             });

test/src/com/rabbitmq/examples/MulticastMain.java

@@ -265,12 +265,12 @@ public Producer(Channel channel, String exchangeName, String id,
             this.confirm      = confirm;
         }
 
-        public synchronized void handleBasicReturn(int replyCode,
-                                                   String replyText,
-                                                   String exchange,
-                                                   String routingKey,
-                                                   AMQP.BasicProperties properties,
-                                                   byte[] body)
+        public synchronized void handleReturn(int replyCode,
+                                              String replyText,
+                                              String exchange,
+                                              String routingKey,
+                                              AMQP.BasicProperties properties,
+                                              byte[] body)
             throws IOException {
             returnCount++;
         }

test/src/com/rabbitmq/examples/TestMain.java

@@ -231,7 +231,7 @@ public void run() throws IOException {
         _ch1 = createChannel();
 
         _ch1.setReturnListener(new ReturnListener() {
-            public void handleBasicReturn(int replyCode, String replyText, String exchange, String routingKey, AMQP.BasicProperties properties, byte[] body)
+            public void handleReturn(int replyCode, String replyText, String exchange, String routingKey, AMQP.BasicProperties properties, byte[] body)
                     throws IOException {
                 Method method = new AMQImpl.Basic.Return(replyCode, replyText, exchange, routingKey);
                 log("Handling return with body " + new String(body));