Merge pull request #342 from whg333/master

fix implementation classes of the PubSubStore interface with PubSubType

src/main/java/com/corundumstudio/socketio/store/HazelcastPubSubStore.java

@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap;
 import com.corundumstudio.socketio.store.pubsub.PubSubListener;
 import com.corundumstudio.socketio.store.pubsub.PubSubMessage;
 import com.corundumstudio.socketio.store.pubsub.PubSubStore;
+import com.corundumstudio.socketio.store.pubsub.PubSubType;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.ITopic;
 import com.hazelcast.core.Message;
@@ -45,13 +46,14 @@ public class HazelcastPubSubStore implements PubSubStore {
     }
 
     @Override
-    public void publish(String name, PubSubMessage msg) {
+    public void publish(PubSubType type, PubSubMessage msg) {
         msg.setNodeId(nodeId);
-        hazelcastPub.getTopic(name).publish(msg);
+        hazelcastPub.getTopic(type.toString()).publish(msg);
     }
 
     @Override
-    public <T extends PubSubMessage> void subscribe(String name, final PubSubListener<T> listener, Class<T> clazz) {
+    public <T extends PubSubMessage> void subscribe(PubSubType type, final PubSubListener<T> listener, Class<T> clazz) {
+        String name = type.toString();
         ITopic<T> topic = hazelcastSub.getTopic(name);
         String regId = topic.addMessageListener(new MessageListener<T>() {
             @Override
@@ -75,7 +77,8 @@ public class HazelcastPubSubStore implements PubSubStore {
     }
 
     @Override
-    public void unsubscribe(String name) {
+    public void unsubscribe(PubSubType type) {
+        String name = type.toString();
         Queue<String> regIds = map.remove(name);
         ITopic<Object> topic = hazelcastSub.getTopic(name);
         for (String id : regIds) {

src/main/java/com/corundumstudio/socketio/store/MemoryPubSubStore.java

@@ -18,19 +18,20 @@ package com.corundumstudio.socketio.store;
 import com.corundumstudio.socketio.store.pubsub.PubSubListener;
 import com.corundumstudio.socketio.store.pubsub.PubSubMessage;
 import com.corundumstudio.socketio.store.pubsub.PubSubStore;
+import com.corundumstudio.socketio.store.pubsub.PubSubType;
 
 public class MemoryPubSubStore implements PubSubStore {
 
     @Override
-    public void publish(String name, PubSubMessage msg) {
+    public void publish(PubSubType type, PubSubMessage msg) {
     }
 
     @Override
-    public <T extends PubSubMessage> void subscribe(String name, PubSubListener<T> listener, Class<T> clazz) {
+    public <T extends PubSubMessage> void subscribe(PubSubType type, PubSubListener<T> listener, Class<T> clazz) {
     }
 
     @Override
-    public void unsubscribe(String name) {
+    public void unsubscribe(PubSubType type) {
     }
 
     @Override

src/main/java/com/corundumstudio/socketio/store/RedissonPubSubStore.java

@@ -26,6 +26,7 @@ import org.redisson.core.RTopic;
 import com.corundumstudio.socketio.store.pubsub.PubSubListener;
 import com.corundumstudio.socketio.store.pubsub.PubSubMessage;
 import com.corundumstudio.socketio.store.pubsub.PubSubStore;
+import com.corundumstudio.socketio.store.pubsub.PubSubType;
 
 import io.netty.util.internal.PlatformDependent;
 
@@ -44,13 +45,14 @@ public class RedissonPubSubStore implements PubSubStore {
     }
 
     @Override
-    public void publish(String name, PubSubMessage msg) {
+    public void publish(PubSubType type, PubSubMessage msg) {
         msg.setNodeId(nodeId);
-        redissonPub.getTopic(name).publish(msg);
+        redissonPub.getTopic(type.toString()).publish(msg);
     }
 
     @Override
-    public <T extends PubSubMessage> void subscribe(String name, final PubSubListener<T> listener, Class<T> clazz) {
+    public <T extends PubSubMessage> void subscribe(PubSubType type, final PubSubListener<T> listener, Class<T> clazz) {
+        String name = type.toString();
         RTopic<T> topic = redissonSub.getTopic(name);
         int regId = topic.addListener(new MessageListener<T>() {
             @Override
@@ -73,7 +75,8 @@ public class RedissonPubSubStore implements PubSubStore {
     }
 
     @Override
-    public void unsubscribe(String name) {
+    public void unsubscribe(PubSubType type) {
+        String name = type.toString();
         Queue<Integer> regIds = map.remove(name);
         RTopic<Object> topic = redissonSub.getTopic(name);
         for (Integer id : regIds) {

src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubStore.java

@@ -22,7 +22,7 @@ public interface PubSubStore {
 
     <T extends PubSubMessage> void subscribe(PubSubType type, PubSubListener<T> listener, Class<T> clazz);
 
-    void unsubscribe(String name);
+    void unsubscribe(PubSubType type);
 
     void shutdown();
 

src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubType.java

@@ -1,16 +1,12 @@
 package com.corundumstudio.socketio.store.pubsub;
 
 public enum PubSubType {
-	
-	CONNECT,
-	DISCONNECT,
-	JOIN,
-	LEAVE,
-	DISPATCH;
-	
-	@Override
-	public String toString() {
-		return name().toLowerCase();
-	}
-	
+
+    CONNECT, DISCONNECT, JOIN, LEAVE, DISPATCH;
+
+    @Override
+    public String toString() {
+        return name().toLowerCase();
+    }
+
 }