Review naming convention #1

Pil0tXia · Jun 2, 2024 · 269db77 · 269db77
1 parent 8e3edc3
commit 269db77
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 146 deletions.
diff --git a/...shboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/ClusterType.java b/...shboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/ClusterType.java
@@ -1,11 +1,14 @@
 package org.apache.eventmesh.dashboard.common.enums;
 
-import lombok.Getter;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import lombok.Getter;
+
+/**
+ * TODO Fix naming & add doc for its 5 members
+ */
 public enum ClusterType {
 
     DEFAULT(1),
@@ -53,7 +56,6 @@ public enum ClusterType {
 
     public static final List<ClusterType> STORAGE_TYPES = getStorage();
 
-
     private static List<ClusterType> getStorage(){
         List<ClusterType> list = new ArrayList<>();
         for(ClusterType clusterType : ClusterType.values()){
@@ -64,7 +66,6 @@ private static List<ClusterType> getStorage(){
         return list;
     }
 
-
     @Getter
     private ClusterType eventmeshNodeType;
 
@@ -83,8 +84,6 @@ private static List<ClusterType> getStorage(){
     @Getter
     private int code;
 
-
-
     ClusterType(int code) {
         this.code = code;
     }
@@ -97,8 +96,7 @@ private static List<ClusterType> getStorage(){
         this.remotingType = remotingType;
     }
 
-
-    public boolean isMainCluster(){
+    public boolean isEventMeshCluster(){
         return Objects.equals(this, ClusterType.EVENTMESH_CLUSTER ) || Objects.equals(this.assemblyNodeType, ClusterType.CLUSTER );
     }
 
@@ -109,9 +107,8 @@ public boolean isFirstLayer() {
                 || Objects.equals(this.getAssemblyNodeType(), ClusterType.CLUSTER);
     }
 
-    public boolean isSecondFloor() {
+    public boolean isSecondLayer() {
         return Objects.equals(eventmeshNodeType, ClusterType.STORAGE) ? (Objects.equals(assemblyNodeType, ClusterType.RUNTIME)
                 || Objects.equals(assemblyNodeType, ClusterType.META)) : false;
     }
-
 }
diff --git a/...on/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/RemotingAction.java b/...on/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/RemotingAction.java
@@ -4,9 +4,12 @@
 
 public @interface RemotingAction {
 
-   boolean support();
+    boolean support();
 
-   RemotingType substitution();
+    RemotingType substitution();
 
-   RemotingType retrySubstitution() default  RemotingType.STORAGE;
+    /**
+     * A fallback mechanism for the substitution method. Can be used in RemotingServiceHandler. Not used for now.
+     */
+    RemotingType retrySubstitution() default RemotingType.STORAGE;
 }
diff --git a/...sh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/cluster/ColonyDO.java b/...sh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/cluster/ColonyDO.java
@@ -1,11 +1,11 @@
 package org.apache.eventmesh.dashboard.core.cluster;
 
-import lombok.Data;
-
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
+import lombok.Data;
+
 /**
  * eventmesh ClusterDO
  *   meta    ClusterDO
@@ -27,7 +27,7 @@ public class ColonyDO {
     private Map<Long,ColonyDO> runtimeColonyDOList = new ConcurrentHashMap<>();
 
     // 只有 eventmesh 集群有这个点，其他没有。
-    private Map<Long,ColonyDO> storageColonyDOList = new ConcurrentHashMap<>();
+    private Map<Long,ColonyDO> storageBrokerColonyDOList = new ConcurrentHashMap<>();
 
     /**
      * A(nameserver cluster) a1 a2 a3

diff --git a/...in/java/org/apache/eventmesh/dashboard/core/metadata/cluster/AbstractMetadataHandler.java b/...in/java/org/apache/eventmesh/dashboard/core/metadata/cluster/AbstractMetadataHandler.java
@@ -1,36 +1,35 @@
 package org.apache.eventmesh.dashboard.core.metadata.cluster;
 
-import lombok.Setter;
 import org.apache.eventmesh.dashboard.common.enums.ClusterTrusteeshipType;
 import org.apache.eventmesh.dashboard.core.metadata.MetadataHandler;
 import org.apache.eventmesh.dashboard.core.remoting.RemotingManager;
+import org.apache.eventmesh.dashboard.core.remoting.RemotingManager.RemotingServiceContext;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class AbstractMetadataHandler<T,S,RE> implements MetadataHandler<T> ,RemotingManager.RemotingRequestWrapper<S,RE>{
-
+import lombok.Setter;
 
+public abstract class AbstractMetadataHandler<T,S,RE> implements MetadataHandler<T> ,RemotingManager.RemotingRequestWrapper<S,RE>{
+
     @Setter
     private RemotingManager remotingManager;
 
     protected S request;
 
     public void init(){
-        this.request = (S)remotingManager.getProxyObject();
+        this.request = (S)remotingManager.getMethodProxy();
     }
 
-
     /**
      * 同步的时候，只同步runtime 的数据，还是会同步 storage 的数据。这个可以进行配置。
      * @return
      */
     @Override
     public List<T> getData(){
-        List<RemotingManager.RemotingWrapper> remotingWrapperList = new ArrayList<>();
-        remotingWrapperList.addAll(remotingManager.getEventMeshClusterDO(ClusterTrusteeshipType.TRUSTEESHIP, ClusterTrusteeshipType.FIRE_AND_FORGET_TRUSTEESHIP));
-        remotingWrapperList.addAll(remotingManager.getStorageCluster(ClusterTrusteeshipType.TRUSTEESHIP, ClusterTrusteeshipType.FIRE_AND_FORGET_TRUSTEESHIP));
-        return remotingManager.request(this, remotingManager.getEventMeshClusterDO(ClusterTrusteeshipType.TRUSTEESHIP, ClusterTrusteeshipType.FIRE_AND_FORGET_TRUSTEESHIP));
+        List<RemotingServiceContext> remotingServiceContextList = new ArrayList<>();
+        remotingServiceContextList.addAll(remotingManager.getEventMeshClusterDO(ClusterTrusteeshipType.TRUSTEESHIP, ClusterTrusteeshipType.FIRE_AND_FORGET_TRUSTEESHIP));
+        remotingServiceContextList.addAll(remotingManager.getStorageCluster(ClusterTrusteeshipType.TRUSTEESHIP, ClusterTrusteeshipType.FIRE_AND_FORGET_TRUSTEESHIP));
+        return remotingManager.request(this, remotingServiceContextList);
     }
-
 }
diff --git a/...e/src/main/java/org/apache/eventmesh/dashboard/core/remoting/AbstractRemotingService.java b/...e/src/main/java/org/apache/eventmesh/dashboard/core/remoting/AbstractRemotingService.java
@@ -1,7 +1,5 @@
 package org.apache.eventmesh.dashboard.core.remoting;
 
-import com.alibaba.fastjson.JSONObject;
-import lombok.Setter;
 import org.apache.eventmesh.dashboard.common.model.metadata.RuntimeMetadata;
 import org.apache.eventmesh.dashboard.core.cluster.ClusterDO;
 import org.apache.eventmesh.dashboard.core.cluster.ColonyDO;
@@ -10,6 +8,10 @@
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONObject;
+
+import lombok.Setter;
+
 /**
  * 默认是一个集群，操作是基于集群操作还是单个操作
  */
@@ -20,7 +22,6 @@ public abstract class AbstractRemotingService {
 
     protected ClusterDO clusterDO;
 
-
     public void init(){
         this.clusterDO = colonyDO.getClusterDO();
         this.createConfig();