Further adventures in 1.5 compatibility - remove more interface @OVERRIDES and TimeUnit only knows about seconds and their subdivisions.

Author: Simon MacMullen

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

@@ -207,12 +207,10 @@ public void flush() throws IOException {
             // no need to implement this: don't bother writing the frame
         }
 
-        @Override
         public InetAddress getLocalAddress() {
             return null;
         }
 
-        @Override
         public int getLocalPort() {
             return -1;
         }
@@ -259,7 +257,6 @@ public void handleChannelRecoveryException(Channel ch, Throwable ex) {
             _handledExceptions.add(ex);
         }
 
-        @Override
         public void handleTopologyRecoveryException(Connection conn, Channel ch, TopologyRecoveryException ex) {
             _handledExceptions.add(ex);
         }

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

@@ -158,12 +158,10 @@ public void flush() throws IOException {
             // no need to implement this: don't bother writing the frame
         }
 
-        @Override
         public InetAddress getLocalAddress() {
             return null;
         }
 
-        @Override
         public int getLocalPort() {
             return -1;
         }

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

@@ -69,7 +69,6 @@ public void testConnectionRecoveryWithDisabledTopologyRecovery() throws IOExcept
     public void testShutdownHooksRecovery() throws IOException, InterruptedException {
         final CountDownLatch latch = new CountDownLatch(2);
         connection.addShutdownListener(new ShutdownListener() {
-            @Override
             public void shutdownCompleted(ShutdownSignalException cause) {
                 latch.countDown();
             }
@@ -84,12 +83,10 @@ public void shutdownCompleted(ShutdownSignalException cause) {
     public void testBlockedListenerRecovery() throws IOException, InterruptedException {
         final CountDownLatch latch = new CountDownLatch(2);
         connection.addBlockedListener(new BlockedListener() {
-            @Override
             public void handleBlocked(String reason) throws IOException {
                 latch.countDown();
             }
 
-            @Override
             public void handleUnblocked() throws IOException {
                 latch.countDown();
             }
@@ -115,7 +112,6 @@ public void testChannelRecovery() throws IOException, InterruptedException {
     public void testReturnListenerRecovery() throws IOException, InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         channel.addReturnListener(new ReturnListener() {
-            @Override
             public void handleReturn(int replyCode, String replyText, String exchange,
                                      String routingKey, AMQP.BasicProperties properties,
                                      byte[] body) throws IOException {
@@ -132,12 +128,10 @@ public void testConfirmListenerRecovery() throws IOException, InterruptedExcepti
         int n = 3;
         final CountDownLatch latch = new CountDownLatch(n);
         channel.addConfirmListener(new ConfirmListener() {
-            @Override
             public void handleAck(long deliveryTag, boolean multiple) throws IOException {
                 latch.countDown();
             }
 
-            @Override
             public void handleNack(long deliveryTag, boolean multiple) throws IOException {
                 latch.countDown();
             }
@@ -312,7 +306,7 @@ public void handleDelivery(String consumerTag,
                     if (consumed.intValue() > 0 && consumed.intValue() % 4 == 0) {
                         CountDownLatch recoveryLatch = prepareForRecovery(connection);
                         Host.closeConnection((AutorecoveringConnection)connection);
-                        recoveryLatch.await(30, TimeUnit.MINUTES);
+                        ConnectionRecovery.wait(recoveryLatch);
                     }
                     channel.basicAck(envelope.getDeliveryTag(), false);
                 } catch (InterruptedException e) {
@@ -353,7 +347,6 @@ private void expectQueueRecovery(Channel ch, String q) throws IOException, Inter
     private CountDownLatch prepareForRecovery(Connection conn) {
         final CountDownLatch latch = new CountDownLatch(1);
         ((AutorecoveringConnection)conn).addRecoveryListener(new RecoveryListener() {
-            @Override
             public void handleRecovery(Recoverable recoverable) {
                 latch.countDown();
             }
@@ -364,7 +357,6 @@ public void handleRecovery(Recoverable recoverable) {
     private CountDownLatch prepareForShutdown(Connection conn) throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         conn.addShutdownListener(new ShutdownListener() {
-            @Override
             public void shutdownCompleted(ShutdownSignalException cause) {
                 latch.countDown();
             }
@@ -427,10 +419,10 @@ private ConnectionFactory buildConnectionFactoryWithRecoveryEnabled(boolean disa
         return cf;
     }
 
-    private void wait(CountDownLatch latch) throws InterruptedException {
+    private static void wait(CountDownLatch latch) throws InterruptedException {
         // Very very generous amount of time to wait, just make sure we never
         // hang forever
-        assertTrue(latch.await(30, TimeUnit.MINUTES));
+        assertTrue(latch.await(1800, TimeUnit.SECONDS));
     }
 
     private void waitForConfirms(Channel ch) throws InterruptedException, TimeoutException {