Added Channel.Close method that sets default

AMQP.REPLY_SUCCESS code and Goodbye message.
Use this variable in Connection close methods instead of
hardcoded 200 value.

Author: Hubert Plociniczak

src/com/rabbitmq/client/Channel.java

@@ -70,12 +70,10 @@ public interface Channel extends ShutdownNotifier{
     Connection getConnection();
 
     /**
-     * Close this channel with the given code and message
-     * @param closeCode the close code (See under "Reply Codes" in the AMQP specification)
-     * @param closeMessage a message indicating the reason for closing the channel
+     * Close this channel with the default code and message
      * @throws java.io.IOException if an error is encountered
      */
-    void close(int closeCode, String closeMessage) throws IOException;
+    void close() throws IOException;
 
     /**
      * Return the current {@link ReturnListener}.

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

@@ -632,7 +632,7 @@ public void close()
     public void close(int timeout)
         throws IOException
     {
-        close(200, "Goodbye", timeout);
+        close(AMQP.REPLY_SUCCESS, "Goodbye", timeout);
     }
 
     /**
@@ -647,7 +647,7 @@ public void abort(int timeout)
     {
 
         try {
-            close(200, "Goodbye", true, null, timeout, true);
+            close(AMQP.REPLY_SUCCESS, "Goodbye", true, null, timeout, true);
         } catch (IOException e) {
             Utility.emptyStatement();
         }

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

@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Command;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.Consumer;
@@ -248,8 +249,19 @@ public void releaseChannelNumber() {
         }
     }
 
+
+    /**
+     * Public API - closes this channel with the default 200 close code
+     * and 'Goodbye' message
+     */
+    public void close()
+        throws IOException
+    {
+        close(AMQP.REPLY_SUCCESS, "Goodbye");
+    }
+    
     /**
-     * Public API - closes this channel with the given code and message
+     * Protected API - closes this channel with the given code and message
      */
     public void close(int closeCode, String closeMessage)
         throws IOException

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

@@ -28,17 +28,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
 
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.Consumer;
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.ShutdownSignalException;
-
 import com.rabbitmq.client.test.functional.BrokerTestCase;
 
 /**
@@ -136,7 +133,7 @@ public void run() {
         //notifications timing out.
         boolean success = false;
         try {
-            channel.close(AMQP.REPLY_SUCCESS, "bye");
+            channel.close();
             success = true;
         } catch (ShutdownSignalException e) {
         } finally {

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

@@ -69,7 +69,7 @@ public void closeChannel()
         throws IOException
     {
         if (channel != null) {
-            channel.close(200, "OK");
+            channel.close();
             channel = null;
         }
     }

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

@@ -50,7 +50,7 @@ protected void tearDown()
         throws IOException
     {
         if (channel2 != null) {
-            channel2.close(200, "OK");
+            channel2.close();
             channel2 = null;
         }
         super.tearDown();

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

@@ -126,7 +126,7 @@ private void runIt() throws IOException {
         channel.queueDelete(ticket, completionQueue);
 
         System.out.println("Closing the channel.");
-        channel.close(200, "Closing channel with no error");
+        channel.close();
 
         System.out.println("Closing the connection.");
         _connection.close();

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

@@ -163,7 +163,7 @@ private void runIt() throws IOException {
                 _channel.txCommit();
         }
 
-        _channel.close(200, "Closing ch1 with no error");
+        _channel.close();
         System.out.println("Closing.");
         _connection.close();
         System.out.println("Leaving ProducerMain.run().");

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

@@ -51,7 +51,7 @@ public static void main(String[] args) {
 
             ch.exchangeDeclare(ticket, exchange, exchangeType);
             ch.basicPublish(ticket, exchange, routingKey, null, message.getBytes());
-            ch.close(200, "Closing the channel");
+            ch.close();
             conn.close();
         } catch (Exception e) {
             System.err.println("Main thread caught exception: " + e);

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

@@ -49,7 +49,7 @@ public static void main(String[] args) {
                 ch.queueDeclare(ticket, routingKey);
             }
             ch.basicPublish(ticket, exchange, routingKey, null, message.getBytes());
-            ch.close(200, "Closing the channel");
+            ch.close();
             conn.close();
         } catch (Exception e) {
             System.err.println("Main thread caught exception: " + e);