From 295f2eee980abd166b6c53e04a4b23965e7e0972 Mon Sep 17 00:00:00 2001 From: "lambert@arch" Date: Thu, 4 Apr 2024 11:24:51 +0800 Subject: [PATCH] feat: tidy up pom, tidy up common module --- eventmesh-dashboard-common/pom.xml | 25 +-------- .../common/constant/StoreTypeConstant.java | 31 +++++++++++ .../health/HealthCheckTypeConstant.java | 10 ++-- .../dashboard/common/enums/StoreType.java | 46 ++++++++++++++-- .../enums/health/HealthCheckStatus.java | 3 +- .../metadata/MetadataServiceTypeEnum.java | 39 +++++++++++++ .../enums/metadata/MetadataTypeEnum.java | 37 +++++++++++++ .../model/metadata/ClusterMetadata.java | 3 + .../model/metadata/RuntimeMetadata.java | 6 ++ .../model/remoting/acl/CreateAclRequest.java | 3 +- .../remoting/group/GetGroupsResponse.java | 1 + .../remoting/offset/ResetOffsetRequest.java | 2 +- .../remoting/runtime/GetRuntimeResponse.java | 2 +- .../subscription/GetSubscriptionResponse.java | 7 --- eventmesh-dashboard-console/pom.xml | 49 +++++++++-------- eventmesh-dashboard-core/pom.xml | 55 +++++++++++++++++-- 16 files changed, 246 insertions(+), 73 deletions(-) create mode 100644 eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java create mode 100644 eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataServiceTypeEnum.java create mode 100644 eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataTypeEnum.java diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml index d6c277c5..6265eadf 100644 --- a/eventmesh-dashboard-common/pom.xml +++ b/eventmesh-dashboard-common/pom.xml @@ -23,6 +23,7 @@ org.springframework.boot spring-boot-starter-web + provided @@ -40,30 +41,6 @@ fastjson2 2.0.40 - - - - - io.lettuce - lettuce-core - - - - com.alibaba.nacos - nacos-client - ${nacos.version} - - - - org.apache.rocketmq - rocketmq-client - ${rocketmq.version} - - - org.apache.rocketmq - rocketmq-tools - ${rocketmq.version} - \ No newline at end of file diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java new file mode 100644 index 00000000..8f9249f2 --- /dev/null +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java @@ -0,0 +1,31 @@ +/* + * 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.common.constant; + +public class StoreTypeConstant { + public static final String STORE_TYPE_TYPE_UNKNOWN = "unknown"; + public static final String STORE_TYPE_STANDALONE = "standalone"; + public static final String STORE_TYPE_REDIS = "redis"; + public static final String STORE_TYPE_MYSQL = "mysql"; + public static final String STORE_TYPE_ROCKETMQ = "rocketmq4"; + public static final String STORE_SUBTYPE_ROCKETMQ_BROKER = "rocketmq4-broker"; + public static final String STORE_SUBTYPE_ROCKETMQ_NAMESERVER = "rocketmq4-nameserver"; + public static final String STORE_TYPE_KAFKA = "kafka"; + public static final String STORE_TYPE_PULSAR = "pulsar"; + public static final String STORE_TYPE_RABBITMQ = "rabbitmq"; +} diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java index ff9c602a..c676c78f 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java @@ -17,6 +17,8 @@ package org.apache.eventmesh.dashboard.common.constant.health; +import org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant; + public class HealthCheckTypeConstant { public static final String HEALTH_CHECK_TYPE_UNKNOWN = "unknown"; @@ -28,10 +30,10 @@ public class HealthCheckTypeConstant { public static final String HEALTH_CHECK_TYPE_META = "meta"; public static final String HEALTH_CHECK_TYPE_TOPIC = "topic"; - public static final String HEALTH_CHECK_SUBTYPE_REDIS = "redis"; - public static final String HEALTH_CHECK_SUBTYPE_MYSQL = "mysql"; - public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_BROKER = "rocketmq4-broker"; - public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_NAMESERVER = "rocketmq4-nameserver"; + public static final String HEALTH_CHECK_SUBTYPE_REDIS = StoreTypeConstant.STORE_TYPE_REDIS; + public static final String HEALTH_CHECK_SUBTYPE_MYSQL = StoreTypeConstant.STORE_TYPE_MYSQL; + public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_BROKER = StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_BROKER; + public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_NAMESERVER = StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_NAMESERVER; public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_TOPIC = "rocketmq4-topic"; public static final String HEALTH_CHECK_SUBTYPE_NACOS_CONFIG = "nacos-config"; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java index d5146b14..c1a01856 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java @@ -17,21 +17,55 @@ package org.apache.eventmesh.dashboard.common.enums; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_BROKER; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_NAMESERVER; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_KAFKA; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_PULSAR; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_RABBITMQ; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_REDIS; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_ROCKETMQ; +import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_STANDALONE; + import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor public enum StoreType { - STANDALONE(0, "Standalone"), - ROCKETMQ(1, "RocketMQ"), - KAFKA(2, "Kafka"), - PULSAR(3, "Pulsar"), - RABBITMQ(4, "RabbitMQ"), - REDIS(5, "Redis"); + STANDALONE(0, STORE_TYPE_STANDALONE), + ROCKETMQ(1, STORE_TYPE_ROCKETMQ), + ROCKETMQ_BROKER(11, STORE_SUBTYPE_ROCKETMQ_BROKER), + ROCKETMQ_NAMESERVER(12, STORE_SUBTYPE_ROCKETMQ_NAMESERVER), + KAFKA(2, STORE_TYPE_KAFKA), + PULSAR(3, STORE_TYPE_PULSAR), + RABBITMQ(4, STORE_TYPE_RABBITMQ), + REDIS(5, STORE_TYPE_REDIS); @Getter private final Integer number; @Getter private final String name; + + public static StoreType fromNumber(Integer number) { + for (StoreType storeType : StoreType.values()) { + if (storeType.getNumber().equals(number)) { + return storeType; + } + } + return null; + } + + public static StoreType fromName(String name) { + for (StoreType storeType : StoreType.values()) { + if (storeType.getName().equalsIgnoreCase(name)) { + return storeType; + } + } + return null; + } + + @Override + public String toString() { + return name; + } } diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/health/HealthCheckStatus.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/health/HealthCheckStatus.java index 17856f87..75423765 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/health/HealthCheckStatus.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/health/HealthCheckStatus.java @@ -26,7 +26,8 @@ public enum HealthCheckStatus { FAILED(0, "failed"), PASSED(1, "passed"), CHECKING(2, "checking"), - TIMEOUT(3, "timeout"); + TIMEOUT(3, "timeout"), + NOT_CONNECTED(4, "not connected"); private final Integer number; private final String name; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataServiceTypeEnum.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataServiceTypeEnum.java new file mode 100644 index 00000000..a810b0e4 --- /dev/null +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataServiceTypeEnum.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.common.enums.metadata; + +public enum MetadataServiceTypeEnum { + + RUNTIME, + + CENTER_ETCD, + + META_NACOS, + + TOPIC, + + CLUSTER, + + CLIENT, + + GROUP, + + CONNECTION, + + +} diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataTypeEnum.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataTypeEnum.java new file mode 100644 index 00000000..90a3e458 --- /dev/null +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataTypeEnum.java @@ -0,0 +1,37 @@ +/* + * 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.common.enums.metadata; + +public enum MetadataTypeEnum { + + CENTER, + + CLUSTER, + + RUNTIME, + + TOPIC, + + GROUP, + + SUBSCRIPTION, + + STORE + ; + +} diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClusterMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClusterMetadata.java index 432f9fe0..c65e27a8 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClusterMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClusterMetadata.java @@ -44,6 +44,9 @@ public class ClusterMetadata extends MetadataConfig { private Integer status; + /** + * @see StoreType + */ private StoreType storeType; private String description; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RuntimeMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RuntimeMetadata.java index 5bdab8f3..e8d1432a 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RuntimeMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RuntimeMetadata.java @@ -17,9 +17,15 @@ package org.apache.eventmesh.dashboard.common.model.metadata; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class RuntimeMetadata extends MetadataConfig { private String host; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/acl/CreateAclRequest.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/acl/CreateAclRequest.java index 2c2ae35c..08b80990 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/acl/CreateAclRequest.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/acl/CreateAclRequest.java @@ -18,5 +18,6 @@ package org.apache.eventmesh.dashboard.common.model.remoting.acl; public class CreateAclRequest { - + //acl is included in runtime config + private String runtimeAddress; } diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupsResponse.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupsResponse.java index 60968105..fbe90235 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupsResponse.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupsResponse.java @@ -22,5 +22,6 @@ import java.util.List; public class GetGroupsResponse { + private List groupList; } diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetRequest.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetRequest.java index cf77017e..f33d8a75 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetRequest.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetRequest.java @@ -29,7 +29,7 @@ public class ResetOffsetRequest { private String topic; - private String bootStrapServers; + private String bootstrapServers; private Integer partitionId; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeResponse.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeResponse.java index 27917ba9..783a78ab 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeResponse.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeResponse.java @@ -26,5 +26,5 @@ @Data public class GetRuntimeResponse { - private List runtimeMetadata; + private List runtimeMetadataList; } diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/subscription/GetSubscriptionResponse.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/subscription/GetSubscriptionResponse.java index 2c0a0660..853675f5 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/subscription/GetSubscriptionResponse.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/subscription/GetSubscriptionResponse.java @@ -18,12 +18,5 @@ package org.apache.eventmesh.dashboard.common.model.remoting.subscription; public class GetSubscriptionResponse { - // client name - private String clientName; - // group name - private String group; - - // config content - private String subscription; } diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml index 020bd9e0..02240a94 100644 --- a/eventmesh-dashboard-console/pom.xml +++ b/eventmesh-dashboard-console/pom.xml @@ -25,6 +25,11 @@ eventmesh-dashboard-common 0.0.1-SNAPSHOT + + org.apache.eventmesh.dashboard.core + eventmesh-dashboard-core + 0.0.1-SNAPSHOT + org.apache.eventmesh.dashboard.service eventmesh-dashboard-service @@ -79,29 +84,29 @@ runtime - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml index 64d6dff9..d3ea8101 100644 --- a/eventmesh-dashboard-core/pom.xml +++ b/eventmesh-dashboard-core/pom.xml @@ -21,8 +21,8 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.eventmesh.dashboard @@ -40,6 +40,12 @@ + + + org.springframework.boot + spring-boot-starter-web + + org.apache.eventmesh.dashboard.common @@ -52,11 +58,11 @@ 0.0.1-SNAPSHOT - + com.alibaba.nacos nacos-client - 2.2.4 + ${nacos.version} io.etcd @@ -64,12 +70,49 @@ 0.3.0 - + + + + + + + + + + + + + + + + + + + + + + + + io.lettuce + lettuce-core + + org.apache.rocketmq rocketmq-client - 4.9.7 + 4.9.4 + + + org.apache.rocketmq + rocketmq-tools + 5.2.0 + + + + org.apache.kafka + kafka-clients +