From 4280c6f98389cb282522ac0b86ae7ce6d6fc34b7 Mon Sep 17 00:00:00 2001 From: scwlkq Date: Fri, 22 Mar 2024 20:34:04 +0800 Subject: [PATCH] remove unnecessary brackets & revert em-dashboard-pom.xml & move RocketmqProperties to core.dto --- .../console/controller/TopicController.java | 6 ++-- .../core/store/RocketmqTopicCore.java | 32 +++++++++---------- .../service/dto}/RocketmqProperties.java | 4 +-- pom.xml | 4 --- 4 files changed, 20 insertions(+), 26 deletions(-) rename {eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/properties => eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/dto}/RocketmqProperties.java (92%) diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java index a79195d7..c8f92ff8 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java @@ -59,14 +59,14 @@ public ResponseEntity preflight() { } @CrossOrigin - @GetMapping() + @GetMapping public Result> getList() { List topicList = topicCore.getTopics(); return Result.success(topicList); } @CrossOrigin - @PostMapping() + @PostMapping public Result create(@RequestBody CreateTopicRequest createTopicRequest) { String topicName = createTopicRequest.getName(); topicCore.createTopic(topicName); @@ -74,7 +74,7 @@ public Result create(@RequestBody CreateTopicRequest createTopicRequest) } @CrossOrigin - @DeleteMapping() + @DeleteMapping public Result delete(@RequestBody DeleteTopicRequest deleteTopicRequest) { String topicName = deleteTopicRequest.getName(); topicCore.deleteTopic(topicName); diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java index 0fdd8f9d..c9387128 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/store/RocketmqTopicCore.java @@ -17,10 +17,10 @@ package org.apache.eventmesh.dashboard.core.store; -import org.apache.eventmesh.dashboard.common.properties.RocketmqProperties; 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.CreateSDKConfig; +import org.apache.eventmesh.dashboard.service.dto.RocketmqProperties; import org.apache.eventmesh.dashboard.service.dto.TopicProperties; import org.apache.eventmesh.dashboard.service.store.TopicCore; @@ -65,18 +65,18 @@ public RocketmqTopicCore(RocketmqProperties rocketmqProperties) { @Override public Boolean createTopic(String topicName) { - String brokerUrl = rocketmqProperties.getBrokerUrl(); + String namesrvAddr = rocketmqProperties.getNamesrvAddr(); long requestTimeoutMillis = rocketmqProperties.getRequestTimeoutMillis(); int readQueueNums = rocketmqProperties.getReadQueueNums(); int writeQueueNums = rocketmqProperties.getReadQueueNums(); - if (StringUtils.isEmpty(brokerUrl)) { + if (StringUtils.isEmpty(namesrvAddr)) { log.info("RocketmqTopicCore-createTopic failed, missing brokerUrl"); return Boolean.FALSE; } - RemotingClient remotingClient = (RemotingClient) SDKManager.getInstance().getClient(SDKTypeEnum.STORAGE_ROCKETMQ_REMOTING, brokerUrl); + RemotingClient remotingClient = (RemotingClient) SDKManager.getInstance().getClient(SDKTypeEnum.STORAGE_ROCKETMQ_REMOTING, namesrvAddr); if (remotingClient == null) { - remotingClient = createRemotingClient(brokerUrl); + remotingClient = createRemotingClient(namesrvAddr); } try { CreateTopicRequestHeader requestHeader = new CreateTopicRequestHeader(); @@ -87,7 +87,7 @@ public Boolean createTopic(String topicName) { requestHeader.setPerm(PermName.PERM_READ | PermName.PERM_WRITE); RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.UPDATE_AND_CREATE_TOPIC, requestHeader); - RemotingCommand response = remotingClient.invokeSync(brokerUrl, request, requestTimeoutMillis); + RemotingCommand response = remotingClient.invokeSync(namesrvAddr, request, requestTimeoutMillis); log.info("Rocketmq create topic result:" + response.toString()); return response.getCode() == 0; } catch (Exception e) { @@ -98,21 +98,21 @@ public Boolean createTopic(String topicName) { @Override public List getTopics() { - String brokerUrl = rocketmqProperties.getBrokerUrl(); + String namesrvAddr = rocketmqProperties.getNamesrvAddr(); long requestTimeoutMillis = rocketmqProperties.getRequestTimeoutMillis(); - if (StringUtils.isEmpty(brokerUrl)) { + if (StringUtils.isEmpty(namesrvAddr)) { log.info("RocketmqTopicCore-getTopics failed, missing brokerUrl"); return new ArrayList<>(); } - RemotingClient remotingClient = (RemotingClient) SDKManager.getInstance().getClient(SDKTypeEnum.STORAGE_ROCKETMQ_REMOTING, brokerUrl); + RemotingClient remotingClient = (RemotingClient) SDKManager.getInstance().getClient(SDKTypeEnum.STORAGE_ROCKETMQ_REMOTING, namesrvAddr); if (remotingClient == null) { - remotingClient = createRemotingClient(brokerUrl); + remotingClient = createRemotingClient(namesrvAddr); } List topicConfigList = new ArrayList<>(); try { RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, (CommandCustomHeader) null); - RemotingCommand response = remotingClient.invokeSync(brokerUrl, request, requestTimeoutMillis); + RemotingCommand response = remotingClient.invokeSync(namesrvAddr, request, requestTimeoutMillis); TopicConfigSerializeWrapper allTopicConfig = TopicConfigSerializeWrapper.decode(response.getBody(), TopicConfigSerializeWrapper.class); ConcurrentMap topicConfigTable = allTopicConfig.getTopicConfigTable(); topicConfigList = new ArrayList<>(topicConfigTable.values()); @@ -125,22 +125,22 @@ public List getTopics() { @Override public Boolean deleteTopic(String topicName) { - String brokerUrl = rocketmqProperties.getBrokerUrl(); + String namesrvAddr = rocketmqProperties.getNamesrvAddr(); long requestTimeoutMillis = rocketmqProperties.getRequestTimeoutMillis(); - if (StringUtils.isEmpty(brokerUrl)) { + if (StringUtils.isEmpty(namesrvAddr)) { log.info("RocketmqTopicCore-deleteTopic failed, missing brokerUrl"); return Boolean.FALSE; } - RemotingClient remotingClient = (RemotingClient) SDKManager.getInstance().getClient(SDKTypeEnum.STORAGE_ROCKETMQ_REMOTING, brokerUrl); + RemotingClient remotingClient = (RemotingClient) SDKManager.getInstance().getClient(SDKTypeEnum.STORAGE_ROCKETMQ_REMOTING, namesrvAddr); if (remotingClient == null) { - remotingClient = createRemotingClient(brokerUrl); + remotingClient = createRemotingClient(namesrvAddr); } try { DeleteTopicRequestHeader deleteTopicRequestHeader = new DeleteTopicRequestHeader(); deleteTopicRequestHeader.setTopic(topicName); RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.DELETE_TOPIC_IN_BROKER, null); - RemotingCommand response = remotingClient.invokeSync(brokerUrl, request, requestTimeoutMillis); + RemotingCommand response = remotingClient.invokeSync(namesrvAddr, request, requestTimeoutMillis); log.info("Rocketmq delete topic result:" + response.toString()); return response.getCode() == 0; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/properties/RocketmqProperties.java b/eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/dto/RocketmqProperties.java similarity index 92% rename from eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/properties/RocketmqProperties.java rename to eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/dto/RocketmqProperties.java index 1f059049..ed08d935 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/properties/RocketmqProperties.java +++ b/eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/dto/RocketmqProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.common.properties; +package org.apache.eventmesh.dashboard.service.dto; import lombok.Data; @@ -26,8 +26,6 @@ public class RocketmqProperties { private String clusterName; - private String brokerUrl; - private int writeQueueNums = 8; private int readQueueNums = 8; diff --git a/pom.xml b/pom.xml index 980c463d..34ee5312 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@