merge from default

Author: Alexandru Scvortov

src/com/rabbitmq/client/Channel.java

@@ -598,6 +598,17 @@ Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, b
      */
     void basicCancel(String consumerTag) throws IOException;
 
+    /**
+     * Ask the broker to resend unacknowledged messages.  In 0-8
+     * basic.recover is asynchronous; in 0-9-1 it is synchronous, and
+     * the new, deprecated method basic.recover_async is asynchronous.
+     * <p/>
+     * Equivalent to calling <code>basicRecover(true)</code>, messages 
+     * will be requeued and possibly delivered to a different consumer. 
+     * @see #basicRecover(boolean)
+     */
+     Basic.RecoverOk basicRecover() throws IOException;
+  
     /**
      * Ask the broker to resend unacknowledged messages.  In 0-8
      * basic.recover is asynchronous; in 0-9-1 it is synchronous, and

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

@@ -227,8 +227,8 @@ public AMQConnection(ConnectionFactory factory,
      * calls Connection.Open and waits for the OpenOk. Sets heartbeat
      * and frame max values after tuning has taken place.
      * @throws java.io.IOException if an error is encountered; IOException
-     * subtypes ProtocolVersionMismatchException and
-     * PossibleAuthenticationFailureException will be thrown in the
+     * subtypes {@link ProtocolVersionMismatchException} and
+     * {@link PossibleAuthenticationFailureException} will be thrown in the
      * corresponding circumstances.
      */
     public void start()

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

@@ -806,6 +806,14 @@ public Consumer transformReply(AMQCommand replyCommand) {
         }
     }
 
+
+     /** Public API - {@inheritDoc} */
+    public Basic.RecoverOk basicRecover()
+        throws IOException
+    {
+        return basicRecover(true);
+    }
+
      /** Public API - {@inheritDoc} */
     public Basic.RecoverOk basicRecover(boolean requeue)
         throws IOException

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

@@ -67,7 +67,6 @@ public static TestSuite suite() {
         suite.addTestSuite(InvalidAcksTx.class);
         suite.addTestSuite(DefaultExchange.class);
         suite.addTestSuite(UnbindAutoDeleteExchange.class);
-        suite.addTestSuite(RecoverAfterCancel.class);
         suite.addTestSuite(Confirm.class);
         suite.addTestSuite(UnexpectedFrames.class);
         suite.addTestSuite(PerQueueTTL.class);

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

@@ -37,6 +37,8 @@
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.QueueingConsumer;
 import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Command;
+import com.rabbitmq.client.ShutdownSignalException;
 
 import com.rabbitmq.client.test.BrokerTestCase;
 
@@ -100,13 +102,24 @@ public void recover(Channel channel) throws IOException {
             }
         };
 
+    RecoverCallback recoverSyncConvenience = new RecoverCallback() {
+            public void recover(Channel channel) throws IOException {
+                channel.basicRecover();
+            }
+        };
+            
     public void testRedeliverOnRecoverAsync() throws IOException, InterruptedException {
         verifyRedeliverOnRecover(recoverAsync);
     }
 
     public void testRedeliveryOnRecover() throws IOException, InterruptedException {
         verifyRedeliverOnRecover(recoverSync);
     }
+    
+    public void testRedeliverOnRecoverConvenience() 
+        throws IOException, InterruptedException {
+        verifyRedeliverOnRecover(recoverSyncConvenience);
+    }
 
     public void testNoRedeliveryWithAutoAckAsync()
         throws IOException, InterruptedException {
@@ -117,4 +130,19 @@ public void testNoRedeliveryWithAutoAck()
         throws IOException, InterruptedException {
         verifyNoRedeliveryWithAutoAck(recoverSync);
     }
+    
+    public void testRequeueFalseNotSupported() throws Exception {
+        try {
+            channel.basicRecover(false);
+            fail("basicRecover(false) should not be supported");
+        } catch(IOException ioe) {
+            ShutdownSignalException sse = 
+                (ShutdownSignalException) ioe.getCause();
+            Command reason = (Command) sse.getReason();
+            AMQP.Connection.Close close = 
+                (AMQP.Connection.Close) reason.getMethod();
+            assertEquals("NOT_IMPLEMENTED - requeue=false", 
+                close.getReplyText());
+        }
+    }
 }