This is an automated email from the ASF dual-hosted git repository.

mxsm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git


The following commit(s) were added to refs/heads/master by this push:
     new dd6cc067d [ISSUE #4203] [Enhancement] Do some code 
optimization.[EventMeshTcpMessageDispatcher] (#4357)
dd6cc067d is described below

commit dd6cc067d9855cf892c1ea8dadfb0b3fb958ed76
Author: Vaibhav arya <[email protected]>
AuthorDate: Tue Aug 15 06:37:29 2023 +0530

    [ISSUE #4203] [Enhancement] Do some code 
optimization.[EventMeshTcpMessageDispatcher] (#4357)
    
    * fixing issue #4203
    
    * fixing issue #4203
    
    * check style fix
---
 .../tcp/client/EventMeshTcpMessageDispatcher.java  | 46 ++++++++++------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git 
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java
 
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java
index 9d639711f..3edc91a62 100644
--- 
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java
+++ 
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcpMessageDispatcher.java
@@ -55,7 +55,7 @@ import lombok.extern.slf4j.Slf4j;
 public class EventMeshTcpMessageDispatcher extends 
SimpleChannelInboundHandler<Package> {
 
     private static final Logger MESSAGE_LOGGER = 
LoggerFactory.getLogger(EventMeshConstants.MESSAGE);
-    private EventMeshTCPServer eventMeshTCPServer;
+    private final EventMeshTCPServer eventMeshTCPServer;
 
     public EventMeshTcpMessageDispatcher(EventMeshTCPServer 
eventMeshTCPServer) {
         this.eventMeshTCPServer = eventMeshTCPServer;
@@ -85,25 +85,24 @@ public class EventMeshTcpMessageDispatcher extends 
SimpleChannelInboundHandler<P
                 
pkg.getHeader().getProperties().put(EventMeshConstants.REQ_IDC, 
session.getClient().getIdc());
                 
pkg.getHeader().getProperties().put(EventMeshConstants.REQ_GROUP, 
session.getClient().getGroup());
             }
-
-            if (Command.RECOMMEND_REQUEST == cmd) {
-                if (MESSAGE_LOGGER.isInfoEnabled()) {
-                    MESSAGE_LOGGER.info("pkg|c2eventMesh|cmd={}|pkg={}", cmd, 
pkg);
-                }
-                task = new RecommendTask(pkg, ctx, startTime, 
eventMeshTCPServer);
-                eventMeshTCPServer.getTaskHandleExecutorService().submit(task);
-                return;
+            switch (cmd) {
+                case RECOMMEND_REQUEST:
+                    if (MESSAGE_LOGGER.isInfoEnabled()) {
+                        MESSAGE_LOGGER.info("pkg|c2eventMesh|cmd={}|pkg={}", 
cmd, pkg);
+                    }
+                    task = new RecommendTask(pkg, ctx, startTime, 
eventMeshTCPServer);
+                    
eventMeshTCPServer.getTaskHandleExecutorService().submit(task);
+                    return;
+
+                case HELLO_REQUEST:
+                    if (MESSAGE_LOGGER.isInfoEnabled()) {
+                        MESSAGE_LOGGER.info("pkg|c2eventMesh|cmd={}|pkg={}", 
cmd, pkg);
+                    }
+                    task = new HelloTask(pkg, ctx, startTime, 
eventMeshTCPServer);
+                    
eventMeshTCPServer.getTaskHandleExecutorService().submit(task);
+                    return;
+                default: //do nothing
             }
-
-            if (Command.HELLO_REQUEST == cmd) {
-                if (MESSAGE_LOGGER.isInfoEnabled()) {
-                    MESSAGE_LOGGER.info("pkg|c2eventMesh|cmd={}|pkg={}", cmd, 
pkg);
-                }
-                task = new HelloTask(pkg, ctx, startTime, eventMeshTCPServer);
-                eventMeshTCPServer.getTaskHandleExecutorService().submit(task);
-                return;
-            }
-
             if 
(eventMeshTCPServer.getClientSessionGroupMapping().getSession(ctx) == null) {
                 if (MESSAGE_LOGGER.isInfoEnabled()) {
                     MESSAGE_LOGGER.info("pkg|c2eventMesh|cmd={}|pkg={},no 
session is found", cmd, pkg);
@@ -136,13 +135,10 @@ public class EventMeshTcpMessageDispatcher extends 
SimpleChannelInboundHandler<P
     }
 
     private boolean isNeedTrace(Command cmd) {
-        if 
(eventMeshTCPServer.getEventMeshTCPConfiguration().isEventMeshServerTraceEnable()
-            && cmd != null && (Command.REQUEST_TO_SERVER == cmd
+        return 
eventMeshTCPServer.getEventMeshTCPConfiguration().isEventMeshServerTraceEnable()
+            && (Command.REQUEST_TO_SERVER == cmd
             || Command.ASYNC_MESSAGE_TO_SERVER == cmd
-            || Command.BROADCAST_MESSAGE_TO_SERVER == cmd)) {
-            return true;
-        }
-        return false;
+            || Command.BROADCAST_MESSAGE_TO_SERVER == cmd);
     }
 
     private void writeToClient(Command cmd, Package pkg, ChannelHandlerContext 
ctx, Exception e) {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to