Make ConnectionFactory#networkRecoveryInterval a long

There is no real need for it to be a long but other libraries and JVM languages
may use longs for various reasons and using a long with an int field is

 * Unsafe
 * Not entirely obvious to some developers

Author: michaelklishin

src/com/rabbitmq/client/ConnectionFactory.java

@@ -99,7 +99,10 @@ public class ConnectionFactory implements Cloneable {
     private boolean automaticRecovery             = false;
     private boolean topologyRecovery              = true;
 
-    private int networkRecoveryInterval           = 5000;
+    // long is used to make sure the users can use both ints
+    // and longs safely. It is unlikely that anybody'd need
+    // to use recovery intervals > Integer.MAX_VALUE in practice.
+    private long networkRecoveryInterval          = 5000;
 
     /** @return number of consumer threads in default {@link ExecutorService} */
     @Deprecated
@@ -638,7 +641,7 @@ public Connection newConnection(ExecutorService executor) throws IOException {
      * Returns automatic connection recovery interval in milliseconds.
      * @return how long will automatic recovery wait before attempting to reconnect, in ms; default is 5000
      */
-    public int getNetworkRecoveryInterval() {
+    public long getNetworkRecoveryInterval() {
         return networkRecoveryInterval;
     }
 
@@ -649,4 +652,12 @@ public int getNetworkRecoveryInterval() {
     public void setNetworkRecoveryInterval(int networkRecoveryInterval) {
         this.networkRecoveryInterval = networkRecoveryInterval;
     }
+
+    /**
+     * Sets connection recovery interval. Default is 5000.
+     * @param networkRecoveryInterval how long will automatic recovery wait before attempting to reconnect, in ms
+     */
+    public void setNetworkRecoveryInterval(long networkRecoveryInterval) {
+        this.networkRecoveryInterval = networkRecoveryInterval;
+    }
 }

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

@@ -17,7 +17,7 @@ public class ConnectionParams {
     private final int requestedChannelMax;
     private final int requestedHeartbeat;
     private final SaslConfig saslConfig;
-    private final int networkRecoveryInterval;
+    private final long networkRecoveryInterval;
     private final boolean topologyRecovery;
 
     private ExceptionHandler exceptionHandler;
@@ -41,7 +41,7 @@ public class ConnectionParams {
     public ConnectionParams(String username, String password, ExecutorService executor,
                             String virtualHost, Map<String, Object> clientProperties,
                             int requestedFrameMax, int requestedChannelMax, int requestedHeartbeat,
-                            SaslConfig saslConfig, int networkRecoveryInterval,
+                            SaslConfig saslConfig, long networkRecoveryInterval,
                             boolean topologyRecovery, ExceptionHandler exceptionHandler, ThreadFactory threadFactory) {
         this.username = username;
         this.password = password;
@@ -98,7 +98,7 @@ public ExceptionHandler getExceptionHandler() {
         return exceptionHandler;
     }
 
-    public int getNetworkRecoveryInterval() {
+    public long getNetworkRecoveryInterval() {
         return networkRecoveryInterval;
     }
 

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

@@ -18,7 +18,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class ConnectionRecovery extends BrokerTestCase {
-    public static final int RECOVERY_INTERVAL = 2000;
+    public static final long RECOVERY_INTERVAL = 2000;
 
     public void testConnectionRecovery() throws IOException, InterruptedException {
         assertTrue(connection.isOpen());