This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new d2531b2ba [ISSUE #4474] Uniformly manage duplicate static variables
(#4495)
d2531b2ba is described below
commit d2531b2ba7fc0d26415e3f7db236ebb7789943da
Author: VishalMCF <[email protected]>
AuthorDate: Fri Oct 20 06:29:57 2023 +0530
[ISSUE #4474] Uniformly manage duplicate static variables (#4495)
* 4474 -> moved common constants to appache-common
* shifted common static variables to a common Constants.java file in
eventmesh.common module
* removed unused constant from the file.
* refactored constants related to HTTP, GRPC, TCP in the relevant files
---
.../java/org/apache/eventmesh/common/Constants.java | 6 ++++++
.../eventmesh/common/config/CommonConfiguration.java | 5 +++--
.../common/utils/ConfigurationContextUtil.java | 8 ++++----
.../common/utils/ConfigurationContextUtilTest.java | 19 +++++++++++--------
.../client/CloudEventsPublishInstance.java | 5 +++--
.../org/apache/eventmesh/grpc/GrpcAbstractDemo.java | 5 +++--
.../apache/eventmesh/http/demo/HttpAbstractDemo.java | 5 +++--
.../http/demo/sub/controller/SubController.java | 5 +++--
.../eventmesh/tcp/common/EventMeshTestUtils.java | 6 +++---
.../meta/consul/service/ConsulMetaServiceTest.java | 4 +++-
.../registry/etcd/service/EtcdMetaServiceTest.java | 4 +++-
.../registry/nacos/service/NacosMetaServiceTest.java | 4 +++-
.../zookeeper/service/ZookeeperMetaServiceTest.java | 8 +++++---
.../prometheus/metrics/PrometheusGrpcExporter.java | 2 +-
.../prometheus/metrics/PrometheusHttpExporter.java | 2 +-
.../prometheus/metrics/PrometheusTcpExporter.java | 2 +-
.../prometheus/utils/PrometheusExporterConstants.java | 6 ------
.../apache/eventmesh/openconnect/SourceWorker.java | 5 +++--
.../runtime/boot/EventMeshGrpcBootstrap.java | 4 +++-
.../eventmesh/runtime/boot/EventMeshGrpcServer.java | 9 +++++----
.../eventmesh/runtime/boot/EventMeshHTTPServer.java | 9 +++++----
.../runtime/boot/EventMeshHttpBootstrap.java | 4 +++-
.../eventmesh/runtime/boot/EventMeshServer.java | 10 +++++++---
.../eventmesh/runtime/boot/EventMeshTCPServer.java | 9 +++++----
.../eventmesh/runtime/boot/EventMeshTcpBootstrap.java | 4 +++-
.../http/processor/inf/AbstractEventProcessor.java | 6 +++---
.../eventmesh/client/http/ProtocolConstant.java | 1 -
.../client/http/producer/CloudEventProducer.java | 2 +-
.../eventmesh/client/tcp/common/EventMeshCommon.java | 2 --
.../eventmesh/client/tcp/common/MessageUtils.java | 4 +++-
30 files changed, 97 insertions(+), 68 deletions(-)
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
index 41fe8dfa9..440e5b9a7 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
@@ -193,4 +193,10 @@ public class Constants {
* application/cloudevents+json Content-type
*/
public static final String CONTENT_TYPE_CLOUDEVENTS_JSON =
"application/cloudevents+json";
+
+ public static final String HTTP = "HTTP";
+
+ public static final String TCP = "TCP";
+
+ public static final String GRPC = "GRPC";
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
index f05a6d8cc..17f1c5b78 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
@@ -17,7 +17,8 @@
package org.apache.eventmesh.common.config;
-import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
+import static org.apache.eventmesh.common.Constants.HTTP;
+
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -118,7 +119,7 @@ public class CommonConfiguration {
}
if (CollectionUtils.isEmpty(eventMeshProvideServerProtocols)) {
- this.eventMeshProvideServerProtocols =
Collections.singletonList(ConfigurationContextUtil.HTTP);
+ this.eventMeshProvideServerProtocols =
Collections.singletonList(HTTP);
}
meshGroup = String.join("-", this.eventMeshEnv, this.eventMeshIDC,
this.eventMeshCluster, this.sysID);
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ConfigurationContextUtil.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ConfigurationContextUtil.java
index e04dbc39c..861788899 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ConfigurationContextUtil.java
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ConfigurationContextUtil.java
@@ -17,6 +17,10 @@
package org.apache.eventmesh.common.utils;
+import static org.apache.eventmesh.common.Constants.GRPC;
+import static org.apache.eventmesh.common.Constants.HTTP;
+import static org.apache.eventmesh.common.Constants.TCP;
+
import org.apache.eventmesh.common.config.CommonConfiguration;
import java.util.List;
@@ -32,10 +36,6 @@ public class ConfigurationContextUtil {
private static final ConcurrentHashMap<String, CommonConfiguration>
CONFIGURATION_MAP = new ConcurrentHashMap<>();
- public static final String HTTP = "HTTP";
- public static final String TCP = "TCP";
- public static final String GRPC = "GRPC";
-
public static final List<String> KEYS = Lists.newArrayList(HTTP, TCP,
GRPC);
/**
diff --git
a/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ConfigurationContextUtilTest.java
b/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ConfigurationContextUtilTest.java
index f60e92192..6ab7847d2 100644
---
a/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ConfigurationContextUtilTest.java
+++
b/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ConfigurationContextUtilTest.java
@@ -17,6 +17,9 @@
package org.apache.eventmesh.common.utils;
+import static org.apache.eventmesh.common.Constants.GRPC;
+import static org.apache.eventmesh.common.Constants.TCP;
+
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.junit.jupiter.api.Assertions;
@@ -31,21 +34,21 @@ public class ConfigurationContextUtilTest {
public void setUp() {
grpcConfig = new CommonConfiguration();
grpcConfig.setEventMeshName("grpc");
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.GRPC,
grpcConfig);
+ ConfigurationContextUtil.putIfAbsent(GRPC, grpcConfig);
}
@Test
public void testPutIfAbsent() {
CommonConfiguration tcpConfig = new CommonConfiguration();
tcpConfig.setEventMeshName("tpc");
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.TCP,
tcpConfig);
- CommonConfiguration get =
ConfigurationContextUtil.get(ConfigurationContextUtil.TCP);
+ ConfigurationContextUtil.putIfAbsent(TCP, tcpConfig);
+ CommonConfiguration get = ConfigurationContextUtil.get(TCP);
Assertions.assertNotNull(get);
Assertions.assertEquals(tcpConfig, get);
CommonConfiguration newGrpc = new CommonConfiguration();
newGrpc.setEventMeshName("newGrpc");
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.GRPC,
newGrpc);
- CommonConfiguration getGrpc =
ConfigurationContextUtil.get(ConfigurationContextUtil.GRPC);
+ ConfigurationContextUtil.putIfAbsent(GRPC, newGrpc);
+ CommonConfiguration getGrpc = ConfigurationContextUtil.get(GRPC);
Assertions.assertNotNull(getGrpc);
Assertions.assertEquals(grpcConfig, getGrpc);
Assertions.assertNotEquals(newGrpc, getGrpc);
@@ -53,17 +56,17 @@ public class ConfigurationContextUtilTest {
@Test
public void testGet() {
- CommonConfiguration result =
ConfigurationContextUtil.get(ConfigurationContextUtil.GRPC);
+ CommonConfiguration result = ConfigurationContextUtil.get(GRPC);
Assertions.assertNotNull(result);
Assertions.assertEquals(grpcConfig, result);
}
@Test
public void testClear() {
- CommonConfiguration result0 =
ConfigurationContextUtil.get(ConfigurationContextUtil.GRPC);
+ CommonConfiguration result0 = ConfigurationContextUtil.get(GRPC);
Assertions.assertNotNull(result0);
ConfigurationContextUtil.clear();
- CommonConfiguration result =
ConfigurationContextUtil.get(ConfigurationContextUtil.GRPC);
+ CommonConfiguration result = ConfigurationContextUtil.get(GRPC);
Assertions.assertNull(result);
}
}
diff --git
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CloudEventsPublishInstance.java
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CloudEventsPublishInstance.java
index 7465c24ef..578fd5339 100644
---
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CloudEventsPublishInstance.java
+++
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CloudEventsPublishInstance.java
@@ -17,9 +17,10 @@
package org.apache.eventmesh.connector.openfunction.client;
+import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME;
+
import org.apache.eventmesh.client.grpc.config.EventMeshGrpcClientConfig;
import org.apache.eventmesh.client.grpc.producer.EventMeshGrpcProducer;
-import org.apache.eventmesh.client.tcp.common.EventMeshCommon;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.common.utils.ThreadUtils;
@@ -80,7 +81,7 @@ public class CloudEventsPublishInstance {
.withSubject("TEST-TOPIC-FUNCTION")
.withSource(URI.create("/"))
.withDataContentType("application/cloudevents+json")
- .withType(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME)
+ .withType(CLOUD_EVENTS_PROTOCOL_NAME)
.withData(JsonUtils.toJSONString(content).getBytes(StandardCharsets.UTF_8))
.withExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL,
String.valueOf(4 * 1000))
.build();
diff --git
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/GrpcAbstractDemo.java
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/GrpcAbstractDemo.java
index 28e260b8d..dd3fe8cb0 100644
---
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/GrpcAbstractDemo.java
+++
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/GrpcAbstractDemo.java
@@ -17,8 +17,9 @@
package org.apache.eventmesh.grpc;
+import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME;
+
import org.apache.eventmesh.client.grpc.config.EventMeshGrpcClientConfig;
-import org.apache.eventmesh.client.tcp.common.EventMeshCommon;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.EventMeshMessage;
import org.apache.eventmesh.common.ExampleConstants;
@@ -59,7 +60,7 @@ public class GrpcAbstractDemo {
.withSubject(topic)
.withSource(URI.create("/"))
.withDataContentType(ExampleConstants.CLOUDEVENT_CONTENT_TYPE)
- .withType(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME)
+ .withType(CLOUD_EVENTS_PROTOCOL_NAME)
.withData(JsonUtils.toJSONString(content).getBytes(StandardCharsets.UTF_8))
.withExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL,
String.valueOf(4 * 1000))
.build();
diff --git
a/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/HttpAbstractDemo.java
b/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/HttpAbstractDemo.java
index d99a20730..7498afa97 100644
---
a/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/HttpAbstractDemo.java
+++
b/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/HttpAbstractDemo.java
@@ -17,8 +17,9 @@
package org.apache.eventmesh.http.demo;
+import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME;
+
import org.apache.eventmesh.client.http.conf.EventMeshHttpClientConfig;
-import org.apache.eventmesh.client.tcp.common.EventMeshCommon;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.EventMeshMessage;
import org.apache.eventmesh.common.ExampleConstants;
@@ -75,7 +76,7 @@ public class HttpAbstractDemo {
.withSubject(ExampleConstants.EVENTMESH_HTTP_ASYNC_TEST_TOPIC)
.withSource(URI.create("/"))
.withDataContentType(ExampleConstants.CLOUDEVENT_CONTENT_TYPE)
- .withType(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME)
+ .withType(CLOUD_EVENTS_PROTOCOL_NAME)
.withData(JsonUtils.toJSONString(content).getBytes(StandardCharsets.UTF_8))
.withExtension(Constants.EVENTMESH_MESSAGE_CONST_TTL,
String.valueOf(4_000))
.build();
diff --git
a/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/sub/controller/SubController.java
b/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/sub/controller/SubController.java
index d3117835a..8bb2bd495 100644
---
a/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/sub/controller/SubController.java
+++
b/eventmesh-examples/src/main/java/org/apache/eventmesh/http/demo/sub/controller/SubController.java
@@ -17,7 +17,8 @@
package org.apache.eventmesh.http.demo.sub.controller;
-import org.apache.eventmesh.client.tcp.common.EventMeshCommon;
+import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME;
+
import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.http.demo.sub.service.SubService;
@@ -59,7 +60,7 @@ public class SubController {
}
@SuppressWarnings("unchecked")
final Map<String, String> contentMap = JsonUtils.parseObject(content,
HashMap.class);
- if (StringUtils.equals(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME,
contentMap.get(ProtocolKey.PROTOCOL_TYPE))) {
+ if (StringUtils.equals(CLOUD_EVENTS_PROTOCOL_NAME,
contentMap.get(ProtocolKey.PROTOCOL_TYPE))) {
final EventFormat eventFormat =
EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
if (eventFormat != null) {
final CloudEvent event =
eventFormat.deserialize(content.getBytes(StandardCharsets.UTF_8));
diff --git
a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
index 98f26871a..e66fd6afb 100644
---
a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
+++
b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestUtils.java
@@ -17,9 +17,9 @@
package org.apache.eventmesh.tcp.common;
+import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME;
import static
org.apache.eventmesh.common.protocol.tcp.Command.RESPONSE_TO_SERVER;
-import org.apache.eventmesh.client.tcp.common.EventMeshCommon;
import org.apache.eventmesh.client.tcp.common.MessageUtils;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.ExampleConstants;
@@ -156,7 +156,7 @@ public class EventMeshTestUtils {
.withSubject(ExampleConstants.EVENTMESH_TCP_ASYNC_TEST_TOPIC)
.withSource(URI.create("/"))
.withDataContentType(ExampleConstants.CLOUDEVENT_CONTENT_TYPE)
- .withType(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME)
+ .withType(CLOUD_EVENTS_PROTOCOL_NAME)
.withData(Objects.requireNonNull(JsonUtils.toJSONString(content)).getBytes(StandardCharsets.UTF_8))
.withExtension(UtilsConstants.TTL, DEFAULT_TTL_MS)
.build();
@@ -171,7 +171,7 @@ public class EventMeshTestUtils {
.withSubject(ExampleConstants.EVENTMESH_TCP_SYNC_TEST_TOPIC)
.withSource(URI.create("/"))
.withDataContentType(ExampleConstants.CLOUDEVENT_CONTENT_TYPE)
- .withType(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME)
+ .withType(CLOUD_EVENTS_PROTOCOL_NAME)
.withData(Objects.requireNonNull(JsonUtils.toJSONString(content)).getBytes(StandardCharsets.UTF_8))
.withExtension(UtilsConstants.TTL, DEFAULT_TTL_MS)
.withExtension(UtilsConstants.MSG_TYPE, "persistent")
diff --git
a/eventmesh-meta/eventmesh-meta-consul/src/test/java/org/apache/eventmesh/meta/consul/service/ConsulMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-consul/src/test/java/org/apache/eventmesh/meta/consul/service/ConsulMetaServiceTest.java
index ce19ab396..86f7448d0 100644
---
a/eventmesh-meta/eventmesh-meta-consul/src/test/java/org/apache/eventmesh/meta/consul/service/ConsulMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-consul/src/test/java/org/apache/eventmesh/meta/consul/service/ConsulMetaServiceTest.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.meta.consul.service;
+import static org.apache.eventmesh.common.Constants.HTTP;
+
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.api.meta.dto.EventMeshDataInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
@@ -53,7 +55,7 @@ public class ConsulMetaServiceTest {
public void registryTest() {
consulMetaService = new ConsulMetaService();
CommonConfiguration configuration = new CommonConfiguration();
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.HTTP,
configuration);
+ ConfigurationContextUtil.putIfAbsent(HTTP, configuration);
configuration.setMetaStorageAddr("127.0.0.1:8500");
Mockito.when(eventMeshRegisterInfo.getEventMeshClusterName()).thenReturn("eventmesh");
Mockito.when(eventMeshRegisterInfo.getEventMeshName()).thenReturn("eventmesh");
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
index 95a917612..5efc60d05 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.registry.etcd.service;
+import static org.apache.eventmesh.common.Constants.HTTP;
+
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.api.meta.dto.EventMeshDataInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
@@ -51,7 +53,7 @@ public class EtcdMetaServiceTest {
etcdMetaService = new EtcdMetaService();
CommonConfiguration configuration = new CommonConfiguration();
configuration.setMetaStorageAddr("127.0.0.1:2379");
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.HTTP,
configuration);
+ ConfigurationContextUtil.putIfAbsent(HTTP, configuration);
//
Mockito.when(eventMeshRegisterInfo.getEventMeshClusterName()).thenReturn("eventmesh");
//
Mockito.when(eventMeshRegisterInfo.getEventMeshName()).thenReturn("eventmesh");
diff --git
a/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
index 4e95413a0..14be0578c 100644
---
a/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.registry.nacos.service;
+import static org.apache.eventmesh.common.Constants.HTTP;
+
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
@@ -55,7 +57,7 @@ public class NacosMetaServiceTest {
configuration.setMetaStorageAddr("127.0.0.1");
configuration.setEventMeshMetaStoragePluginPassword("nacos");
configuration.setEventMeshMetaStoragePluginUsername("nacos");
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.HTTP,
configuration);
+ ConfigurationContextUtil.putIfAbsent(HTTP, configuration);
Mockito.when(eventMeshRegisterInfo.getEventMeshClusterName()).thenReturn("eventmesh");
Mockito.when(eventMeshRegisterInfo.getEventMeshName()).thenReturn("eventmesh");
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
index 74fd72caa..12830ae23 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.registry.zookeeper.service;
+import static org.apache.eventmesh.common.Constants.HTTP;
+
import org.apache.eventmesh.api.meta.dto.EventMeshDataInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
@@ -66,10 +68,10 @@ public class ZookeeperMetaServiceTest {
CommonConfiguration configuration = new CommonConfiguration();
configuration.setMetaStorageAddr("127.0.0.1:1500");
configuration.setEventMeshName("eventmesh");
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.HTTP,
configuration);
+ ConfigurationContextUtil.putIfAbsent(HTTP, configuration);
Mockito.when(eventMeshRegisterInfo.getEventMeshClusterName()).thenReturn("eventmeshCluster");
-
Mockito.when(eventMeshRegisterInfo.getEventMeshName()).thenReturn("eventmesh-"
+ ConfigurationContextUtil.HTTP);
+
Mockito.when(eventMeshRegisterInfo.getEventMeshName()).thenReturn("eventmesh-"
+ HTTP);
Mockito.when(eventMeshRegisterInfo.getEndPoint()).thenReturn("127.0.0.1:8848");
Mockito.when(eventMeshRegisterInfo.getEventMeshInstanceNumMap()).thenReturn(Maps.newHashMap());
HashMap<String, String> metaData = Maps.newHashMap();
@@ -77,7 +79,7 @@ public class ZookeeperMetaServiceTest {
Mockito.when(eventMeshRegisterInfo.getMetadata()).thenReturn(metaData);
Mockito.when(eventMeshUnRegisterInfo.getEventMeshClusterName()).thenReturn("eventmeshCluster");
-
Mockito.when(eventMeshUnRegisterInfo.getEventMeshName()).thenReturn("eventmesh-"
+ ConfigurationContextUtil.HTTP);
+
Mockito.when(eventMeshUnRegisterInfo.getEventMeshName()).thenReturn("eventmesh-"
+ HTTP);
Mockito.when(eventMeshUnRegisterInfo.getEndPoint()).thenReturn("127.0.0.1:8848");
}
diff --git
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusGrpcExporter.java
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusGrpcExporter.java
index 5a0e3341b..c4500de05 100644
---
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusGrpcExporter.java
+++
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusGrpcExporter.java
@@ -17,7 +17,7 @@
package org.apache.eventmesh.metrics.prometheus.metrics;
-import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterConstants.GRPC;
+import static org.apache.eventmesh.common.Constants.GRPC;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterConstants.METRICS_GRPC_PREFIX;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterUtils.join;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterUtils.observeOfValue;
diff --git
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusHttpExporter.java
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusHttpExporter.java
index 269a50f43..d8b5181f0 100644
---
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusHttpExporter.java
+++
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusHttpExporter.java
@@ -17,7 +17,7 @@
package org.apache.eventmesh.metrics.prometheus.metrics;
-import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterConstants.HTTP;
+import static org.apache.eventmesh.common.Constants.HTTP;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterUtils.join;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterUtils.observeOfValue;
diff --git
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusTcpExporter.java
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusTcpExporter.java
index e39190f66..e468552e0 100644
---
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusTcpExporter.java
+++
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/metrics/PrometheusTcpExporter.java
@@ -17,8 +17,8 @@
package org.apache.eventmesh.metrics.prometheus.metrics;
+import static org.apache.eventmesh.common.Constants.TCP;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterConstants.METRICS_TCP_PREFIX;
-import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterConstants.TCP;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterUtils.join;
import static
org.apache.eventmesh.metrics.prometheus.utils.PrometheusExporterUtils.observeOfValue;
diff --git
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/utils/PrometheusExporterConstants.java
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/utils/PrometheusExporterConstants.java
index d1b970569..9da69e2b7 100644
---
a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/utils/PrometheusExporterConstants.java
+++
b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/main/java/org/apache/eventmesh/metrics/prometheus/utils/PrometheusExporterConstants.java
@@ -22,12 +22,6 @@ package org.apache.eventmesh.metrics.prometheus.utils;
*/
public class PrometheusExporterConstants {
- public static final String HTTP = "HTTP";
-
- public static final String GRPC = "GRPC";
-
- public static final String TCP = "TCP";
-
public static final String METRICS_GRPC_PREFIX = "eventmesh.grpc.";
public static final String METRICS_TCP_PREFIX = "eventmesh.tcp.";
diff --git
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/SourceWorker.java
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/SourceWorker.java
index 12d3a62f4..3371f599a 100644
---
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/SourceWorker.java
+++
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/SourceWorker.java
@@ -17,9 +17,10 @@
package org.apache.eventmesh.openconnect;
+import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME;
+
import org.apache.eventmesh.client.tcp.EventMeshTCPClient;
import org.apache.eventmesh.client.tcp.EventMeshTCPClientFactory;
-import org.apache.eventmesh.client.tcp.common.EventMeshCommon;
import org.apache.eventmesh.client.tcp.common.MessageUtils;
import org.apache.eventmesh.client.tcp.conf.EventMeshTCPClientConfig;
import org.apache.eventmesh.common.protocol.tcp.Package;
@@ -230,7 +231,7 @@ public class SourceWorker implements ConnectorWorker {
.withSubject(config.getPubSubConfig().getSubject())
.withSource(URI.create("/"))
.withDataContentType("application/cloudevents+json")
- .withType(EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME)
+ .withType(CLOUD_EVENTS_PROTOCOL_NAME)
.withData(Objects.requireNonNull(JsonUtils.toJSONString(connectRecord.getData())).getBytes(StandardCharsets.UTF_8))
.withExtension("ttl", 10000)
.build();
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcBootstrap.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcBootstrap.java
index 66cfa2a17..dc218084b 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcBootstrap.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcBootstrap.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.runtime.boot;
+import static org.apache.eventmesh.common.Constants.GRPC;
+
import org.apache.eventmesh.common.config.ConfigService;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.runtime.configuration.EventMeshGrpcConfiguration;
@@ -34,7 +36,7 @@ public class EventMeshGrpcBootstrap implements
EventMeshBootstrap {
ConfigService configService = ConfigService.getInstance();
this.eventMeshGrpcConfiguration =
configService.buildConfigInstance(EventMeshGrpcConfiguration.class);
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.GRPC,
eventMeshGrpcConfiguration);
+ ConfigurationContextUtil.putIfAbsent(GRPC, eventMeshGrpcConfiguration);
}
@Override
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java
index 5cc63f367..41260322f 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java
@@ -17,11 +17,12 @@
package org.apache.eventmesh.runtime.boot;
+import static org.apache.eventmesh.common.Constants.GRPC;
+
import org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.exception.EventMeshException;
-import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.metrics.api.MetricsPluginFactory;
import org.apache.eventmesh.metrics.api.MetricsRegistry;
@@ -178,9 +179,9 @@ public class EventMeshGrpcServer {
EventMeshRegisterInfo eventMeshRegisterInfo = new
EventMeshRegisterInfo();
eventMeshRegisterInfo.setEventMeshClusterName(eventMeshGrpcConfiguration.getEventMeshCluster());
eventMeshRegisterInfo.setEventMeshName(eventMeshGrpcConfiguration.getEventMeshName()
+ "-"
- + ConfigurationContextUtil.GRPC);
+ + GRPC);
eventMeshRegisterInfo.setEndPoint(endPoints);
-
eventMeshRegisterInfo.setProtocolType(ConfigurationContextUtil.GRPC);
+ eventMeshRegisterInfo.setProtocolType(GRPC);
registerResult = metaStorage.register(eventMeshRegisterInfo);
} catch (Exception e) {
log.warn("eventMesh register to registry failed", e);
@@ -196,7 +197,7 @@ public class EventMeshGrpcServer {
eventMeshUnRegisterInfo.setEventMeshClusterName(eventMeshGrpcConfiguration.getEventMeshCluster());
eventMeshUnRegisterInfo.setEventMeshName(eventMeshGrpcConfiguration.getEventMeshName());
eventMeshUnRegisterInfo.setEndPoint(endPoints);
- eventMeshUnRegisterInfo.setProtocolType(ConfigurationContextUtil.GRPC);
+ eventMeshUnRegisterInfo.setProtocolType(GRPC);
boolean registerResult =
metaStorage.unRegister(eventMeshUnRegisterInfo);
if (!registerResult) {
throw new EventMeshException("eventMesh fail to unRegister");
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
index 3b9149843..6cd52d6b2 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
@@ -17,11 +17,12 @@
package org.apache.eventmesh.runtime.boot;
+import static org.apache.eventmesh.common.Constants.HTTP;
+
import org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.exception.EventMeshException;
import org.apache.eventmesh.common.protocol.http.common.RequestCode;
-import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.metrics.api.MetricsPluginFactory;
import org.apache.eventmesh.metrics.api.MetricsRegistry;
@@ -202,9 +203,9 @@ public class EventMeshHTTPServer extends AbstractHTTPServer
{
final EventMeshRegisterInfo eventMeshRegisterInfo = new
EventMeshRegisterInfo();
eventMeshRegisterInfo.setEventMeshClusterName(eventMeshHttpConfiguration.getEventMeshCluster());
eventMeshRegisterInfo.setEventMeshName(eventMeshHttpConfiguration.getEventMeshName()
- + "-" + ConfigurationContextUtil.HTTP);
+ + "-" + HTTP);
eventMeshRegisterInfo.setEndPoint(endPoints);
-
eventMeshRegisterInfo.setProtocolType(ConfigurationContextUtil.HTTP);
+ eventMeshRegisterInfo.setProtocolType(HTTP);
registerResult = metaStorage.register(eventMeshRegisterInfo);
} catch (Exception e) {
log.error("eventMesh register to registry failed", e);
@@ -223,7 +224,7 @@ public class EventMeshHTTPServer extends AbstractHTTPServer
{
eventMeshUnRegisterInfo.setEventMeshClusterName(eventMeshHttpConfiguration.getEventMeshCluster());
eventMeshUnRegisterInfo.setEventMeshName(eventMeshHttpConfiguration.getEventMeshName());
eventMeshUnRegisterInfo.setEndPoint(endPoints);
- eventMeshUnRegisterInfo.setProtocolType(ConfigurationContextUtil.HTTP);
+ eventMeshUnRegisterInfo.setProtocolType(HTTP);
final boolean registerResult =
metaStorage.unRegister(eventMeshUnRegisterInfo);
if (!registerResult) {
throw new EventMeshException("eventMesh fail to unRegister");
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHttpBootstrap.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHttpBootstrap.java
index f63475921..87ce3c23a 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHttpBootstrap.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHttpBootstrap.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.runtime.boot;
+import static org.apache.eventmesh.common.Constants.HTTP;
+
import org.apache.eventmesh.common.config.ConfigService;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
@@ -35,7 +37,7 @@ public class EventMeshHttpBootstrap implements
EventMeshBootstrap {
ConfigService configService = ConfigService.getInstance();
this.eventMeshHttpConfiguration =
configService.buildConfigInstance(EventMeshHTTPConfiguration.class);
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.HTTP,
eventMeshHttpConfiguration);
+ ConfigurationContextUtil.putIfAbsent(HTTP, eventMeshHttpConfiguration);
}
@Override
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
index 155b21255..832cc75c8 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
@@ -17,6 +17,10 @@
package org.apache.eventmesh.runtime.boot;
+import static org.apache.eventmesh.common.Constants.GRPC;
+import static org.apache.eventmesh.common.Constants.HTTP;
+import static org.apache.eventmesh.common.Constants.TCP;
+
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.config.ConfigService;
import org.apache.eventmesh.common.utils.AssertUtils;
@@ -77,13 +81,13 @@ public class EventMeshServer {
final List<String> provideServerProtocols =
configuration.getEventMeshProvideServerProtocols();
for (String provideServerProtocol : provideServerProtocols) {
switch (provideServerProtocol.toUpperCase()) {
- case ConfigurationContextUtil.HTTP:
+ case HTTP:
BOOTSTRAP_LIST.add(new EventMeshHttpBootstrap(this));
break;
- case ConfigurationContextUtil.TCP:
+ case TCP:
BOOTSTRAP_LIST.add(new EventMeshTcpBootstrap(this));
break;
- case ConfigurationContextUtil.GRPC:
+ case GRPC:
BOOTSTRAP_LIST.add(new EventMeshGrpcBootstrap(this));
break;
default:
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
index cba5b06c3..5aaf1c5c7 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
@@ -17,11 +17,12 @@
package org.apache.eventmesh.runtime.boot;
+import static org.apache.eventmesh.common.Constants.TCP;
+
import org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.exception.EventMeshException;
import org.apache.eventmesh.common.protocol.tcp.Command;
-import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.common.utils.ThreadUtils;
import org.apache.eventmesh.metrics.api.MetricsPluginFactory;
@@ -177,10 +178,10 @@ public class EventMeshTCPServer extends AbstractTCPServer
{
+ EventMeshConstants.IP_PORT_SEPARATOR +
eventMeshTCPConfiguration.getEventMeshTcpServerPort();
EventMeshRegisterInfo eventMeshRegisterInfo = new
EventMeshRegisterInfo();
eventMeshRegisterInfo.setEventMeshClusterName(eventMeshTCPConfiguration.getEventMeshCluster());
-
eventMeshRegisterInfo.setEventMeshName(eventMeshTCPConfiguration.getEventMeshName()
+ "-" + ConfigurationContextUtil.TCP);
+
eventMeshRegisterInfo.setEventMeshName(eventMeshTCPConfiguration.getEventMeshName()
+ "-" + TCP);
eventMeshRegisterInfo.setEndPoint(endPoints);
eventMeshRegisterInfo.setEventMeshInstanceNumMap(clientSessionGroupMapping.prepareProxyClientDistributionData());
-
eventMeshRegisterInfo.setProtocolType(ConfigurationContextUtil.TCP);
+ eventMeshRegisterInfo.setProtocolType(TCP);
registerResult = metaStorage.register(eventMeshRegisterInfo);
} catch (Exception e) {
log.error("eventMesh register to registry failed", e);
@@ -198,7 +199,7 @@ public class EventMeshTCPServer extends AbstractTCPServer {
eventMeshUnRegisterInfo.setEventMeshClusterName(eventMeshTCPConfiguration.getEventMeshCluster());
eventMeshUnRegisterInfo.setEventMeshName(eventMeshTCPConfiguration.getEventMeshName());
eventMeshUnRegisterInfo.setEndPoint(endPoints);
- eventMeshUnRegisterInfo.setProtocolType(ConfigurationContextUtil.TCP);
+ eventMeshUnRegisterInfo.setProtocolType(TCP);
boolean registerResult =
metaStorage.unRegister(eventMeshUnRegisterInfo);
if (!registerResult) {
throw new EventMeshException("eventMesh fail to unRegister");
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTcpBootstrap.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTcpBootstrap.java
index b9514aed8..9cd665d28 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTcpBootstrap.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTcpBootstrap.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.runtime.boot;
+import static org.apache.eventmesh.common.Constants.TCP;
+
import org.apache.eventmesh.common.config.ConfigService;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
@@ -35,7 +37,7 @@ public class EventMeshTcpBootstrap implements
EventMeshBootstrap {
ConfigService configService = ConfigService.getInstance();
this.eventMeshTcpConfiguration =
configService.buildConfigInstance(EventMeshTCPConfiguration.class);
- ConfigurationContextUtil.putIfAbsent(ConfigurationContextUtil.TCP,
eventMeshTcpConfiguration);
+ ConfigurationContextUtil.putIfAbsent(TCP, eventMeshTcpConfiguration);
}
@Override
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
index 5c2a54f1e..02d6933f1 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.core.protocol.http.processor.inf;
+import static org.apache.eventmesh.common.Constants.HTTP;
import static
org.apache.eventmesh.runtime.constants.EventMeshConstants.CONTENT_TYPE;
import org.apache.eventmesh.api.meta.dto.EventMeshDataInfo;
@@ -26,7 +27,6 @@ import org.apache.eventmesh.common.protocol.SubscriptionItem;
import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
import org.apache.eventmesh.common.utils.AssertUtils;
-import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.common.utils.ThreadUtils;
@@ -82,8 +82,8 @@ public abstract class AbstractEventProcessor implements
AsyncHttpProcessor {
MetaStorage metaStorage = eventMeshHTTPServer.getMetaStorage();
List<EventMeshDataInfo> allEventMeshInfo =
metaStorage.findAllEventMeshInfo();
String httpServiceName =
- ConfigurationContextUtil.HTTP + "-" + NacosConstant.GROUP + "@@" +
httpConfiguration.getEventMeshName()
- + "-" + ConfigurationContextUtil.HTTP;
+ HTTP + "-" + NacosConstant.GROUP + "@@" +
httpConfiguration.getEventMeshName()
+ + "-" + HTTP;
for (EventMeshDataInfo eventMeshDataInfo : allEventMeshInfo) {
if (!eventMeshDataInfo.getEventMeshName().equals(httpServiceName))
{
continue;
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ProtocolConstant.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ProtocolConstant.java
index f7f217bbb..1ea894a18 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ProtocolConstant.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ProtocolConstant.java
@@ -19,7 +19,6 @@ package org.apache.eventmesh.client.http;
public final class ProtocolConstant {
- public static final String CE_PROTOCOL = "cloudevents";
public static final String EM_MESSAGE_PROTOCOL = "eventmeshmessage";
public static final String OP_MESSAGE_PROTOCOL = "openmessage";
public static final String PROTOCOL_DESC = "http";
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/CloudEventProducer.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/CloudEventProducer.java
index 0c73d05aa..27ab2896a 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/CloudEventProducer.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/CloudEventProducer.java
@@ -90,7 +90,7 @@ class CloudEventProducer extends
AbstractProducerHttpClient<CloudEvent> {
.addHeader(ProtocolKey.ClientInstanceKey.USERNAME.getKey(),
eventMeshHttpClientConfig.getUserName())
.addHeader(ProtocolKey.ClientInstanceKey.PASSWD.getKey(),
eventMeshHttpClientConfig.getPassword())
.addHeader(ProtocolKey.LANGUAGE, Constants.LANGUAGE_JAVA)
- .addHeader(ProtocolKey.PROTOCOL_TYPE, ProtocolConstant.CE_PROTOCOL)
+ .addHeader(ProtocolKey.PROTOCOL_TYPE,
Constants.CLOUD_EVENTS_PROTOCOL_NAME)
.addHeader(ProtocolKey.PROTOCOL_DESC,
ProtocolConstant.PROTOCOL_DESC)
.addHeader(ProtocolKey.PROTOCOL_VERSION,
cloudEvent.getSpecVersion().toString())
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java
index 606b24cfe..902a13522 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java
@@ -39,8 +39,6 @@ public class EventMeshCommon {
*/
public static final String USER_AGENT_PURPOSE_SUB = "sub";
- // protocol type
- public static final String CLOUD_EVENTS_PROTOCOL_NAME = "cloudevents";
public static final String EM_MESSAGE_PROTOCOL_NAME = "eventmeshmessage";
public static final String OPEN_MESSAGE_PROTOCOL_NAME = "openmessage";
}
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
index d90780ed5..2232e539c 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/MessageUtils.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.client.tcp.common;
+import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME;
+
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.protocol.SubscriptionItem;
import org.apache.eventmesh.common.protocol.SubscriptionMode;
@@ -82,7 +84,7 @@ public class MessageUtils {
if (message instanceof CloudEvent) {
final CloudEvent cloudEvent = (CloudEvent) message;
Preconditions.checkNotNull(cloudEvent.getDataContentType(),
"DateContentType cannot be null");
- msg.getHeader().putProperty(Constants.PROTOCOL_TYPE,
EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME);
+ msg.getHeader().putProperty(Constants.PROTOCOL_TYPE,
CLOUD_EVENTS_PROTOCOL_NAME);
msg.getHeader().putProperty(Constants.PROTOCOL_VERSION,
cloudEvent.getSpecVersion().toString());
msg.getHeader().putProperty(Constants.PROTOCOL_DESC, "tcp");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
