Merge pull request mrniko#14 from YoonsooChang/yoonsoo

Fix Syntax Errors
simim7 · Jun 6, 2020 · a6e04ab · a6e04ab
2 parents 95773d0 + 941b67d
commit a6e04ab
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 343 deletions.
diff --git a/src/main/java/com/corundumstudio/socketio/SocketIONamespace.java b/src/main/java/com/corundumstudio/socketio/SocketIONamespace.java
@@ -19,6 +19,7 @@
 import java.util.UUID;
 
 import com.corundumstudio.socketio.listener.ClientListeners;
+import com.corundumstudio.socketio.listener.ListenerManager;
 
 /**
  * Fully thread-safe.
@@ -47,4 +48,6 @@ public interface SocketIONamespace  {
      */
     SocketIOClient getClient(UUID uuid);
 
+	ListenerManager getListenerManager();
+
 }
diff --git a/src/main/java/com/corundumstudio/socketio/SocketIOServer.java b/src/main/java/com/corundumstudio/socketio/SocketIOServer.java
@@ -51,7 +51,7 @@ public class SocketIOServer implements ClientListeners {
 
     private final NamespacesHub namespacesHub;
     private final SocketIONamespace mainNamespace;
-
+    private ListenerManager listenerManager;
     private SocketIOChannelInitializer pipelineFactory = new SocketIOChannelInitializer();
 
     private EventLoopGroup bossGroup;
@@ -62,6 +62,7 @@ public SocketIOServer(Configuration configuration) {
         this.configCopy = new Configuration(configuration);
         namespacesHub = new NamespacesHub(configCopy);
         mainNamespace = addNamespace(Namespace.DEFAULT_NAME);
+        listenerManager = mainNamespace.getListenerManager();
     }
 
     public void setPipelineFactory(SocketIOChannelInitializer pipelineFactory) {
@@ -221,50 +222,56 @@ public Configuration getConfiguration() {
 
     @Override
     public void addMultiTypeEventListener(String eventName, MultiTypeEventListener listener, Class<?>... eventClass) {
-        mainNamespace.addMultiTypeEventListener(eventName, listener, eventClass);
+    	listenerManager.addMultiTypeEventListener(eventName, listener, eventClass);
     }
 
     @Override
     public <T> void addEventListener(String eventName, Class<T> eventClass, DataListener<T> listener) {
-        mainNamespace.addEventListener(eventName, eventClass, listener);
+    	listenerManager.addEventListener(eventName, eventClass, listener);
     }
 
     @Override
     public void addEventInterceptor(EventInterceptor eventInterceptor) {
-        mainNamespace.addEventInterceptor(eventInterceptor);
+    	listenerManager.addEventInterceptor(eventInterceptor);
 
     }
 
 
     @Override
     public void removeAllListeners(String eventName) {
-        mainNamespace.removeAllListeners(eventName);
+    	listenerManager.removeAllListeners(eventName);
     }
 
     @Override
     public void addDisconnectListener(DisconnectListener listener) {
-        mainNamespace.addDisconnectListener(listener);
+    	listenerManager.addDisconnectListener(listener);
     }
 
     @Override
     public void addConnectListener(ConnectListener listener) {
-        mainNamespace.addConnectListener(listener);
+    	listenerManager.addConnectListener(listener);
     }
 
     @Override
     public void addPingListener(PingListener listener) {
-        mainNamespace.addPingListener(listener);
+    	listenerManager.addPingListener(listener);
     }
 
     @Override
     public void addListeners(Object listeners) {
-        mainNamespace.addListeners(listeners);
+    	listenerManager.addListeners(listeners);
     }
 
-    @Override
-    public void addListeners(Object listeners, Class<?> listenersClass) {
-        mainNamespace.addListeners(listeners, listenersClass);
-    }
+//    @Override
+//    public void addListeners(Object listeners, Class<?> listenersClass) {
+//    	listenerManager.addListeners(listeners, listenersClass);
+//    }
+
+	@Override
+	public void addListeners(Object listeners, Class<?> listenersClass) {
+		listenerManager.addListeners(listeners, listenersClass);
+
+	}
 
 
 }
diff --git a/src/main/java/com/corundumstudio/socketio/listener/ClientListeners.java b/src/main/java/com/corundumstudio/socketio/listener/ClientListeners.java
@@ -15,6 +15,7 @@
  */
 package com.corundumstudio.socketio.listener;
 
+import com.corundumstudio.socketio.namespace.Namespace;
 
 public interface ClientListeners {
 
@@ -35,5 +36,6 @@ public interface ClientListeners {
     void addListeners(Object listeners, Class<?> listenersClass);
 
     void removeAllListeners(String eventName);
+
 
 }
diff --git a/src/main/java/com/corundumstudio/socketio/listener/ListenerManager.java b/src/main/java/com/corundumstudio/socketio/listener/ListenerManager.java
@@ -12,6 +12,7 @@
 import com.corundumstudio.socketio.SocketIOClient;
 import com.corundumstudio.socketio.annotation.ScannerEngine;
 import com.corundumstudio.socketio.namespace.EventEntry;
+import com.corundumstudio.socketio.namespace.Namespace;
 import com.corundumstudio.socketio.protocol.JsonSupport;
 import com.corundumstudio.socketio.transport.NamespaceClient;
 
@@ -23,7 +24,8 @@ public class ListenerManager implements ClientListeners {
     private final JsonSupport jsonSupport;
     private final ExceptionListener exceptionListener;
     private final AckMode ackMode;
-
+    private final Namespace namespace;
+
     private final ScannerEngine engine = new ScannerEngine();
 
     private final ConcurrentMap<String, EventEntry<?>> eventListeners = PlatformDependent.newConcurrentHashMap();
@@ -34,7 +36,8 @@ public class ListenerManager implements ClientListeners {
     private final Queue<EventInterceptor> eventInterceptors = new ConcurrentLinkedQueue<EventInterceptor>();
 
 
-    public ListenerManager(JsonSupport jsonSupport, String namespaceName, ExceptionListener exceptionListener, AckMode ackMode) {
+    public ListenerManager(Namespace namespace, JsonSupport jsonSupport, String namespaceName, ExceptionListener exceptionListener, AckMode ackMode) {
+    	this.namespace = namespace;
     	this.jsonSupport = jsonSupport;
     	this.namespaceName = namespaceName;
     	this.exceptionListener = exceptionListener;
@@ -107,7 +110,7 @@ public void addListeners(Object listeners) {
 	@Override
 	public void addListeners(Object listeners, Class<?> listenersClass) {
 		// TODO Auto-generated method stub
-        engine.scan(this, listeners, listenersClass);
+        engine.scan(namespace, listeners, listenersClass);
 	}
 
 	@Override

diff --git a/.../socketio/annotation/annotation_diag.ucls → ...om/corundumstudio/socketio/namespace.ucls b/.../socketio/annotation/annotation_diag.ucls → ...om/corundumstudio/socketio/namespace.ucls
diff --git a/src/main/java/com/corundumstudio/socketio/namespace/Namespace.java b/src/main/java/com/corundumstudio/socketio/namespace/Namespace.java
@@ -69,7 +69,7 @@ public Namespace(String name, Configuration configuration) {
         this.name = name;
         this.storeFactory = configuration.getStoreFactory();
 
-        listenerManager = new ListenerManager(configuration.getJsonSupport(), name,
+        listenerManager = new ListenerManager(this, configuration.getJsonSupport(), name,
         		configuration.getExceptionListener(), configuration.getAckMode());
     }
 
@@ -287,4 +287,10 @@ public SocketIOClient getClient(UUID uuid) {
         return allClients.get(uuid);
     }
 
+	@Override
+	public ListenerManager getListenerManager() {
+		// TODO Auto-generated method stub
+		return listenerManager;
+	}
+
 }