Use connection prefix for auto-recovery keys

References #324

Author: acogoluegnes

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

@@ -65,9 +65,9 @@ public class ConnectionFactoryConfigurator {
     public static final String SHUTDOWN_TIMEOUT = "shutdown.timeout";
     public static final String USE_DEFAULT_CLIENT_PROPERTIES = "use.default.client.properties";
     public static final String CLIENT_PROPERTIES_PREFIX = "client.properties.";
-    public static final String AUTOMATIC_RECOVERY_ENABLED = "automatic.recovery.enabled";
+    public static final String CONNECTION_RECOVERY_ENABLED = "connection.recovery.enabled";
     public static final String TOPOLOGY_RECOVERY_ENABLED = "topology.recovery.enabled";
-    public static final String NETWORK_RECOVERY_INTERVAL = "network.recovery.interval";
+    public static final String CONNECTION_RECOVERY_INTERVAL = "connection.recovery.interval";
     public static final String CHANNEL_RPC_TIMEOUT = "channel.rpc.timeout";
     public static final String CHANNEL_SHOULD_CHECK_RPC_RESPONSE_TYPE = "channel.should.check.rpc.response.type";
     public static final String USE_NIO = "use.nio";
@@ -183,15 +183,15 @@ public static void load(ConnectionFactory cf, Map<String, String> properties, St
         }
         cf.setClientProperties(clientProperties);
 
-        String automaticRecovery = properties.get(prefix + AUTOMATIC_RECOVERY_ENABLED);
+        String automaticRecovery = properties.get(prefix + CONNECTION_RECOVERY_ENABLED);
         if (automaticRecovery != null) {
             cf.setAutomaticRecoveryEnabled(Boolean.valueOf(automaticRecovery));
         }
         String topologyRecovery = properties.get(prefix + TOPOLOGY_RECOVERY_ENABLED);
         if (topologyRecovery != null) {
             cf.setTopologyRecoveryEnabled(Boolean.getBoolean(topologyRecovery));
         }
-        String networkRecoveryInterval = properties.get(prefix + NETWORK_RECOVERY_INTERVAL);
+        String networkRecoveryInterval = properties.get(prefix + CONNECTION_RECOVERY_INTERVAL);
         if (networkRecoveryInterval != null) {
             cf.setNetworkRecoveryInterval(Long.valueOf(networkRecoveryInterval));
         }

src/test/resources/property-file-initialisation/configuration.properties

@@ -12,9 +12,9 @@ rabbitmq.handshake.timeout=5000
 rabbitmq.shutdown.timeout=20000
 rabbitmq.use.default.client.properties=true
 rabbitmq.client.properties.foo=bar
-rabbitmq.automatic.recovery.enabled=false
+rabbitmq.connection.recovery.enabled=false
 rabbitmq.topology.recovery.enabled=false
-rabbitmq.network.recovery.interval=10000
+rabbitmq.connection.recovery.interval=10000
 rabbitmq.channel.rpc.timeout=10000
 rabbitmq.channel.should.check.rpc.response.type=true
 rabbitmq.use.nio=true