Merge pull request #197 from vikinghawk/master

Synchronize recovery steps better.

Author: acogoluegnes

src/main/java/com/rabbitmq/client/ConsumerCancelledException.java

@@ -23,6 +23,7 @@ public class ConsumerCancelledException extends RuntimeException implements
     /** Default for non-checking. */
     private static final long serialVersionUID = 1L;
 
+    @Override
     public ConsumerCancelledException sensibleClone() {
         try {
             return (ConsumerCancelledException) super.clone();

src/main/java/com/rabbitmq/client/DefaultConsumer.java

@@ -40,6 +40,7 @@ public DefaultConsumer(Channel channel) {
      * Stores the most recently passed-in consumerTag - semantically, there should be only one.
      * @see Consumer#handleConsumeOk
      */
+    @Override
     public void handleConsumeOk(String consumerTag) {
         this._consumerTag = consumerTag;
     }
@@ -48,6 +49,7 @@ public void handleConsumeOk(String consumerTag) {
      * No-op implementation of {@link Consumer#handleCancelOk}.
      * @param consumerTag the defined consumer tag (client- or server-generated)
      */
+    @Override
     public void handleCancelOk(String consumerTag) {
         // no work to do
     }
@@ -56,27 +58,31 @@ public void handleCancelOk(String consumerTag) {
      * No-op implementation of {@link Consumer#handleCancel(String)}
      * @param consumerTag the defined consumer tag (client- or server-generated)
      */
+    @Override
     public void handleCancel(String consumerTag) throws IOException {
         // no work to do
     }
 
     /**
      * No-op implementation of {@link Consumer#handleShutdownSignal}.
      */
+    @Override
     public void handleShutdownSignal(String consumerTag, ShutdownSignalException sig) {
         // no work to do
     }
 
      /**
      * No-op implementation of {@link Consumer#handleRecoverOk}.
      */
+    @Override
     public void handleRecoverOk(String consumerTag) {
         // no work to do
     }
 
     /**
      * No-op implementation of {@link Consumer#handleDelivery}.
      */
+    @Override
     public void handleDelivery(String consumerTag,
                                Envelope envelope,
                                AMQP.BasicProperties properties,

src/main/java/com/rabbitmq/client/DefaultSaslConfig.java

@@ -40,6 +40,7 @@ private DefaultSaslConfig(String mechanism) {
         this.mechanism = mechanism;
     }
 
+    @Override
     public SaslMechanism getSaslMechanism(String[] serverMechanisms) {
         Set<String> server = new HashSet<String>(Arrays.asList(serverMechanisms));
 

src/main/java/com/rabbitmq/client/DefaultSocketConfigurator.java

@@ -30,6 +30,7 @@ public class DefaultSocketConfigurator implements SocketConfigurator {
      *
      *  @param socket The socket that is to be used for the Connection
      */
+    @Override
     public void configure(Socket socket) throws IOException {
         // disable Nagle's algorithm, for more consistently low latency
         socket.setTcpNoDelay(true);

src/main/java/com/rabbitmq/client/JDKSaslConfig.java

@@ -64,6 +64,7 @@ public JDKSaslConfig(ConnectionFactory factory, String[] mechanisms) {
         this.mechanisms = Arrays.asList(mechanisms);
     }
 
+    @Override
     public SaslMechanism getSaslMechanism(String[] serverMechanisms) {
         Set<String> server = new HashSet<String>(Arrays.asList(serverMechanisms));
 
@@ -88,10 +89,12 @@ public JDKSaslMechanism(SaslClient client) {
             this.client = client;
         }
 
+        @Override
         public String getName() {
             return client.getMechanismName();
         }
 
+        @Override
         public LongString handleChallenge(LongString challenge, String username, String password) {
             try {
                 return LongStringHelper.asLongString(client.evaluateChallenge(challenge.getBytes()));
@@ -107,6 +110,7 @@ public UsernamePasswordCallbackHandler(ConnectionFactory factory) {
             this.factory = factory;
         }
 
+        @Override
         public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
             for (Callback callback: callbacks) {
                 if (callback instanceof NameCallback) {

src/main/java/com/rabbitmq/client/LongString.java

@@ -57,5 +57,6 @@ public interface LongString
      * Get the content as a String. Uses UTF-8 as encoding.
      * @return he content of the {@link LongString} as a string
      */
+    @Override
     public String toString();
 }

src/main/java/com/rabbitmq/client/MapRpcServer.java

@@ -43,6 +43,7 @@ public MapRpcServer(Channel channel, String queueName) throws IOException
     /**
      * Overridden to delegate to handleMapCall.
      */
+    @Override
     public byte[] handleCall(byte[] requestBody, AMQP.BasicProperties replyProperties)
     {
         try {
@@ -93,6 +94,7 @@ public Map<String, Object> handleMapCall(Map<String, Object> request)
     /**
      * Overridden to delegate to handleMapCast.
      */
+    @Override
     public void handleCast(byte[] requestBody)
     {
         try {

src/main/java/com/rabbitmq/client/NullTrustManager.java

@@ -29,6 +29,7 @@ public class NullTrustManager implements X509TrustManager {
      * Doesn't even bother looking at its arguments, simply returns,
      * which makes the check succeed.
      */
+    @Override
     public void checkClientTrusted(X509Certificate[] chain, String authType) {
         // Do nothing.
     }
@@ -37,13 +38,15 @@ public void checkClientTrusted(X509Certificate[] chain, String authType) {
      * Doesn't even bother looking at its arguments, simply returns,
      * which makes the check succeed.
      */
+    @Override
     public void checkServerTrusted(X509Certificate[] chain, String authType) {
         // Do nothing.
     }
 
     /**
      * Always returns an empty array of X509Certificates.
      */
+    @Override
     public X509Certificate[] getAcceptedIssuers() {
         return new X509Certificate[0];
     }

src/main/java/com/rabbitmq/client/SaslMechanism.java

@@ -15,8 +15,6 @@
 
 package com.rabbitmq.client;
 
-import java.io.IOException;
-
 /**
  * Our own view of a SASL authentication mechanism, introduced to remove a
  * dependency on javax.security.sasl.

src/main/java/com/rabbitmq/client/ShutdownSignalException.java

@@ -111,6 +111,7 @@ private static String composeMessage(boolean hardError, boolean initiatedByAppli
     /** @return Reference to Connection or Channel object that fired the signal **/
     public Object getReference() { return _ref; }
 
+    @Override
     public ShutdownSignalException sensibleClone() {
         try {
             return (ShutdownSignalException)super.clone();

src/main/java/com/rabbitmq/client/StringRpcServer.java

@@ -35,6 +35,7 @@ public StringRpcServer(Channel channel, String queueName) throws IOException
      * handleStringCall. If UTF-8 is not understood by this JVM, falls
      * back to the platform default.
      */
+    @Override
     @SuppressWarnings("unused")
     public byte[] handleCall(byte[] requestBody, AMQP.BasicProperties replyProperties)
     {
@@ -73,6 +74,7 @@ public String handleStringCall(String request)
      * handleStringCast. If requestBody cannot be interpreted as UTF-8
      * tries the platform default.
      */
+    @Override
     public void handleCast(byte[] requestBody)
     {
         try {

src/main/java/com/rabbitmq/client/UnexpectedMethodError.java

@@ -40,6 +40,7 @@ public UnexpectedMethodError(Method method) {
      * Return a string representation of this error.
      * @return a string describing the error
      */
+    @Override
     public String toString() {
         return super.toString() + ": " + _method;
     }

src/main/java/com/rabbitmq/client/UnknownClassOrMethodId.java

@@ -34,6 +34,7 @@ public UnknownClassOrMethodId(int classId, int methodId) {
         this.classId = classId;
         this.methodId = methodId;
     }
+    @Override
     public String toString() {
         if (this.methodId == NO_METHOD_ID) {
             return super.toString() + "<" + classId + ">";

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

@@ -347,10 +347,12 @@ public static abstract class BlockingRpcContinuation<T> implements RpcContinuati
         public final BlockingValueOrException<T, ShutdownSignalException> _blocker =
             new BlockingValueOrException<T, ShutdownSignalException>();
 
+        @Override
         public void handleCommand(AMQCommand command) {
             _blocker.setValue(transformReply(command));
         }
 
+        @Override
         public void handleShutdownSignal(ShutdownSignalException signal) {
             _blocker.setException(signal);
         }
@@ -372,6 +374,7 @@ public T getReply(int timeout)
     public static class SimpleBlockingRpcContinuation
         extends BlockingRpcContinuation<AMQCommand>
     {
+        @Override
         public AMQCommand transformReply(AMQCommand command) {
             return command;
         }

src/main/java/com/rabbitmq/client/impl/AMQCommand.java

@@ -68,16 +68,19 @@ public AMQCommand(com.rabbitmq.client.Method method, AMQContentHeader contentHea
     }
 
     /** Public API - {@inheritDoc} */
+    @Override
     public Method getMethod() {
         return this.assembler.getMethod();
     }
 
     /** Public API - {@inheritDoc} */
+    @Override
     public AMQContentHeader getContentHeader() {
         return this.assembler.getContentHeader();
     }
 
     /** Public API - {@inheritDoc} */
+    @Override
     public byte[] getContentBody() {
         return this.assembler.getContentBody();
     }