Clean impl.Method from Channel and Command interfaces and propagate (+ tests).

Author: Steve Powell

src/com/rabbitmq/client/Channel.java

@@ -707,8 +707,8 @@ void basicNack(long deliveryTag, boolean multiple, boolean requeue)
     /**
      * Synchronously send a method over this channel.
      * @param method method to transmit over this channel.
-     * @return response to method. Caller should cast as appropriate.
+     * @return command response to method. Caller should cast as appropriate.
      * @throws IOException Problem transmitting method.
      */
-    Method rpc(Method method) throws IOException;
+    Command rpc(Method method) throws IOException;
 }

src/com/rabbitmq/client/Command.java

@@ -17,9 +17,6 @@
 
 package com.rabbitmq.client;
 
-import com.rabbitmq.client.impl.Method;
-
-
 /**
  * Interface to a container for an AMQP method-and-arguments, with optional content header and body.
  */

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

@@ -22,6 +22,7 @@
 
 import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Command;
+import com.rabbitmq.client.Method;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.utility.BlockingValueOrException;
@@ -118,11 +119,11 @@ public static IOException wrap(ShutdownSignalException ex, String message) {
     /**
      * Placeholder until we address bug 15786 (implementing a proper exception hierarchy).
      */
-    public AMQCommand exnWrappingRpc(com.rabbitmq.client.Method m)
+    public AMQCommand exnWrappingRpc(Method m)
         throws IOException
     {
         try {
-            return rpc((com.rabbitmq.client.impl.Method)m);
+            return rpc(m);
         } catch (AlreadyClosedException ace) {
             // Do not wrap it since it means that connection/channel
             // was closed in some action in the past
@@ -183,8 +184,8 @@ public void ensureIsOpen()
     }
 
     /**
-     * Protected API - sends a Command to the broker and waits for the
-     * next inbound Command from the broker: only for use from
+     * Protected API - sends a {@link Method} to the broker and waits for the
+     * next in-bound Command from the broker: only for use from
      * non-connection-MainLoop threads!
      */
     public AMQCommand rpc(Method m)

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

@@ -26,6 +26,7 @@
 import java.util.concurrent.TimeoutException;
 
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Method;
 import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Command;

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

@@ -31,6 +31,7 @@
 import com.rabbitmq.client.Envelope;
 import com.rabbitmq.client.FlowListener;
 import com.rabbitmq.client.GetResponse;
+import com.rabbitmq.client.Method;
 import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.ReturnListener;
 import com.rabbitmq.client.ShutdownSignalException;
@@ -106,7 +107,7 @@ public ChannelN(AMQConnection connection, int channelNumber) {
 
     /**
      * Package method: open the channel.
-     * This is only called from AMQConnection.
+     * This is only called from {@link ChannelManager}.
      * @throws java.io.IOException if any problem is encountered
      */
     public void open() throws IOException {
@@ -967,13 +968,12 @@ public long getNextPublishSeqNo() {
         return nextPublishSeqNo;
     }
 
-    public void asyncRpc(com.rabbitmq.client.Method method) throws IOException {
-        // This cast should eventually go
-        transmit((com.rabbitmq.client.impl.Method)method);
+    public void asyncRpc(Method method) throws IOException {
+        transmit(method);
     }
 
-    public Method rpc(com.rabbitmq.client.Method method) throws IOException {
-        return exnWrappingRpc((com.rabbitmq.client.impl.Method)method).getMethod();
+    public AMQCommand rpc(Method method) throws IOException {
+        return exnWrappingRpc(method);
     }
 
 }

test/src/com/rabbitmq/client/test/AMQBuilderApiTest.java

@@ -33,15 +33,15 @@ public void testParticularBuilderForBasicSanityWithRpc() throws IOException
                            .type("direct")
                            .durable(false)
                            .build()
-                           );
+                           ).getMethod();
 
         assertTrue("Channel should still be open.", channel.isOpen());
         assertTrue(retVal instanceof AMQP.Exchange.DeclareOk);
 
         retVal = channel.rpc(new AMQP.Exchange.Delete.Builder()
                             .exchange(XCHG_NAME)
                             .build()
-                            );
+                            ).getMethod();
 
         assertTrue("Channel should still be open.", channel.isOpen());
         assertTrue(retVal instanceof AMQP.Exchange.DeleteOk);

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

@@ -22,7 +22,7 @@
 
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.MalformedFrameException;
-import com.rabbitmq.client.impl.Method;
+import com.rabbitmq.client.Method;
 import com.rabbitmq.client.impl.SocketFrameHandler;
 import com.rabbitmq.client.impl.AMQCommand;
 import com.rabbitmq.client.ConnectionFactory;

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

@@ -29,12 +29,11 @@
 import com.rabbitmq.client.Envelope;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.MessageProperties;
+import com.rabbitmq.client.Method;
 import com.rabbitmq.client.ReturnListener;
 import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.client.impl.AMQConnection;
-import com.rabbitmq.client.impl.AMQImpl;
 import com.rabbitmq.client.impl.FrameHandler;
-import com.rabbitmq.client.impl.Method;
 import com.rabbitmq.client.impl.SocketFrameHandler;
 import com.rabbitmq.utility.BlockingCell;
 import com.rabbitmq.utility.Utility;
@@ -233,7 +232,12 @@ public void run() throws IOException {
         _ch1.setReturnListener(new ReturnListener() {
             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);
+                Method method = new AMQP.Basic.Return.Builder()
+                                    .replyCode(replyCode)
+                                    .replyText(replyText)
+                                    .exchange(exchange)
+                                    .routingKey(routingKey)
+                                .build();
                 log("Handling return with body " + new String(body));
                 returnCell.set(new Object[] { method, properties, body });
             }
@@ -430,7 +434,7 @@ public void tryTopics() throws IOException {
 
     public void doBasicReturn(BlockingCell<Object> cell, int expectedCode) {
         Object[] a = (Object[]) cell.uninterruptibleGet();
-        AMQImpl.Basic.Return method = (AMQImpl.Basic.Return) a[0];
+        AMQP.Basic.Return method = (AMQP.Basic.Return) a[0];
         log("Returned: " + method);
         log(" - props: " + a[1]);
         log(" - body: " + new String((byte[]) a[2]));