From 486b6f3df20515b80ef2ff4476829d21ea746b37 Mon Sep 17 00:00:00 2001 From: "lambert@arch" Date: Fri, 29 Mar 2024 15:38:29 +0800 Subject: [PATCH] chore: fix mistakes and several rename --- .../{DataStatus.java => RecordStatus.java} | 2 +- .../common/model/metadata/AclMetadata.java | 2 +- .../common/model/metadata/ClientMetadata.java | 7 ----- .../model/metadata/ClusterMetadata.java | 5 ---- .../model/metadata/ConnectionMetadata.java | 5 ---- .../common/model/metadata/GroupMetadata.java | 5 ---- .../common/model/metadata/MetadataConfig.java | 4 --- .../model/metadata/RegistryMetadata.java | 8 ++--- .../model/metadata/RuntimeMetadata.java | 7 ----- .../model/metadata/ServiceUserMetadata.java | 4 +++ .../common/model/metadata/TopicMetadata.java | 5 ---- .../remoting/config/GetConfigRequest.java | 2 +- .../remoting/config/GetConfigResponse.java | 2 +- .../model/remoting/group/GetGroupResult.java | 3 ++ .../remoting/offset/GetOffsetRequest.java | 6 ++-- .../remoting/offset/ResetOffsetRequest.java | 14 +++++---- .../remoting/offset/ResetOffsetResponse.java | 3 ++ .../remoting/offset/ResetOffsetResult.java | 6 +++- .../remoting/runtime/GetRuntimeRequest.java} | 21 ++++--------- .../remoting/runtime/GetRuntimeResponse.java | 30 +++++++++++++++++++ .../remoting/runtime/GetRuntimeResult.java} | 23 ++++---------- .../console/entity/client/ClientEntity.java | 6 ++-- .../entity/connection/ConnectionEntity.java | 4 +-- .../entity/connector/ConnectorEntity.java | 6 ++-- .../console/entity/meta/MetaEntity.java | 6 ++-- .../mapper/client/ClientMapperTest.java | 4 +-- 26 files changed, 86 insertions(+), 104 deletions(-) rename eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/{DataStatus.java => RecordStatus.java} (97%) rename eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/{enums/metadata/MetadataTypeEnum.java => model/remoting/runtime/GetRuntimeRequest.java} (80%) create mode 100644 eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeResponse.java rename eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/{enums/metadata/MetadataServiceTypeEnum.java => model/remoting/runtime/GetRuntimeResult.java} (77%) diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/DataStatus.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/RecordStatus.java similarity index 97% rename from eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/DataStatus.java rename to eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/RecordStatus.java index ac65cf9f..5ed81c75 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/DataStatus.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/RecordStatus.java @@ -22,7 +22,7 @@ @Getter @AllArgsConstructor -public enum DataStatus { +public enum RecordStatus { INACTIVE(0, "Inactive"), ACTIVE(1, "Active"); diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/AclMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/AclMetadata.java index 12446b14..8025b589 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/AclMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/AclMetadata.java @@ -20,7 +20,7 @@ import lombok.Data; @Data -public class AclMetadata { +public class AclMetadata extends MetadataConfig { private Long clusterId; private String principal; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClientMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClientMetadata.java index d9173217..9b2d1199 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClientMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ClientMetadata.java @@ -17,18 +17,11 @@ package org.apache.eventmesh.dashboard.common.model.metadata; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; - import lombok.Data; @Data public class ClientMetadata extends MetadataConfig { - - { - this.setServiceTypeEnums(MetadataServiceTypeEnum.CLIENT); - } - private String name; private String platform; 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 2648c188..432f9fe0 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 @@ -18,17 +18,12 @@ package org.apache.eventmesh.dashboard.common.model.metadata; import org.apache.eventmesh.dashboard.common.enums.StoreType; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; import lombok.Data; @Data public class ClusterMetadata extends MetadataConfig { - { - this.setServiceTypeEnums(MetadataServiceTypeEnum.CLUSTER); - } - private String clusterName; private String registryAddress; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ConnectionMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ConnectionMetadata.java index 2bc41419..7543f0bd 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ConnectionMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ConnectionMetadata.java @@ -17,8 +17,6 @@ package org.apache.eventmesh.dashboard.common.model.metadata; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; - import lombok.Data; /** @@ -28,9 +26,6 @@ @Data public class ConnectionMetadata extends MetadataConfig { - { - this.setServiceTypeEnums(MetadataServiceTypeEnum.CONNECTION); - } /** * The type of source. Possible values are "connector" or "client". diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/GroupMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/GroupMetadata.java index 2934f534..e3df7cf7 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/GroupMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/GroupMetadata.java @@ -17,15 +17,10 @@ package org.apache.eventmesh.dashboard.common.model.metadata; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; - import lombok.Data; @Data public class GroupMetadata extends MetadataConfig { - { - this.setServiceTypeEnums(MetadataServiceTypeEnum.GROUP); - } private String name; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/MetadataConfig.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/MetadataConfig.java index 0f47a398..2a8ee201 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/MetadataConfig.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/MetadataConfig.java @@ -17,8 +17,6 @@ package org.apache.eventmesh.dashboard.common.model.metadata; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; - import lombok.Data; /** @@ -29,8 +27,6 @@ @Data public class MetadataConfig { - private MetadataServiceTypeEnum serviceTypeEnums; - //center url private String registryAddress; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RegistryMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RegistryMetadata.java index c39e785d..56ea68a6 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RegistryMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/RegistryMetadata.java @@ -17,17 +17,13 @@ package org.apache.eventmesh.dashboard.common.model.metadata; -import org.apache.eventmesh.dashboard.common.enums.DataStatus; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; +import org.apache.eventmesh.dashboard.common.enums.RecordStatus; import lombok.Data; @Data public class RegistryMetadata extends MetadataConfig { - { - this.setServiceTypeEnums(MetadataServiceTypeEnum.META_NACOS); - } private String clusterName; @@ -50,7 +46,7 @@ public class RegistryMetadata extends MetadataConfig { /** * 0: not active, 1: active * - * @see DataStatus + * @see RecordStatus */ private Integer status; } 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 25579e20..5bdab8f3 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,18 +17,11 @@ package org.apache.eventmesh.dashboard.common.model.metadata; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; - import lombok.Data; @Data public class RuntimeMetadata extends MetadataConfig { - - { - this.setServiceTypeEnums(MetadataServiceTypeEnum.RUNTIME); - } - private String host; private Integer port; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ServiceUserMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ServiceUserMetadata.java index 15b02b02..1ea76c91 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ServiceUserMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/ServiceUserMetadata.java @@ -21,8 +21,12 @@ import lombok.Data; +/** + * Service users are users that are used by components like mysql, kafka, etc. + */ @Data public class ServiceUserMetadata { + private String userName; //service users are only store users by now private StoreType serviceType; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/TopicMetadata.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/TopicMetadata.java index 2cc78f96..829ed224 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/TopicMetadata.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/metadata/TopicMetadata.java @@ -18,17 +18,12 @@ package org.apache.eventmesh.dashboard.common.model.metadata; import org.apache.eventmesh.dashboard.common.enums.StoreType; -import org.apache.eventmesh.dashboard.common.enums.metadata.MetadataServiceTypeEnum; import lombok.Data; @Data public class TopicMetadata extends MetadataConfig { - { - this.setServiceTypeEnums(MetadataServiceTypeEnum.TOPIC); - } - private StoreType storeType; private String storeAddress; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigRequest.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigRequest.java index 0b2c4e56..a3298565 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigRequest.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigRequest.java @@ -29,7 +29,7 @@ public class GetConfigRequest { - private List registryAddress; + private List nameServerAddress; private List runtimeAddress; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigResponse.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigResponse.java index 34682f91..c96809a5 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigResponse.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/config/GetConfigResponse.java @@ -32,6 +32,6 @@ public class GetConfigResponse { - List configMetadataList; + private List configMetadataList; private Boolean success; } diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupResult.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupResult.java index a8d70b83..75552cd8 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupResult.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/group/GetGroupResult.java @@ -19,6 +19,9 @@ import java.util.concurrent.CompletableFuture; +import lombok.Data; + +@Data public class GetGroupResult { private CompletableFuture future; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/GetOffsetRequest.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/GetOffsetRequest.java index dc3b52f9..54ba5870 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/GetOffsetRequest.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/GetOffsetRequest.java @@ -18,12 +18,12 @@ package org.apache.eventmesh.dashboard.common.model.remoting.offset; -import org.apache.eventmesh.dashboard.common.model.metadata.GroupMetadata; - import lombok.Data; @Data public class GetOffsetRequest { - private GroupMetadata groupMetadata; + private String bootStrapServers; + + private String groupName; } 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 9e5f4a7a..cf77017e 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 @@ -18,22 +18,24 @@ package org.apache.eventmesh.dashboard.common.model.remoting.offset; -import org.apache.eventmesh.dashboard.common.model.metadata.GroupMetadata; - -import java.time.LocalDateTime; - import lombok.Data; @Data public class ResetOffsetRequest { - LocalDateTime timestamp; + Long timestamp; Long offset; + private String topic; + + private String bootStrapServers; + + private Integer partitionId; + ResetOffsetMode resetOffsetMode; - GroupMetadata groupMetadata; + private String groupName; public enum ResetOffsetMode { EARLIEST, diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResponse.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResponse.java index 5369703a..ed1417be 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResponse.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResponse.java @@ -17,6 +17,9 @@ package org.apache.eventmesh.dashboard.common.model.remoting.offset; +import lombok.Data; + +@Data public class ResetOffsetResponse { private Long offset; diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResult.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResult.java index 89c3b60f..3c1fb225 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResult.java +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/offset/ResetOffsetResult.java @@ -19,7 +19,11 @@ import java.util.concurrent.CompletableFuture; +import lombok.Data; + +@Data public class ResetOffsetResult { + private Boolean success; - private CompletableFuture resetOffsetResponseCompletableFuture; + private CompletableFuture future; } 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/model/remoting/runtime/GetRuntimeRequest.java similarity index 80% rename from eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataTypeEnum.java rename to eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeRequest.java index 90a3e458..4fb5c7de 100644 --- 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/model/remoting/runtime/GetRuntimeRequest.java @@ -15,23 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.common.enums.metadata; +package org.apache.eventmesh.dashboard.common.model.remoting.runtime; -public enum MetadataTypeEnum { +import lombok.Data; - CENTER, - - CLUSTER, - - RUNTIME, - - TOPIC, - - GROUP, - - SUBSCRIPTION, - - STORE - ; +@Data +public class GetRuntimeRequest { + private String registryAddress; } 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 new file mode 100644 index 00000000..27917ba9 --- /dev/null +++ b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeResponse.java @@ -0,0 +1,30 @@ +/* + * 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.model.remoting.runtime; + +import org.apache.eventmesh.dashboard.common.model.metadata.RuntimeMetadata; + +import java.util.List; + +import lombok.Data; + +@Data +public class GetRuntimeResponse { + + private List runtimeMetadata; +} 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/model/remoting/runtime/GetRuntimeResult.java similarity index 77% rename from eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/metadata/MetadataServiceTypeEnum.java rename to eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/model/remoting/runtime/GetRuntimeResult.java index a810b0e4..3fae063b 100644 --- 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/model/remoting/runtime/GetRuntimeResult.java @@ -15,25 +15,14 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.common.enums.metadata; +package org.apache.eventmesh.dashboard.common.model.remoting.runtime; -public enum MetadataServiceTypeEnum { +import java.util.concurrent.CompletableFuture; - RUNTIME, - - CENTER_ETCD, - - META_NACOS, - - TOPIC, - - CLUSTER, - - CLIENT, - - GROUP, - - CONNECTION, +import lombok.Data; +@Data +public class GetRuntimeResult { + private CompletableFuture future; } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/client/ClientEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/client/ClientEntity.java index cef62392..e6cec83c 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/client/ClientEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/client/ClientEntity.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.dashboard.console.entity.client; -import org.apache.eventmesh.dashboard.common.enums.DataStatus; +import org.apache.eventmesh.dashboard.common.enums.RecordStatus; import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity; import java.sql.Timestamp; @@ -69,7 +69,7 @@ public class ClientEntity extends BaseEntity { /** * 0: not active, 1: active - * @see DataStatus + * @see RecordStatus */ @Schema(name = "status", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:not active, 1:active") private Integer status; @@ -88,7 +88,7 @@ public class ClientEntity extends BaseEntity { */ private Timestamp endTime; - public void setStatusEntity(DataStatus status) { + public void setStatusEntity(RecordStatus status) { this.status = status.getNumber(); } } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java index db7c33ad..8283cbbb 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.dashboard.console.entity.connection; -import org.apache.eventmesh.dashboard.common.enums.DataStatus; +import org.apache.eventmesh.dashboard.common.enums.RecordStatus; import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity; import java.sql.Timestamp; @@ -83,7 +83,7 @@ public class ConnectionEntity extends BaseEntity { private String description; - public void setDataStatus(DataStatus dataStatus) { + public void setDataStatus(RecordStatus dataStatus) { this.status = dataStatus.getNumber(); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java index ec7bb018..7a5f6f29 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java @@ -17,8 +17,8 @@ package org.apache.eventmesh.dashboard.console.entity.connector; -import org.apache.eventmesh.dashboard.common.enums.DataStatus; import org.apache.eventmesh.dashboard.common.enums.KubernetesPodStatus; +import org.apache.eventmesh.dashboard.common.enums.RecordStatus; import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -45,7 +45,7 @@ public class ConnectorEntity extends BaseEntity { /** * 0: not active, 1: active * - * @see DataStatus + * @see RecordStatus */ @Schema(name = "status", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:inactive, 1:active") private Integer status; @@ -63,7 +63,7 @@ public class ConnectorEntity extends BaseEntity { */ private String configIds; - public void setDataStatus(DataStatus dataStatus) { + public void setDataStatus(RecordStatus dataStatus) { this.status = dataStatus.getNumber(); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/MetaEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/MetaEntity.java index a8456441..fb004425 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/MetaEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/MetaEntity.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.dashboard.console.entity.meta; -import org.apache.eventmesh.dashboard.common.enums.DataStatus; +import org.apache.eventmesh.dashboard.common.enums.RecordStatus; import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -54,12 +54,12 @@ public class MetaEntity extends BaseEntity { /** * 0: not active, 1: active * - * @see DataStatus + * @see RecordStatus */ @Schema(name = "status", defaultValue = "0", allowableValues = {"0", "1"}, description = "0:inactive, 1:active") private Integer status; - public void setDataStatus(DataStatus dataStatus) { + public void setDataStatus(RecordStatus dataStatus) { this.status = dataStatus.getNumber(); } } diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapperTest.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapperTest.java index 034202de..2905480f 100644 --- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapperTest.java +++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/client/ClientMapperTest.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.dashboard.console.mapper.client; -import org.apache.eventmesh.dashboard.common.enums.DataStatus; +import org.apache.eventmesh.dashboard.common.enums.RecordStatus; import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication; import org.apache.eventmesh.dashboard.console.entity.client.ClientEntity; @@ -70,7 +70,7 @@ public void testInsert() { clientEntity.setDescription(""); clientEntity.setPid(1L); clientEntity.setPort(8080); - clientEntity.setStatusEntity(DataStatus.ACTIVE); + clientEntity.setStatusEntity(RecordStatus.ACTIVE); clientEntity.setConfigIds(""); clientEntity.setLanguage("rust"); clientEntity.setPlatform("");