Merge 42ed2cd into e1e9aca

apache · May 7, 2023 · 4c1d702 · 4c1d702
2 parents e1e9aca + 42ed2cd
commit 4c1d702
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 32 deletions.
diff --git a/.../main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java b/.../main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java
@@ -23,7 +23,7 @@
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
 import org.apache.eventmesh.runtime.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
-import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendImpl;
+import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.DefaultEventMeshRecommendStrategyImpl;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendStrategy;
 
 import org.apache.commons.lang3.StringUtils;
@@ -69,7 +69,7 @@ public void handle(HttpExchange httpExchange) throws IOException {
                 return;
             }
 
-            EventMeshRecommendStrategy eventMeshRecommendStrategy = new EventMeshRecommendImpl(eventMeshTCPServer);
+            EventMeshRecommendStrategy eventMeshRecommendStrategy = new DefaultEventMeshRecommendStrategyImpl(eventMeshTCPServer);
             String recommendEventMeshResult = eventMeshRecommendStrategy.calculateRecommendEventMesh(group, purpose);
             result = (recommendEventMeshResult == null) ? "null" : recommendEventMeshResult;
             log.info("recommend eventmesh:{},group:{},purpose:{}", result, group, purpose);

diff --git a/...g/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java b/...g/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java
@@ -22,7 +22,7 @@
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
-import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendImpl;
+import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.DefaultEventMeshRecommendStrategyImpl;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendStrategy;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
 
@@ -179,7 +179,7 @@ private void doRedirect(String group, String purpose, int judge, List<String> ev
     private List<String> selectRedirectEventMesh(String group, Map<String, String> eventMeshMap,
         Map<String, Integer> clientDistributionMap, int judge,
         String eventMeshName) throws Exception {
-        EventMeshRecommendStrategy eventMeshRecommendStrategy = new EventMeshRecommendImpl(eventMeshTCPServer);
+        EventMeshRecommendStrategy eventMeshRecommendStrategy = new DefaultEventMeshRecommendStrategyImpl(eventMeshTCPServer);
         return eventMeshRecommendStrategy.calculateRedirectRecommendEventMesh(eventMeshMap, clientDistributionMap,
             group, judge, eventMeshName);
     }

diff --git a/...ent/recommend/EventMeshRecommendImpl.java → ...efaultEventMeshRecommendStrategyImpl.java b/...ent/recommend/EventMeshRecommendImpl.java → ...efaultEventMeshRecommendStrategyImpl.java
@@ -35,13 +35,13 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class EventMeshRecommendImpl implements EventMeshRecommendStrategy {
+public class DefaultEventMeshRecommendStrategyImpl implements EventMeshRecommendStrategy {
 
     private static final int DEFAULT_PROXY_NUM = 1;
 
     private final transient EventMeshTCPServer eventMeshTCPServer;
 
-    public EventMeshRecommendImpl(final EventMeshTCPServer eventMeshTCPServer) {
+    public DefaultEventMeshRecommendStrategyImpl(final EventMeshTCPServer eventMeshTCPServer) {
         this.eventMeshTCPServer = eventMeshTCPServer;
     }
 
@@ -69,8 +69,8 @@ public String calculateRecommendEventMesh(final String group, final String purpo
 
         if (CollectionUtils.isEmpty(eventMeshDataInfoList)) {
             if (log.isWarnEnabled()) {
-                log.warn("EventMeshRecommend failed,not find eventMesh instances from registry,cluster:{},group:{},purpose:{}",
-                    cluster, group, purpose);
+                log.warn("EventMeshRecommend failed,not find eventMesh instances from registry,cluster:{},group:{},purpose:{}", cluster, group,
+                    purpose);
             }
             return null;
         }
@@ -113,7 +113,7 @@ public List<String> calculateRedirectRecommendEventMesh(final Map<String, String
         Objects.requireNonNull(clientDistributedMap, "clientDistributedMap can not be null");
 
         if (recommendProxyNum < DEFAULT_PROXY_NUM || MapUtils.isEmpty(clientDistributedMap)) {
-            return new ArrayList<String>();
+            return new ArrayList<>(0);
         }
 
         if (log.isInfoEnabled()) {
@@ -145,29 +145,27 @@ public List<String> calculateRedirectRecommendEventMesh(final Map<String, String
         }
 
         if (log.isInfoEnabled()) {
-            log.info("choose proxys with min instance num, group:{}, recommendProxyNum:{}, recommendProxyList:{}",
+            log.info("choose proxies with min instance num, group:{}, recommendProxyNum:{}, recommendProxyList:{}",
                 group, recommendProxyNum, recommendProxyList);
         }
         return recommendProxyList;
     }
 
     private String recommendProxyByDistributeData(final String cluster, final String group, final String purpose,
-        final Map<String, String> eventMeshMap, final boolean caculateLocal) {
+        final Map<String, String> eventMeshMap, final boolean calculateLocal) {
         Objects.requireNonNull(eventMeshMap, "eventMeshMap can not be null");
 
         if (log.isInfoEnabled()) {
-            log.info("eventMeshMap:{},cluster:{},group:{},purpose:{},caculateLocal:{}", eventMeshMap, cluster,
-                group, purpose, caculateLocal);
+            log.info("eventMeshMap:{},cluster:{},group:{},purpose:{},calculateLocal:{}", eventMeshMap, cluster, group, purpose, calculateLocal);
         }
 
         Map<String, Map<String, Integer>> eventMeshClientDistributionDataMap = null;
         try {
-            eventMeshClientDistributionDataMap = eventMeshTCPServer.getRegistry().findEventMeshClientDistributionData(
-                cluster, group, purpose);
+            eventMeshClientDistributionDataMap = eventMeshTCPServer.getRegistry().findEventMeshClientDistributionData(cluster, group, purpose);
         } catch (Exception e) {
             if (log.isWarnEnabled()) {
-                log.warn("EventMeshRecommend failed,findEventMeshClientDistributionData failed,"
-                    + "cluster:{},group:{},purpose:{}, errMsg:{}", cluster, group, purpose, e);
+                log.warn("EventMeshRecommend failed,findEventMeshClientDistributionData failed,cluster:{},group:{},purpose:{}, errMsg:{}", cluster,
+                    group, purpose, e);
             }
         }
 
@@ -181,8 +179,8 @@ private String recommendProxyByDistributeData(final String cluster, final String
             Collections.shuffle(tmpProxyAddrList);
             recommendProxyAddr = tmpProxyAddrList.get(0);
             if (log.isInfoEnabled()) {
-                log.info("No distribute data in registry,cluster:{}, group:{},purpose:{}, recommendProxyAddr:{}",
-                    cluster, group, purpose, recommendProxyAddr);
+                log.info("No distribute data in registry,cluster:{}, group:{},purpose:{}, recommendProxyAddr:{}", cluster, group, purpose,
+                    recommendProxyAddr);
             }
             return recommendProxyAddr;
         }
@@ -205,20 +203,18 @@ private String recommendProxyByDistributeData(final String cluster, final String
             }
         });
 
-        recommendProxyAddr = recommendProxy(eventMeshMap, (caculateLocal == true) ? localClientDistributionMap
-            : remoteClientDistributionMap, group);
+        recommendProxyAddr = recommendProxy(eventMeshMap, (calculateLocal == true) ? localClientDistributionMap : remoteClientDistributionMap, group);
 
         if (log.isInfoEnabled()) {
-            log.info("eventMeshMap:{},group:{},purpose:{},caculateLocal:{},recommendProxyAddr:{}", eventMeshMap,
-                group, purpose, caculateLocal, recommendProxyAddr);
+            log.info("eventMeshMap:{},group:{},purpose:{},caculateLocal:{},recommendProxyAddr:{}", eventMeshMap, group, purpose, calculateLocal,
+                recommendProxyAddr);
         }
 
         return recommendProxyAddr;
     }
 
-    private String recommendProxy(final Map<String, String> eventMeshMap,
-        final Map<String, Integer> clientDistributionMap,
-        final String group) {
+    private String recommendProxy(final Map<String, String> eventMeshMap, final Map<String, Integer> clientDistributionMap, final String group) {
+
         Objects.requireNonNull(eventMeshMap, "eventMeshMap can not be null");
         Objects.requireNonNull(clientDistributionMap, "clientDistributionMap can not be null");
 

diff --git a/...c/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/RecommendTask.java b/...c/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/task/RecommendTask.java
@@ -26,7 +26,7 @@
 import org.apache.eventmesh.common.protocol.tcp.UserAgent;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
-import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendImpl;
+import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.DefaultEventMeshRecommendStrategyImpl;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendStrategy;
 
 import org.apache.commons.lang3.StringUtils;
@@ -55,7 +55,7 @@ public void run() {
             UserAgent user = (UserAgent) pkg.getBody();
             validateUserAgent(user);
             String group = getGroupOfClient(user);
-            EventMeshRecommendStrategy eventMeshRecommendStrategy = new EventMeshRecommendImpl(eventMeshTCPServer);
+            EventMeshRecommendStrategy eventMeshRecommendStrategy = new DefaultEventMeshRecommendStrategyImpl(eventMeshTCPServer);
             String eventMeshRecommendResult = eventMeshRecommendStrategy.calculateRecommendEventMesh(group, user.getPurpose());
             res.setHeader(new Header(RECOMMEND_RESPONSE, OPStatus.SUCCESS.getCode(), OPStatus.SUCCESS.getDesc(),
                 pkg.getHeader().getSeq()));

diff --git a/...t/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandlerTest.java b/...t/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandlerTest.java
@@ -30,7 +30,7 @@
 import org.apache.eventmesh.runtime.admin.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
 import org.apache.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
-import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendImpl;
+import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.DefaultEventMeshRecommendStrategyImpl;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -68,7 +68,7 @@ public void testHandle() throws Exception {
         // case 1: normal case
         tcpConfiguration.setEventMeshServerRegistryEnable(true);
         when(httpExchange.getResponseBody()).thenReturn(outputStream);
-        try (MockedConstruction<EventMeshRecommendImpl> ignored = mockConstruction(EventMeshRecommendImpl.class,
+        try (MockedConstruction<DefaultEventMeshRecommendStrategyImpl> ignored = mockConstruction(DefaultEventMeshRecommendStrategyImpl.class,
             (mock, context) -> when(mock.calculateRecommendEventMesh(anyString(), anyString())).thenReturn(returnValue))) {
             handler.handle(httpExchange);
             String response = outputStream.toString();
@@ -90,11 +90,11 @@ public void testHandle() throws Exception {
         outputStream = mock(ByteArrayOutputStream.class);
         doThrow(new IOException()).when(outputStream).close();
         when(httpExchange.getResponseBody()).thenReturn(outputStream);
-        try (MockedConstruction<EventMeshRecommendImpl> ignored = mockConstruction(EventMeshRecommendImpl.class,
+        try (MockedConstruction<DefaultEventMeshRecommendStrategyImpl> ignored = mockConstruction(DefaultEventMeshRecommendStrategyImpl.class,
             (mock, context) -> when(mock.calculateRecommendEventMesh(anyString(), anyString())).thenReturn(returnValue))) {
             handler.handle(httpExchange);
             String response = outputStream.toString();
             Assert.assertNotEquals(returnValue, response);
         }
     }
-}
+}