Improved Connection and Channel API to contain

all the necessary methods related to closing.
Fixed typos.

Author: Hubert Plociniczak

src/com/rabbitmq/client/Channel.java

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

src/com/rabbitmq/client/Connection.java

@@ -121,44 +121,101 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
     Channel createChannel(int channelNumber) throws IOException;
 
     /**
-     * Close this connection and all its channels.
+     * Close this connection and all its channels
+     * with the default close code and message.
      *
      * This method will wait infinitely for all the close operations to
      * complete.
      *
      * @throws IOException if an I/O problem is encountered
      */
     void close() throws IOException;
+    
+    /**
+     * Close this connection and all its channels.
+     *
+     * This method will wait infinitely for all the close operations to
+     * complete.
+     *
+     * @param closeCode the close code (See under "Reply Codes" in the AMQP specification)
+     * @param closeMessage a message indicating the reason for closing the connection
+     * @throws IOException if an I/O problem is encountered
+     */
+    void close(int closeCode, String closeMessage) throws IOException;
 
     /**
      * Close this connection and all its channels
+     * with the default close code and message.
      *
      * This method will wait with the given timeout for all the close
      * operations to complete. If timeout is reached then socket is forced
-     * to close
-     * @param timeout timeout (in milioseconds) for completing all the close-related
+     * to close.
+     * 
+     * @param timeout timeout (in milliseconds) for completing all the close-related
      * operations, use -1 for infinity
      * @throws IOException if an I/O problem is encountered
      */
     void close(int timeout) throws IOException;
+    
+    /**
+     * Close this connection and all its channels.
+     *
+     * This method will wait with the given timeout for all the close
+     * operations to complete. If timeout is reached then socket is forced
+     * to close.
+     * 
+     * @param closeCode the close code (See under "Reply Codes" in the AMQP specification)
+     * @param closeMessage a message indicating the reason for closing the connection
+     * @param timeout timeout (in milliseconds) for completing all the close-related
+     * operations, use -1 for infinity
+     * @throws IOException if an I/O problem is encountered
+     */
+    void close(int closeCode, String closeMessage, int timeout) throws IOException;
 
     /**
-     * Abort this connection and all its channels.
+     * Abort this connection and all its channels
+     * with the default code and message.
      *
      * This method will force the connection to close. It will silently discard
-     * any exceptions enountered in close operations
+     * any exceptions encountered in close operations.
      */
     void abort();
-
+    
     /**
      * Abort this connection and all its channels.
      *
+     * This method will force the connection to close. It will silently discard
+     * any exceptions encountered in close operations.
+     * 
+     * @param closeCode the close code (See under "Reply Codes" in the AMQP specification)
+     * @param closeMessage a message indicating the reason for closing the connection
+     */
+    void abort(int closeCode, String closeMessage);
+    
+    /**
+     * Abort this connection and all its channels
+     * with the default close code and message.
+     *
      * This method behaves in a similar way as abort(), with the only difference
      * that it will wait with a provided timeout for all the close operations to
      * complete. If timeout is reached socket is forced to close.
      *
-     * @param timeout timeout (in miliseconds) for completing all the close-related
+     * @param timeout timeout (in milliseconds) for completing all the close-related
      * operations, use -1 for infinity
      */
     void abort(int timeout);
+
+    /**
+     * Abort this connection and all its channels.
+     *
+     * This method behaves in a similar way as abort(), with the only difference
+     * that it will wait with a provided timeout for all the close operations to
+     * complete. If timeout is reached socket is forced to close.
+     *
+     * @param closeCode the close code (See under "Reply Codes" in the AMQP specification)
+     * @param closeMessage a message indicating the reason for closing the connection
+     * @param timeout timeout (in milliseconds) for completing all the close-related
+     * operations, use -1 for infinity
+     */
+    void abort(int closeCode, String closeMessage, int timeout);
 }

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

@@ -617,7 +617,7 @@ public void shutdown(Object reason,
     }
 
     /**
-     * Public API - Close this connection and all its channels
+     * Public API - Close this connection and all its channels.
      */
     public void close()
         throws IOException
@@ -627,48 +627,73 @@ public void close()
 
     /**
      * Public API - Close this connection and all its channels
-     * with a given timeout
+     * with a given timeout.
      */
     public void close(int timeout)
         throws IOException
     {
         close(AMQP.REPLY_SUCCESS, "Goodbye", timeout);
     }
+    
+    /**
+     * Public API - Close this connection and all its channels
+     * with a given close code and message.
+     */
+    public void close(int closeCode, String closeMessage)
+        throws IOException
+    {
+        close(closeCode, closeMessage, -1);
+    }
 
     /**
-     * Public API - Abort this connection and all its channels
+     * Public API - Close this connection and all its channels
+     * with a given close code, message and timeout.
+     */
+    public void close(int closeCode, String closeMessage, int timeout)
+        throws IOException
+    {
+        close(closeCode, closeMessage, true, null, timeout, false);
+    }
+
+    /**
+     * Public API - Abort this connection and all its channels.
      */
     public void abort()
     {
         abort(-1);
     }
 
-    public void abort(int timeout)
+    /**
+     * Public API - Abort this connection and all its channels
+     * with a given close code and message.
+     */
+    public void abort(int closeCode, String closeMessage)
     {
-
-        try {
-            close(AMQP.REPLY_SUCCESS, "Goodbye", true, null, timeout, true);
-        } catch (IOException e) {
-            Utility.emptyStatement();
-        }
+       abort(closeCode, closeMessage, -1);
     }
 
     /**
-     * Protected API - Close this connection with the given code and message.
-     * See the comments in ChannelN.close() - we're very similar.
+     * Public API - Abort this connection and all its channels
+     * with a given timeout.
      */
-    public void close(int closeCode, String closeMessage)
-        throws IOException
+    public void abort(int timeout)
     {
-        close(closeCode, closeMessage, 0);
+        abort(AMQP.REPLY_SUCCESS, "Goodbye", timeout);
     }
-
-    public void close(int closeCode, String closeMessage, int timeout)
-        throws IOException
+    
+    /**
+     * Public API - Abort this connection and all its channels
+     * with a given close code, message and timeout.
+     */
+    public void abort(int closeCode, String closeMessage, int timeout)
     {
-        close(closeCode, closeMessage, true, null, timeout, false);
+        try {
+            close(closeCode, closeMessage, true, null, timeout, true);
+        } catch (IOException e) {
+            Utility.emptyStatement();
+        }
     }
-
+    
     public void close(int closeCode,
                       String closeMessage,
                       boolean initiatedByApplication,

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

@@ -251,8 +251,7 @@ public void releaseChannelNumber() {
 
 
     /**
-     * Public API - closes this channel with the default 200 close code
-     * and 'Goodbye' message
+     * Public API - Close this channel with the default close code and message.
      */
     public void close()
         throws IOException
@@ -261,7 +260,7 @@ public void close()
     }
 
     /**
-     * Protected API - closes this channel with the given code and message
+     * Public API - Close this channel.
      */
     public void close(int closeCode, String closeMessage)
         throws IOException
@@ -270,9 +269,9 @@ public void close(int closeCode, String closeMessage)
     }
 
     /**
-     * Protected API - close channel with code and message, indicating
+     * Protected API - Close channel with code and message, indicating
      * the source of the closure and a causing exception (null if
-     * none)
+     * none).
      */
     public void close(int closeCode,
                       String closeMessage,