Merge pull request #809 from SaikiranDaripelli/master

Adding support to supply custom connection manager

redisson/src/main/java/org/redisson/config/Config.java

@@ -26,6 +26,8 @@ import org.redisson.client.codec.Codec;
 import org.redisson.codec.CodecProvider;
 import org.redisson.codec.DefaultCodecProvider;
 import org.redisson.codec.JsonJacksonCodec;
+import org.redisson.connection.ConnectionManager;
+import org.redisson.connection.ReplicatedConnectionManager;
 import org.redisson.liveobject.provider.DefaultResolverProvider;
 import org.redisson.liveobject.provider.ResolverProvider;
 
@@ -50,6 +52,8 @@ public class Config {
     private ElasticacheServersConfig elasticacheServersConfig;
 
     private ReplicatedServersConfig replicatedServersConfig;
+    
+    private  ConnectionManager connectionManager;
 
     /**
      * Threads amount shared between all redis node clients
@@ -122,6 +126,9 @@ public class Config {
         if (oldConf.getReplicatedServersConfig() != null) {
             setReplicatedServersConfig(new ReplicatedServersConfig(oldConf.getReplicatedServersConfig()));
         }
+        if (oldConf.getConnectionManager() != null) {
+        	useCustomServers(oldConf.getConnectionManager());
+        }
 
     }
 
@@ -296,6 +303,28 @@ public class Config {
     void setReplicatedServersConfig(ReplicatedServersConfig replicatedServersConfig) {
         this.replicatedServersConfig = replicatedServersConfig;
     }
+    
+    /**
+	 * Returns the connection manager if supplied via
+	 * {@link #useCustomServers(ConnectionManager)}
+	 * 
+	 * @return ConnectionManager
+	 */
+    ConnectionManager getConnectionManager() {
+        return connectionManager;
+    }
+
+    /**
+	 * This is an extension point to supply custom connection manager.
+	 * 
+	 * @see ReplicatedConnectionManager on how to implement a connection
+	 *      manager.
+	 * @param connectionManager
+	 */
+    public void useCustomServers(ConnectionManager connectionManager) {
+        this.connectionManager = connectionManager;
+    }
+    
 
     /**
      * Init single server configuration.
@@ -447,6 +476,7 @@ public class Config {
             throw new IllegalStateException("Replication servers config already used!");
         }
     }
+    
 
     /**
      * Activates an unix socket if servers binded to loopback interface.

redisson/src/main/java/org/redisson/config/ConfigSupport.java

@@ -265,7 +265,9 @@ public class ConfigSupport {
         } else if (configCopy.getReplicatedServersConfig() != null) {
             validate(configCopy.getReplicatedServersConfig());
             return new ReplicatedConnectionManager(configCopy.getReplicatedServersConfig(), configCopy);
-        } else {
+        } else if (configCopy.getConnectionManager() != null) {
+            return configCopy.getConnectionManager();
+        }else {
             throw new IllegalArgumentException("server(s) address(es) not defined!");
         }
     }