Add integration test for ExponentialBackoffDelayHandler

References #308

Author: acogoluegnes

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

@@ -1069,15 +1069,21 @@ public long getNetworkRecoveryInterval() {
 
     /**
      * Sets connection recovery interval. Default is 5000.
+     * Uses {@link com.rabbitmq.client.RecoveryDelayHandler.DefaultRecoveryDelayHandler} by default.
+     * Use another {@link RecoveryDelayHandler} implementation for more flexibility.
      * @param networkRecoveryInterval how long will automatic recovery wait before attempting to reconnect, in ms
+     * @see RecoveryDelayHandler
      */
     public void setNetworkRecoveryInterval(int networkRecoveryInterval) {
         this.networkRecoveryInterval = networkRecoveryInterval;
     }
 
     /**
      * Sets connection recovery interval. Default is 5000.
+     * Uses {@link com.rabbitmq.client.RecoveryDelayHandler.DefaultRecoveryDelayHandler} by default.
+     * Use another {@link RecoveryDelayHandler} implementation for more flexibility.
      * @param networkRecoveryInterval how long will automatic recovery wait before attempting to reconnect, in ms
+     * @see RecoveryDelayHandler
      */
     public void setNetworkRecoveryInterval(long networkRecoveryInterval) {
         this.networkRecoveryInterval = networkRecoveryInterval;
@@ -1086,6 +1092,7 @@ public void setNetworkRecoveryInterval(long networkRecoveryInterval) {
     /**
      * Returns automatic connection recovery delay handler.
      * @return recovery delay handler. May be null if not set.
+     * @since 4.3.0
      */
     public RecoveryDelayHandler getRecoveryDelayHandler() {
         return recoveryDelayHandler;
@@ -1094,6 +1101,7 @@ public RecoveryDelayHandler getRecoveryDelayHandler() {
     /**
      * Sets the automatic connection recovery delay handler.
      * @param recoveryDelayHandler the recovery delay handler
+     * @since 4.3.0
      */
     public void setRecoveryDelayHandler(final RecoveryDelayHandler recoveryDelayHandler) {
         this.recoveryDelayHandler = recoveryDelayHandler;

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

@@ -1,3 +1,18 @@
+// Copyright (c) 2007-Present Pivotal Software, Inc.  All rights reserved.
+//
+// This software, the RabbitMQ Java client library, is triple-licensed under the
+// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
+// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see
+// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.  For the ASL,
+// please see LICENSE-APACHE2.
+//
+// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
+// either express or implied. See the LICENSE file for specific language governing
+// rights and limitations of this software.
+//
+// If you have any questions regarding licensing, please contact us at
+// info@rabbitmq.com.
+
 package com.rabbitmq.client;
 
 import java.util.Arrays;
@@ -24,7 +39,7 @@ public interface RecoveryDelayHandler {
     /**
      * Basic implementation of {@link RecoveryDelayHandler} that returns the {@link ConnectionFactory#getNetworkRecoveryInterval() network recovery interval} each time.
      */
-    public static class DefaultRecoveryDelayHandler implements RecoveryDelayHandler {
+    class DefaultRecoveryDelayHandler implements RecoveryDelayHandler {
 
         private final long networkRecoveryInterval;
 
@@ -47,7 +62,7 @@ public long getDelay(int recoveryAttempts) {
      * Backoff implementation of {@link RecoveryDelayHandler} that uses the Fibonacci sequence (by default) to increase the recovery delay time after each failed attempt.
      * You can optionally use your own backoff sequence.
      */
-    public static class ExponentialBackoffDelayHandler implements RecoveryDelayHandler {
+    class ExponentialBackoffDelayHandler implements RecoveryDelayHandler {
 
         private final List<Long> sequence;
 

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

@@ -48,7 +48,8 @@
     JavaNioTest.class,
     ConnectionFactoryTest.class,
     RecoveryAwareAMQConnectionFactoryTest.class,
-    RpcTest.class
+    RpcTest.class,
+    RecoveryDelayHandlerTest.class
 })
 public class ClientTests {
 

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

@@ -1,3 +1,18 @@
+// Copyright (c) 2007-Present Pivotal Software, Inc.  All rights reserved.
+//
+// This software, the RabbitMQ Java client library, is triple-licensed under the
+// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
+// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see
+// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.  For the ASL,
+// please see LICENSE-APACHE2.
+//
+// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
+// either express or implied. See the LICENSE file for specific language governing
+// rights and limitations of this software.
+//
+// If you have any questions regarding licensing, please contact us at
+// info@rabbitmq.com.
+
 package com.rabbitmq.client.test;
 
 import static org.junit.Assert.assertEquals;

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

@@ -720,6 +720,19 @@ public void handleDelivery(String consumerTag,
         }
     }
 
+    @Test public void recoveryWithExponentialBackoffDelayHandler() throws Exception {
+        ConnectionFactory connectionFactory = TestUtils.connectionFactory();
+        connectionFactory.setRecoveryDelayHandler(new RecoveryDelayHandler.ExponentialBackoffDelayHandler());
+        Connection testConnection = connectionFactory.newConnection();
+        try {
+            assertTrue(testConnection.isOpen());
+            closeAndWaitForRecovery((RecoverableConnection) testConnection);
+            assertTrue(testConnection.isOpen());
+        } finally {
+            connection.close();
+        }
+    }
+
     private void assertConsumerCount(int exp, String q) throws IOException {
         assertEquals(exp, channel.queueDeclarePassive(q).getConsumerCount());
     }