Code Specification

apache · Jun 15, 2024 · 9b80552 · 9b80552
1 parent 90959ac
commit 9b80552
Show file tree

Hide file tree

Showing 32 changed files with 128 additions and 157 deletions.
diff --git a/...src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java b/...src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java
@@ -69,7 +69,6 @@ public AddConnectionDTO showCreateConnectionMessage() {
     public String createConnection(@Validated @RequestBody CreateConnectionDTO createConnectionDTO) {
         try {
             connectionDataService.createConnection(createConnectionDTO);
-
         } catch (Exception e) {
             return e.getMessage();
         }

diff --git a/...ain/java/org/apache/eventmesh/dashboard/console/controller/cluster/ClusterController.java b/...ain/java/org/apache/eventmesh/dashboard/console/controller/cluster/ClusterController.java
@@ -43,12 +43,9 @@ public class ClusterController {
     @Autowired
     ClusterService clusterService;
 
-
-
-
     @GetMapping("queryHomeClusterData")
     public GetClusterBaseMessageVO queryHomeClusterData(@RequestBody @Validated ClusterIdDTO clusterIdDTO) {
-        return clusterService.selectClusterBaseMessage(clusterIdDTO);
+        return clusterService.selectClusterBaseMessage(clusterIdDTO.getClusterId());
     }
 
 

diff --git a/...ain/java/org/apache/eventmesh/dashboard/console/controller/function/ConfigController.java b/...ain/java/org/apache/eventmesh/dashboard/console/controller/function/ConfigController.java
@@ -18,6 +18,7 @@
 package org.apache.eventmesh.dashboard.console.controller.function;
 
 import org.apache.eventmesh.dashboard.console.entity.function.ConfigEntity;
+import org.apache.eventmesh.dashboard.console.mapstruct.config.ConfigControllerMapper;
 import org.apache.eventmesh.dashboard.console.modle.dto.config.DetailConfigsVO;
 import org.apache.eventmesh.dashboard.console.modle.dto.config.GetConfigsListDTO;
 import org.apache.eventmesh.dashboard.console.modle.dto.config.UpdateConfigDTO;
@@ -45,7 +46,7 @@ public class ConfigController {
     public String updateConfigsByTypeAndId(@Validated @RequestBody UpdateConfigDTO updateConfigDTO) {
         try {
             configService.updateConfigsByInstanceId(updateConfigDTO.getUsername(), updateConfigDTO.getClusterId(), updateConfigDTO.getInstanceType(),
-                updateConfigDTO.getInstanceId(), updateConfigDTO.getChangeConfigDTOS());
+                updateConfigDTO.getInstanceId(), updateConfigDTO.getChangeConfigEntities());
         } catch (Exception e) {
             return e.getMessage();
         }
@@ -55,10 +56,8 @@ public String updateConfigsByTypeAndId(@Validated @RequestBody UpdateConfigDTO u
 
     @PostMapping("/getInstanceDetailConfigs")
     public List<DetailConfigsVO> getInstanceDetailConfigs(@Validated @RequestBody GetConfigsListDTO getConfigsListDTO) {
-        List<ConfigEntity> configEntityList = configService.selectToFront(getConfigsListDTO.getInstanceId(),
-            getConfigsListDTO.getInstanceType(), getConfigsListDTO);
-        Map<String, String> stringStringConcurrentHashMap = configService.selectDefaultConfig(getConfigsListDTO.getBusinessType(),
-            getConfigsListDTO.getInstanceId(), getConfigsListDTO.getInstanceType());
+        List<ConfigEntity> configEntityList = configService.selectToFront(ConfigControllerMapper.INSTANCE.queryEntityByConfig(getConfigsListDTO));
+        Map<String, String> stringStringConcurrentHashMap = configService.selectDefaultConfig(getConfigsListDTO.getBusinessType());
         ArrayList<DetailConfigsVO> showDetailConfigsVOS = new ArrayList<>();
         configEntityList.forEach(n -> {
             DetailConfigsVO showDetailConfigsVO = new DetailConfigsVO();

diff --git a/...c/main/java/org/apache/eventmesh/dashboard/console/controller/function/LogController.java b/...c/main/java/org/apache/eventmesh/dashboard/console/controller/function/LogController.java
@@ -18,6 +18,7 @@
 package org.apache.eventmesh.dashboard.console.controller.function;
 
 import org.apache.eventmesh.dashboard.console.entity.function.LogEntity;
+import org.apache.eventmesh.dashboard.console.mapstruct.log.LogControllerMapper;
 import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO;
 import org.apache.eventmesh.dashboard.console.service.function.LogService;
 
@@ -39,7 +40,7 @@ public class LogController {
 
     @PostMapping("/getList")
     public List<LogEntity> getLogLIstToFront(@Validated @RequestBody GetLogListDTO getLogListDTO) {
-        return logService.selectLogListByCluster(getLogListDTO);
+        return logService.selectLogListByCluster(LogControllerMapper.INSTANCE.queryEntityByLog(getLogListDTO));
     }
 
 }
diff --git a/.../java/org/apache/eventmesh/dashboard/console/mapstruct/config/ConfigControllerMapper.java b/.../java/org/apache/eventmesh/dashboard/console/mapstruct/config/ConfigControllerMapper.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.mapstruct.config;
+
+
+import org.apache.eventmesh.dashboard.console.entity.function.ConfigEntity;
+import org.apache.eventmesh.dashboard.console.entity.function.LogEntity;
+import org.apache.eventmesh.dashboard.console.modle.dto.config.GetConfigsListDTO;
+import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ *
+ */
+
+@Mapper
+public interface ConfigControllerMapper {
+
+    ConfigControllerMapper INSTANCE = Mappers.getMapper(ConfigControllerMapper.class);
+
+    public ConfigEntity queryEntityByConfig(GetConfigsListDTO getConfigsListDTO);
+}
diff --git a/...c/main/java/org/apache/eventmesh/dashboard/console/mapstruct/log/LogControllerMapper.java b/...c/main/java/org/apache/eventmesh/dashboard/console/mapstruct/log/LogControllerMapper.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.mapstruct.log;
+
+import org.apache.eventmesh.dashboard.console.entity.function.LogEntity;
+import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO;
+
+
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ *
+ */
+@Mapper
+public interface LogControllerMapper {
+
+    LogControllerMapper INSTANCE = Mappers.getMapper(LogControllerMapper.class);
+
+
+    LogEntity queryEntityByLog(GetLogListDTO getLogListDTO);
+
+}
diff --git a/...che/eventmesh/dashboard/console/modle/cluster/runtime/QueryRuntimeListByClusterIdDTO.java b/...che/eventmesh/dashboard/console/modle/cluster/runtime/QueryRuntimeListByClusterIdDTO.java
@@ -19,12 +19,8 @@
 
 import org.apache.eventmesh.dashboard.console.modle.ClusterIdDTO;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class QueryRuntimeListByClusterIdDTO extends ClusterIdDTO {
 

diff --git a/...ole/modle/dto/config/ChangeConfigDTO.java → ...sole/modle/config/ChangeConfigEntity.java b/...ole/modle/dto/config/ChangeConfigDTO.java → ...sole/modle/config/ChangeConfigEntity.java
@@ -15,16 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.modle.dto.config;
+package org.apache.eventmesh.dashboard.console.modle.config;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
-public class ChangeConfigDTO {
+public class ChangeConfigEntity {
 
     private String configName;
 

diff --git a/...le/modle/dto/config/UpdateConfigsLog.java → ...onsole/modle/config/UpdateConfigsLog.java b/...le/modle/dto/config/UpdateConfigsLog.java → ...onsole/modle/config/UpdateConfigsLog.java
@@ -15,15 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.console.modle.dto.config;
+package org.apache.eventmesh.dashboard.console.modle.config;
 
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class UpdateConfigsLog {
 

diff --git a/...rc/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/DetailConfigsVO.java b/...rc/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/DetailConfigsVO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.config;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class DetailConfigsVO {
 

diff --git a/.../main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/GetConfigsListDTO.java b/.../main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/GetConfigsListDTO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.config;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class GetConfigsListDTO {
 

diff --git a/...rc/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigDTO.java b/...rc/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigDTO.java
@@ -17,20 +17,18 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.config;
 
+import org.apache.eventmesh.dashboard.console.modle.config.ChangeConfigEntity;
+
 import java.util.List;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class UpdateConfigDTO {
 
     private Long clusterId;
 
-    private List<ChangeConfigDTO> changeConfigDTOS;
+    private List<ChangeConfigEntity> changeConfigEntities;
 
     private String username;
 

diff --git a/...in/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectionDTO.java b/...in/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectionDTO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.connection;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class AddConnectionDTO {
 

diff --git a/...va/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectorConfigDTO.java b/...va/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectorConfigDTO.java
@@ -25,8 +25,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class AddConnectorConfigDTO {
 

diff --git a/...java/org/apache/eventmesh/dashboard/console/modle/dto/connection/CreateConnectionDTO.java b/...java/org/apache/eventmesh/dashboard/console/modle/dto/connection/CreateConnectionDTO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.connection;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class CreateConnectionDTO {
 

diff --git a/...ava/org/apache/eventmesh/dashboard/console/modle/dto/connection/GetConnectionListDTO.java b/...ava/org/apache/eventmesh/dashboard/console/modle/dto/connection/GetConnectionListDTO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.connection;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class GetConnectionListDTO {
 

diff --git a/...ole/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/log/GetLogListDTO.java b/...ole/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/log/GetLogListDTO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.log;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class GetLogListDTO {
 

diff --git a/...nsole/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/meta/NewMetaDTO.java b/...nsole/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/meta/NewMetaDTO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.meta;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class NewMetaDTO {
 

diff --git a/...src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/GetTopicListDTO.java b/...src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/GetTopicListDTO.java
@@ -18,12 +18,8 @@
 package org.apache.eventmesh.dashboard.console.modle.dto.topic;
 
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class GetTopicListDTO {
 

diff --git a/...java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/GetClusterBaseMessageVO.java b/...java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/GetClusterBaseMessageVO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.vo.cluster;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class GetClusterBaseMessageVO {
 

diff --git a/.../src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/ResourceNumVO.java b/.../src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/ResourceNumVO.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.vo.cluster;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class ResourceNumVO {
 

diff --git a/...ain/java/org/apache/eventmesh/dashboard/console/modle/vo/connection/ConnectionListVO.java b/...ain/java/org/apache/eventmesh/dashboard/console/modle/vo/connection/ConnectionListVO.java
@@ -17,13 +17,9 @@
 
 package org.apache.eventmesh.dashboard.console.modle.vo.connection;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class ConnectionListVO {
 
     private Long sinkConnectorId;

diff --git a/...java/org/apache/eventmesh/dashboard/console/modle/vo/health/InstanceLiveProportionVo.java b/...java/org/apache/eventmesh/dashboard/console/modle/vo/health/InstanceLiveProportionVo.java
@@ -17,12 +17,8 @@
 
 package org.apache.eventmesh.dashboard.console.modle.vo.health;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class InstanceLiveProportionVo {
 

diff --git a/...c/main/java/org/apache/eventmesh/dashboard/console/modle/vo/topic/TopicDetailGroupVO.java b/...c/main/java/org/apache/eventmesh/dashboard/console/modle/vo/topic/TopicDetailGroupVO.java
@@ -19,12 +19,8 @@
 
 import java.util.List;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
-@AllArgsConstructor
 @Data
 public class TopicDetailGroupVO {