Revert "ConnectionListener renamed to ServerListener"

This reverts commit ba7d963.

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

@@ -17,7 +17,7 @@
 
 import org.redisson.client.codec.Codec;
 import org.redisson.codec.JsonJacksonCodec;
-import org.redisson.connection.ServerListener;
+import org.redisson.connection.ConnectionListener;
 
 /**
  * Redisson configuration
@@ -49,7 +49,7 @@ public class Config {
 
     private boolean useLinuxNativeEpoll;
 
-    private ServerListener serverListener;
+    private ConnectionListener connectionListener;
 
     public Config() {
     }
@@ -62,7 +62,7 @@ public Config(Config oldConf) {
             oldConf.setCodec(new JsonJacksonCodec());
         }
 
-        setServerListener(oldConf.getServerListener());
+        setConnectionListener(oldConf.getConnectionListener());
         setThreads(oldConf.getThreads());
         setCodec(oldConf.getCodec());
         if (oldConf.getSingleServerConfig() != null) {
@@ -337,18 +337,18 @@ public boolean isUseLinuxNativeEpoll() {
         return useLinuxNativeEpoll;
     }
 
-    public ServerListener getServerListener() {
-        return serverListener;
+    public ConnectionListener getConnectionListener() {
+        return connectionListener;
     }
 
     /**
-     * Setup server listener which methods will be triggered
-     * on some Redisson events.
+     * Setup connect listener which will be triggered
+     * when Redisson has just been connected to or disconnected from redis server
      *
      * @param connectionListener
      */
-    public Config setServerListener(ServerListener serverListener) {
-        this.serverListener = serverListener;
+    public Config setConnectionListener(ConnectionListener connectionListener) {
+        this.connectionListener = connectionListener;
         return this;
     }
 

src/main/java/org/redisson/connection/ServerEventsHub.java → src/main/java/org/redisson/connection/ConnectionEventsHub.java

@@ -20,36 +20,36 @@
 
 import io.netty.util.internal.PlatformDependent;
 
-public class ServerEventsHub {
+public class ConnectionEventsHub {
 
     public enum Status {CONNECTED, DISCONNECTED};
 
-    private final ConcurrentMap<InetSocketAddress, Status> statusMap = PlatformDependent.newConcurrentHashMap();
+    private final ConcurrentMap<InetSocketAddress, Status> maps = PlatformDependent.newConcurrentHashMap();
 
-    private final ServerListener serverListener;
+    private final ConnectionListener connectionListener;
 
-    public ServerEventsHub(ServerListener connectionListener) {
-        this.serverListener = connectionListener;
+    public ConnectionEventsHub(ConnectionListener connectionListener) {
+        this.connectionListener = connectionListener;
     }
 
     public void fireConnect(InetSocketAddress addr) {
-        if (serverListener == null || statusMap.get(addr) == Status.CONNECTED) {
+        if (connectionListener == null || maps.get(addr) == Status.CONNECTED) {
             return;
         }
 
-        if (statusMap.putIfAbsent(addr, Status.CONNECTED) == null
-                || statusMap.replace(addr, Status.DISCONNECTED, Status.CONNECTED)) {
-            serverListener.onConnect(addr);
+        if (maps.putIfAbsent(addr, Status.CONNECTED) == null
+                || maps.replace(addr, Status.DISCONNECTED, Status.CONNECTED)) {
+            connectionListener.onConnect(addr);
         }
     }
 
     public void fireDisconnect(InetSocketAddress addr) {
-        if (serverListener == null || statusMap.get(addr) == Status.DISCONNECTED) {
+        if (connectionListener == null || maps.get(addr) == Status.DISCONNECTED) {
             return;
         }
 
-        if (statusMap.replace(addr, Status.CONNECTED, Status.DISCONNECTED)) {
-            serverListener.onDisconnect(addr);
+        if (maps.replace(addr, Status.CONNECTED, Status.DISCONNECTED)) {
+            connectionListener.onDisconnect(addr);
         }
     }
 

src/main/java/org/redisson/connection/ServerListener.java → src/main/java/org/redisson/connection/ConnectionListener.java

@@ -17,23 +17,10 @@
 
 import java.net.InetSocketAddress;
 
-public interface ServerListener {
+public interface ConnectionListener {
 
-    /**
-     * This method will be triggered when Redisson
-     * connects to Redis server.
-     *
-     * @param addr - Redis server network address
-     */
     void onConnect(InetSocketAddress addr);
 
-    /**
-     * This method will be triggered when Redisson
-     * discovers that Redis server connected before
-     * now in disconnected state.
-     *
-     * @param addr - Redis server network address
-     */
     void onDisconnect(InetSocketAddress addr);
 
 }

src/main/java/org/redisson/connection/ConnectionManager.java

@@ -45,7 +45,7 @@
  */
 public interface ConnectionManager {
 
-    ServerEventsHub getConnectionEventsHub();
+    ConnectionEventsHub getConnectionEventsHub();
 
     boolean isShutdown();
 

src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java

@@ -122,7 +122,7 @@ public boolean cancel() {
 
     private IdleConnectionWatcher connectionWatcher;
 
-    private ServerEventsHub connectionEventsHub;
+    private ConnectionEventsHub connectionEventsHub;
 
     public MasterSlaveConnectionManager(MasterSlaveServersConfig cfg, Config config) {
         init(config);
@@ -198,7 +198,7 @@ protected void init(Config cfg) {
         }
         this.codec = cfg.getCodec();
 
-        connectionEventsHub = new ServerEventsHub(cfg.getServerListener());
+        connectionEventsHub = new ConnectionEventsHub(cfg.getConnectionListener());
     }
 
     @Override
@@ -703,7 +703,7 @@ public InfinitySemaphoreLatch getShutdownLatch() {
     }
 
     @Override
-    public ServerEventsHub getConnectionEventsHub() {
+    public ConnectionEventsHub getConnectionEventsHub() {
         return connectionEventsHub;
     }
 

src/test/java/org/redisson/RedissonTest.java

@@ -14,7 +14,7 @@
 import org.junit.Test;
 import org.redisson.client.WriteRedisConnectionException;
 import org.redisson.codec.SerializationCodec;
-import org.redisson.connection.ServerListener;
+import org.redisson.connection.ConnectionListener;
 import org.redisson.core.ClusterNode;
 import org.redisson.core.Node;
 import org.redisson.core.NodesGroup;
@@ -50,7 +50,7 @@ public void testConnectionListener() throws IOException, InterruptedException, T
 
         Config config = new Config();
         config.useSingleServer().setAddress("127.0.0.1:6319").setFailedAttempts(1).setRetryAttempts(1);
-        config.setServerListener(new ServerListener() {
+        config.setConnectionListener(new ConnectionListener() {
 
             @Override
             public void onDisconnect(InetSocketAddress addr) {