fix: resolve conflicts

Lambert-Rao · Apr 7, 2024 · 03a6a00 · 03a6a00
1 parent 1c3249a
commit 03a6a00
Show file tree

Hide file tree

Showing 38 changed files with 132 additions and 98 deletions.
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Utility -->

diff --git a/...le/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java b/...le/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java
@@ -17,11 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.entity.cluster;
 
-import org.apache.eventmesh.dashboard.common.enums.StoreType;
 import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity;
 
-import java.sql.Timestamp;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,8 +30,6 @@
 @Builder
 public class ClusterEntity extends BaseEntity {
 
-    private Long id;
-
     private String name;
 
     private String registryAddress;
@@ -57,9 +52,5 @@ public class ClusterEntity extends BaseEntity {
 
     private Integer status;
 
-    private Timestamp createTime;
-
-    private Timestamp updateTime;
-
     private Integer storeType;
 }
diff --git a/...rc/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java b/...rc/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java
@@ -24,6 +24,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -32,6 +33,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
+@Builder
 public class ConnectorEntity extends BaseEntity {
 
     private static final long serialVersionUID = -8226303660232951326L;

diff --git a/...sole/src/main/java/org/apache/eventmesh/dashboard/console/entity/storage/StoreEntity.java b/...sole/src/main/java/org/apache/eventmesh/dashboard/console/entity/storage/StoreEntity.java
@@ -33,8 +33,6 @@ public class StoreEntity extends BaseEntity {
 
     private Long clusterId;
 
-    private Integer storeId;
-
     /**
      * @see org.apache.eventmesh.dashboard.common.enums.StoreType
      */

diff --git a/...rc/main/java/org/apache/eventmesh/dashboard/console/function/health/CheckResultCache.java b/...rc/main/java/org/apache/eventmesh/dashboard/console/function/health/CheckResultCache.java
@@ -32,17 +32,19 @@
 import lombok.Setter;
 
 public class CheckResultCache {
+
     @Getter
     private static final CheckResultCache INSTANCE = new CheckResultCache();
 
-    private static final HashMap<String, HashMap<Long, CheckResult>> cacheMap = new HashMap<>();
+    private final HashMap<String, HashMap<Long, CheckResult>> cacheMap = new HashMap<>();
 
-    public static Integer getLastHealthyCheckResult(String type, Long typeId) {
+    public  Integer getLastHealthyCheckResult(String type, Long typeId) {
         if (!Objects.isNull(cacheMap.get(type)) && !Objects.isNull(cacheMap.get(type).get(typeId))) {
             return cacheMap.get(type).get(typeId).getStatus().getNumber();
         }
         return HealthCheckStatus.CHECKING.getNumber();
     }
+
     private CheckResultCache() {
     }
 

diff --git a/.../dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4BrokerCheck.java b/.../dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4BrokerCheck.java
@@ -17,22 +17,21 @@
 
 package org.apache.eventmesh.dashboard.console.function.health.check.impl.storage.rocketmq4;
 
-import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_ROCKETMQ_BROKER;
-import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE;
-
-import org.apache.eventmesh.dashboard.console.function.health.annotation.HealthCheckType;
 import org.apache.eventmesh.dashboard.console.function.health.callback.HealthCheckCallback;
 import org.apache.eventmesh.dashboard.console.function.health.check.AbstractHealthCheckService;
 import org.apache.eventmesh.dashboard.console.function.health.check.config.HealthCheckObjectConfig;
+import org.apache.eventmesh.dashboard.core.function.SDK.SDKManager;
+import org.apache.eventmesh.dashboard.core.function.SDK.SDKTypeEnum;
+import org.apache.eventmesh.dashboard.core.function.SDK.config.CreateRocketmqConfig;
 
 import org.apache.rocketmq.common.protocol.RequestCode;
 import org.apache.rocketmq.remoting.InvokeCallback;
 import org.apache.rocketmq.remoting.RemotingClient;
-import org.apache.rocketmq.remoting.netty.NettyClientConfig;
-import org.apache.rocketmq.remoting.netty.NettyRemotingClient;
 import org.apache.rocketmq.remoting.netty.ResponseFuture;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 
+import java.util.Objects;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

diff --git a/...hboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4NameServerCheck.java b/...hboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4NameServerCheck.java
@@ -31,10 +31,12 @@
 import org.apache.rocketmq.remoting.netty.ResponseFuture;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 
+import java.util.Objects;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@HealthCheckType(type = HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE, subType = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_ROCKETMQ)
+@HealthCheckType(HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE)
 public class Rocketmq4NameServerCheck extends AbstractHealthCheckService {
 
     private RemotingClient remotingClient;

diff --git a/...h/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4TopicCheck.java b/...h/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4TopicCheck.java
@@ -19,9 +19,7 @@
 
 import static org.apache.rocketmq.client.producer.SendStatus.SEND_OK;
 
-import org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant;
 import org.apache.eventmesh.dashboard.common.constant.health.HealthConstant;
-import org.apache.eventmesh.dashboard.console.function.health.annotation.HealthCheckType;
 import org.apache.eventmesh.dashboard.console.function.health.callback.HealthCheckCallback;
 import org.apache.eventmesh.dashboard.console.function.health.check.AbstractHealthCheckService;
 import org.apache.eventmesh.dashboard.console.function.health.check.config.HealthCheckObjectConfig;

diff --git a/...esh/dashboard/console/function/metadata/handler/db/ConnectionMetadataHandlerToDbImpl.java b/...esh/dashboard/console/function/metadata/handler/db/ConnectionMetadataHandlerToDbImpl.java
@@ -55,7 +55,11 @@ public class ConnectionMetadataHandlerToDbImpl implements MetadataHandler<Connec
     @Override
     public void addMetadata(ConnectionMetadata meta) {
         if (Objects.equals(meta.getSinkType(), "connector")) {
-            List<ConnectorEntity> sink = connectorDataService.selectByHostPort(meta.getSinkHost(), meta.getSinkPort());
+            ConnectorEntity query = ConnectorEntity.builder()
+                .host(meta.getSinkHost())
+                .port(meta.getSinkPort())
+                .build();
+            List<ConnectorEntity> sink = connectorDataService.selectByHostPort(query);
             if (sink.size() == 1) {
                 meta.setSinkId(sink.get(0).getId());
             } else if (sink.isEmpty()) {
@@ -97,7 +101,11 @@ public void addMetadata(ConnectionMetadata meta) {
         }
 
         if (Objects.equals(meta.getSourceType(), "connector")) {
-            List<ConnectorEntity> source = connectorDataService.selectByHostPort(meta.getSourceHost(), meta.getSourcePort());
+            ConnectorEntity query = ConnectorEntity.builder()
+                .host(meta.getSourceHost())
+                .port(meta.getSourcePort())
+                .build();
+            List<ConnectorEntity> source = connectorDataService.selectByHostPort(query);
             if (source.size() == 1) {
                 meta.setSourceId(source.get(0).getId());
             } else if (source.isEmpty()) {

diff --git a/...tmesh/dashboard/console/function/metadata/handler/db/RegistryMetadataHandlerToDbImpl.java b/...tmesh/dashboard/console/function/metadata/handler/db/RegistryMetadataHandlerToDbImpl.java
@@ -53,6 +53,6 @@ public void addMetadata(List<RegistryMetadata> meta) {
 
     @Override
     public void deleteMetadata(RegistryMetadata meta) {
-        registryDataService.deActive(converter.convert(meta));
+        registryDataService.deactivate(converter.convert(meta));
     }
 }
diff --git a/...ntmesh/dashboard/console/function/metadata/handler/db/RuntimeMetadataHandlerToDbImpl.java b/...ntmesh/dashboard/console/function/metadata/handler/db/RuntimeMetadataHandlerToDbImpl.java
@@ -52,8 +52,20 @@ public void addMetadata(RuntimeMetadata meta) {
         ClusterEntity cluster = ClusterCache.getINSTANCE().getClusterByRegistryAddress(meta.getClusterRegistryAddress());
         if (Objects.isNull(cluster)) {
             log.info("new cluster detected syncing runtime, adding cluster to db, cluster:{}", meta.getClusterName());
-            ClusterEntity clusterEntity = new ClusterEntity(meta.getClusterName(), meta.getRegistryAddress(), "", "", "", "", "", "", 0, 0, 1,
-                null, null, 0);
+            ClusterEntity clusterEntity = new ClusterEntity();
+            clusterEntity.setId(0L);
+            clusterEntity.setName(meta.getClusterName());
+            clusterEntity.setRegistryAddress(meta.getRegistryAddress());
+            clusterEntity.setBootstrapServers("");
+            clusterEntity.setEventmeshVersion("");
+            clusterEntity.setClientProperties("");
+            clusterEntity.setJmxProperties("");
+            clusterEntity.setRegProperties("");
+            clusterEntity.setDescription("");
+            clusterEntity.setAuthType(0);
+            clusterEntity.setRunState(0);
+            clusterEntity.setStoreType(0);
+
             clusterService.addCluster(clusterEntity);
         } else {
             cluster.setName(meta.getClusterName());
@@ -68,7 +80,7 @@ public void addMetadata(RuntimeMetadata meta) {
 
     @Override
     public void deleteMetadata(RuntimeMetadata meta) {
-        runtimeService.deActive(converter.convert(meta));
+        runtimeService.deactivate(converter.convert(meta));
         RuntimeCache.getInstance().deleteRuntime(converter.convert(meta));
     }
 }
diff --git a/...ventmesh/dashboard/console/function/metadata/handler/db/TopicMetadataHandlerToDbImpl.java b/...ventmesh/dashboard/console/function/metadata/handler/db/TopicMetadataHandlerToDbImpl.java
@@ -63,6 +63,6 @@ public void addMetadata(TopicMetadata meta) {
 
     @Override
     public void deleteMetadata(TopicMetadata meta) {
-        topicService.deleteTopic(null, meta.getTopicName());
+        topicService.deleteTopic(null);
     }
 }
diff --git a/...ashboard/console/function/metadata/util/convert/entity/TopicEntity2MetadataConverter.java b/...ashboard/console/function/metadata/util/convert/entity/TopicEntity2MetadataConverter.java
@@ -27,7 +27,6 @@ public class TopicEntity2MetadataConverter implements Converter<TopicEntity, Top
     public TopicMetadata convert(TopicEntity source) {
         TopicMetadata topicMetadata = new TopicMetadata();
         topicMetadata.setTopicName(source.getTopicName());
-        topicMetadata.setRuntimeId(source.getRuntimeId());
         topicMetadata.setStorageId(source.getStorageId());
         topicMetadata.setRetentionMs(source.getRetentionMs());
         topicMetadata.setType(source.getType());

diff --git a/...hboard/console/function/metadata/util/convert/metadata/TopicMetadata2EntityConverter.java b/...hboard/console/function/metadata/util/convert/metadata/TopicMetadata2EntityConverter.java
@@ -28,7 +28,6 @@ public TopicEntity convert(TopicMetadata source) {
         TopicEntity topicEntity = new TopicEntity();
         topicEntity.setClusterId(source.getClusterId());
         topicEntity.setTopicName(source.getTopicName());
-        topicEntity.setRuntimeId(source.getRuntimeId());
         topicEntity.setStorageId(source.getStorageId());
         topicEntity.setRetentionMs(source.getRetentionMs());
         topicEntity.setType(source.getType());

diff --git a/...le/src/main/java/org/apache/eventmesh/dashboard/console/mapper/cluster/ClusterMapper.java b/...le/src/main/java/org/apache/eventmesh/dashboard/console/mapper/cluster/ClusterMapper.java
@@ -19,7 +19,6 @@
 
 import org.apache.eventmesh.dashboard.console.entity.cluster.ClusterEntity;
 
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Options;
@@ -70,5 +69,5 @@ public interface ClusterMapper {
     void updateClusterById(ClusterEntity cluster);
 
     @Update("UPDATE cluster SET status=0 WHERE id=#{id}")
-    void deActive(ClusterEntity clusterEntity);
+    void deactivate(ClusterEntity clusterEntity);
 }
diff --git a/...-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapper.java b/...-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapper.java
@@ -19,7 +19,6 @@
 
 import org.apache.eventmesh.dashboard.console.entity.meta.MetaEntity;
 
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Options;
@@ -59,5 +58,5 @@ public interface MetaMapper {
     Long insert(MetaEntity metaEntity);
 
     @Update("UPDATE meta SET status = 0 WHERE id = #{id}")
-    void deActive(MetaEntity metaEntity);
+    void deactivate(MetaEntity metaEntity);
 }
diff --git a/...le/src/main/java/org/apache/eventmesh/dashboard/console/mapper/runtime/RuntimeMapper.java b/...le/src/main/java/org/apache/eventmesh/dashboard/console/mapper/runtime/RuntimeMapper.java
@@ -19,10 +19,10 @@
 
 import org.apache.eventmesh.dashboard.console.entity.runtime.RuntimeEntity;
 
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
@@ -59,9 +59,6 @@ public interface RuntimeMapper {
     @Select("SELECT * FROM runtime WHERE cluster_id=#{clusterId} AND status=1")
     List<RuntimeEntity> selectRuntimeByCluster(RuntimeEntity runtimeEntity);
 
-    @Select("SELECT * FROM runtime WHERE host = #{host} and port = #{port} and status = 1")
-    List<RuntimeEntity> selectByHostPort(RuntimeEntity runtimeEntity);
-
     @Select({
         "<script>",
         "SELECT * FROM runtime",

diff --git a/...onsole/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java b/...onsole/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java
@@ -20,10 +20,10 @@
 
 import org.apache.eventmesh.dashboard.console.entity.topic.TopicEntity;
 
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
@@ -38,9 +38,6 @@ public interface TopicMapper {
     @Select("SELECT * FROM topic WHERE status=1")
     List<TopicEntity> selectAll();
 
-    @Select("SELECT * FROM topic WHERE cluster_id=#{clusterId} AND status=1")
-    List<TopicEntity> selectAllByClusterId(TopicEntity topicEntity);
-
     @Insert({
         "<script>",
         "INSERT INTO topic (cluster_id, topic_name, storage_id, retention_ms, type, description, create_progress) VALUES ",

diff --git a/...ava/org/apache/eventmesh/dashboard/console/service/client/Impl/ClientDataServiceImpl.java b/...ava/org/apache/eventmesh/dashboard/console/service/client/Impl/ClientDataServiceImpl.java
@@ -39,7 +39,7 @@ public List<ClientEntity> selectAll() {
 
     @Override
     public void deActive(ClientEntity clientEntity) {
-        clientMapper.deActive(clientEntity);
+        clientMapper.deactivate(clientEntity);
     }
 
     @Override

diff --git a/.../src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java b/.../src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java
@@ -18,6 +18,8 @@
 package org.apache.eventmesh.dashboard.console.service.cluster;
 
 import org.apache.eventmesh.dashboard.console.entity.cluster.ClusterEntity;
+import org.apache.eventmesh.dashboard.console.modle.vo.cluster.GetClusterBaseMessageVO;
+import org.apache.eventmesh.dashboard.console.modle.vo.cluster.ResourceNumVO;
 
 import java.util.List;
 
@@ -38,7 +40,7 @@ public interface ClusterService {
 
     List<ClusterEntity> selectAllCluster();
 
-    ClusterEntity selectClusterById(Long cluster);
+    ClusterEntity selectClusterById(ClusterEntity cluster);
 
     void updateClusterById(ClusterEntity cluster);
 

diff --git a/.../java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java b/.../java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java
@@ -17,8 +17,19 @@
 
 package org.apache.eventmesh.dashboard.console.service.cluster.impl;
 
+import org.apache.eventmesh.dashboard.console.cache.ClusterCache;
 import org.apache.eventmesh.dashboard.console.entity.cluster.ClusterEntity;
+import org.apache.eventmesh.dashboard.console.entity.connection.ConnectionEntity;
+import org.apache.eventmesh.dashboard.console.entity.group.GroupEntity;
+import org.apache.eventmesh.dashboard.console.entity.runtime.RuntimeEntity;
+import org.apache.eventmesh.dashboard.console.entity.topic.TopicEntity;
 import org.apache.eventmesh.dashboard.console.mapper.cluster.ClusterMapper;
+import org.apache.eventmesh.dashboard.console.mapper.connection.ConnectionMapper;
+import org.apache.eventmesh.dashboard.console.mapper.group.OprGroupMapper;
+import org.apache.eventmesh.dashboard.console.mapper.runtime.RuntimeMapper;
+import org.apache.eventmesh.dashboard.console.mapper.topic.TopicMapper;
+import org.apache.eventmesh.dashboard.console.modle.vo.cluster.GetClusterBaseMessageVO;
+import org.apache.eventmesh.dashboard.console.modle.vo.cluster.ResourceNumVO;
 import org.apache.eventmesh.dashboard.console.service.cluster.ClusterService;
 
 import java.util.List;

diff --git a/...java/org/apache/eventmesh/dashboard/console/service/connection/ConnectionDataService.java b/...java/org/apache/eventmesh/dashboard/console/service/connection/ConnectionDataService.java
@@ -43,10 +43,7 @@ public interface ConnectionDataService {
 
     List<ConnectionListVO> getConnectionToFrontByCluster(Long clusterId, GetConnectionListDTO getConnectionListDTO);
 
-    void replaceAllConnections(List<ConnectionEntity> connectionEntityList);
-
-
     List<ConfigEntity> getConnectorConfigsByClassAndVersion(String classType, String version);
 
-    void insert(ConnectionEntity connectionEntity);
+    Long insert(ConnectionEntity connectionEntity);
 }
diff --git a/...ventmesh/dashboard/console/service/connection/impl/ConnectionDataServiceDatabaseImpl.java b/...ventmesh/dashboard/console/service/connection/impl/ConnectionDataServiceDatabaseImpl.java
@@ -33,13 +33,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 
 @Service
 public class ConnectionDataServiceDatabaseImpl implements ConnectionDataService {

diff --git a/...g/apache/eventmesh/dashboard/console/service/connector/Impl/ConnectorDataServiceImpl.java b/...g/apache/eventmesh/dashboard/console/service/connector/Impl/ConnectorDataServiceImpl.java
@@ -50,10 +50,7 @@ public List<ConnectorEntity> selectConnectorByCluster(Long clusterId) {
     }
 
     @Override
-    public List<ConnectorEntity> selectByHostPort(String host, Integer port) {
-        ConnectorEntity connectorEntity = new ConnectorEntity();
-        connectorEntity.setHost(host);
-        connectorEntity.setPort(port);
+    public List<ConnectorEntity> selectByHostPort(ConnectorEntity connectorEntity) {
         return connectorMapper.selectByHostAndPort(connectorEntity);
     }
 }
diff --git a/...rc/main/java/org/apache/eventmesh/dashboard/console/service/health/HealthDataService.java b/...rc/main/java/org/apache/eventmesh/dashboard/console/service/health/HealthDataService.java
@@ -18,6 +18,7 @@
 package org.apache.eventmesh.dashboard.console.service.health;
 
 import org.apache.eventmesh.dashboard.console.entity.health.HealthCheckResultEntity;
+import org.apache.eventmesh.dashboard.console.modle.vo.health.InstanceLiveProportionVo;
 
 import java.sql.Timestamp;
 import java.util.List;