From 82fcee1f7cf8e46bc7735cb7d061824ac3e7d3c8 Mon Sep 17 00:00:00 2001 From: scwlkq Date: Fri, 2 Feb 2024 00:58:40 +0800 Subject: [PATCH 1/3] move EventMeshCommon class to common module --- .../java/org/apache/eventmesh}/common/EventMeshCommon.java | 2 +- .../grpc/pub/cloudevents/CloudEventsRequestInstance.java | 2 +- .../grpc/pub/eventmeshmessage/RequestReplyInstance.java | 2 +- .../eventmesh/tcp/demo/pub/cloudevents/AsyncPublish.java | 2 +- .../eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java | 2 +- .../tcp/demo/pub/eventmeshmessage/AsyncPublish.java | 2 +- .../demo/pub/eventmeshmessage/AsyncPublishBroadcast.java | 2 +- .../tcp/demo/pub/eventmeshmessage/SyncRequest.java | 2 +- .../client/grpc/consumer/EventMeshGrpcConsumer.java | 2 +- .../client/grpc/producer/EventMeshGrpcProducer.java | 2 +- .../client/http/consumer/EventMeshHttpConsumer.java | 6 ++---- .../apache/eventmesh/client/tcp/common/MessageUtils.java | 1 + .../org/apache/eventmesh/client/tcp/common/TcpClient.java | 1 + .../client/tcp/impl/cloudevent/CloudEventTCPSubClient.java | 2 +- .../impl/eventmeshmessage/EventMeshMessageTCPSubClient.java | 2 +- .../eventmesh/client/tcp/common/MessageUtilsTest.java | 1 + 16 files changed, 17 insertions(+), 16 deletions(-) rename {eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp => eventmesh-common/src/main/java/org/apache/eventmesh}/common/EventMeshCommon.java (96%) diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java similarity index 96% rename from eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java index 902a135221..5f49115c9f 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.client.tcp.common; +package org.apache.eventmesh.common; public class EventMeshCommon { diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java index 8e0be97bb3..ba32ae4e99 100644 --- a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java +++ b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java @@ -18,7 +18,7 @@ package org.apache.eventmesh.grpc.pub.cloudevents; import org.apache.eventmesh.client.grpc.producer.EventMeshGrpcProducer; -import org.apache.eventmesh.client.tcp.common.EventMeshCommon; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.ExampleConstants; import org.apache.eventmesh.common.utils.ThreadUtils; import org.apache.eventmesh.grpc.GrpcAbstractDemo; diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java index b49b584d5a..ef0e61e868 100644 --- a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java +++ b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java @@ -18,7 +18,7 @@ package org.apache.eventmesh.grpc.pub.eventmeshmessage; import org.apache.eventmesh.client.grpc.producer.EventMeshGrpcProducer; -import org.apache.eventmesh.client.tcp.common.EventMeshCommon; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.ExampleConstants; import org.apache.eventmesh.common.utils.ThreadUtils; import org.apache.eventmesh.grpc.GrpcAbstractDemo; diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/AsyncPublish.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/AsyncPublish.java index 666e2e3730..ee2603c6f9 100644 --- a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/AsyncPublish.java +++ b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/AsyncPublish.java @@ -19,8 +19,8 @@ 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.conf.EventMeshTCPClientConfig; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.ExampleConstants; import org.apache.eventmesh.common.protocol.tcp.UserAgent; import org.apache.eventmesh.common.utils.ThreadUtils; diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java index 4be5e2569d..5df2bf29fb 100644 --- a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java +++ b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java @@ -19,8 +19,8 @@ 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.conf.EventMeshTCPClientConfig; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.ExampleConstants; import org.apache.eventmesh.common.protocol.tcp.Package; import org.apache.eventmesh.common.protocol.tcp.UserAgent; diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublish.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublish.java index 222fbb7cd9..331ae947eb 100644 --- a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublish.java +++ b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublish.java @@ -19,8 +19,8 @@ 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.conf.EventMeshTCPClientConfig; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.ExampleConstants; import org.apache.eventmesh.common.protocol.tcp.EventMeshMessage; import org.apache.eventmesh.common.protocol.tcp.UserAgent; diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublishBroadcast.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublishBroadcast.java index 94a5a27b88..01093d0ee6 100644 --- a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublishBroadcast.java +++ b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/AsyncPublishBroadcast.java @@ -19,8 +19,8 @@ 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.conf.EventMeshTCPClientConfig; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.ExampleConstants; import org.apache.eventmesh.common.protocol.tcp.EventMeshMessage; import org.apache.eventmesh.common.protocol.tcp.UserAgent; diff --git a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/SyncRequest.java b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/SyncRequest.java index ed303e8d3e..6b0ab470c6 100644 --- a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/SyncRequest.java +++ b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/eventmeshmessage/SyncRequest.java @@ -19,8 +19,8 @@ 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.conf.EventMeshTCPClientConfig; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.ExampleConstants; import org.apache.eventmesh.common.protocol.tcp.EventMeshMessage; import org.apache.eventmesh.common.protocol.tcp.Package; diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumer.java b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumer.java index 6ceefbe762..6943968f6d 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumer.java +++ b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumer.java @@ -22,7 +22,7 @@ import org.apache.eventmesh.client.grpc.config.EventMeshGrpcClientConfig; import org.apache.eventmesh.client.grpc.util.EventMeshCloudEventBuilder; -import org.apache.eventmesh.client.tcp.common.EventMeshCommon; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.EventMeshThreadFactory; import org.apache.eventmesh.common.enums.EventMeshDataContentType; import org.apache.eventmesh.common.enums.EventMeshProtocolType; diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java index 5003ed9489..db700276be 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java +++ b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java @@ -18,7 +18,7 @@ package org.apache.eventmesh.client.grpc.producer; import org.apache.eventmesh.client.grpc.config.EventMeshGrpcClientConfig; -import org.apache.eventmesh.client.tcp.common.EventMeshCommon; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.EventMeshMessage; import org.apache.eventmesh.common.protocol.grpc.cloudevents.PublisherServiceGrpc; import org.apache.eventmesh.common.protocol.grpc.cloudevents.PublisherServiceGrpc.PublisherServiceBlockingStub; diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java index 6e9b94bec7..41fff08c3d 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java +++ b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/EventMeshHttpConsumer.java @@ -22,8 +22,8 @@ import org.apache.eventmesh.client.http.conf.EventMeshHttpClientConfig; import org.apache.eventmesh.client.http.model.RequestParam; import org.apache.eventmesh.client.http.util.HttpUtils; -import org.apache.eventmesh.client.tcp.common.EventMeshCommon; import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.EventMeshThreadFactory; import org.apache.eventmesh.common.ThreadPoolFactory; import org.apache.eventmesh.common.exception.EventMeshException; @@ -55,10 +55,8 @@ @Slf4j public class EventMeshHttpConsumer extends AbstractHttpClient implements AutoCloseable { - private final transient ThreadPoolExecutor consumeExecutor; - private static final List SUBSCRIPTIONS = Collections.synchronizedList(new ArrayList<>()); - + private final transient ThreadPoolExecutor consumeExecutor; private final transient ScheduledThreadPoolExecutor scheduler; public EventMeshHttpConsumer(final EventMeshHttpClientConfig eventMeshHttpClientConfig) throws EventMeshException { 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 2232e539c9..07e9134425 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 @@ -20,6 +20,7 @@ import static org.apache.eventmesh.common.Constants.CLOUD_EVENTS_PROTOCOL_NAME; import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.protocol.SubscriptionItem; import org.apache.eventmesh.common.protocol.SubscriptionMode; import org.apache.eventmesh.common.protocol.SubscriptionType; diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/TcpClient.java b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/TcpClient.java index 4619f550e7..820dbd314c 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/TcpClient.java +++ b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/TcpClient.java @@ -18,6 +18,7 @@ package org.apache.eventmesh.client.tcp.common; import org.apache.eventmesh.client.tcp.conf.EventMeshTCPClientConfig; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.EventMeshThreadFactory; import org.apache.eventmesh.common.ThreadPoolFactory; import org.apache.eventmesh.common.protocol.tcp.Package; diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/cloudevent/CloudEventTCPSubClient.java b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/cloudevent/CloudEventTCPSubClient.java index 836ad00dc5..221b12f6b3 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/cloudevent/CloudEventTCPSubClient.java +++ b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/cloudevent/CloudEventTCPSubClient.java @@ -18,13 +18,13 @@ package org.apache.eventmesh.client.tcp.impl.cloudevent; import org.apache.eventmesh.client.tcp.EventMeshTCPSubClient; -import org.apache.eventmesh.client.tcp.common.EventMeshCommon; import org.apache.eventmesh.client.tcp.common.MessageUtils; import org.apache.eventmesh.client.tcp.common.ReceiveMsgHook; import org.apache.eventmesh.client.tcp.common.RequestContext; import org.apache.eventmesh.client.tcp.common.TcpClient; import org.apache.eventmesh.client.tcp.conf.EventMeshTCPClientConfig; import org.apache.eventmesh.client.tcp.impl.AbstractEventMeshTCPSubHandler; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.exception.EventMeshException; import org.apache.eventmesh.common.protocol.SubscriptionItem; import org.apache.eventmesh.common.protocol.SubscriptionMode; diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/eventmeshmessage/EventMeshMessageTCPSubClient.java b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/eventmeshmessage/EventMeshMessageTCPSubClient.java index 7216597d7d..55554f525d 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/eventmeshmessage/EventMeshMessageTCPSubClient.java +++ b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/eventmeshmessage/EventMeshMessageTCPSubClient.java @@ -18,13 +18,13 @@ package org.apache.eventmesh.client.tcp.impl.eventmeshmessage; import org.apache.eventmesh.client.tcp.EventMeshTCPSubClient; -import org.apache.eventmesh.client.tcp.common.EventMeshCommon; import org.apache.eventmesh.client.tcp.common.MessageUtils; import org.apache.eventmesh.client.tcp.common.ReceiveMsgHook; import org.apache.eventmesh.client.tcp.common.RequestContext; import org.apache.eventmesh.client.tcp.common.TcpClient; import org.apache.eventmesh.client.tcp.conf.EventMeshTCPClientConfig; import org.apache.eventmesh.client.tcp.impl.AbstractEventMeshTCPSubHandler; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.exception.EventMeshException; import org.apache.eventmesh.common.protocol.SubscriptionItem; import org.apache.eventmesh.common.protocol.SubscriptionMode; diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/common/MessageUtilsTest.java b/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/common/MessageUtilsTest.java index 4916cf5612..96025be305 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/common/MessageUtilsTest.java +++ b/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/common/MessageUtilsTest.java @@ -18,6 +18,7 @@ package org.apache.eventmesh.client.tcp.common; import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.EventMeshCommon; import org.apache.eventmesh.common.protocol.SubscriptionMode; import org.apache.eventmesh.common.protocol.SubscriptionType; import org.apache.eventmesh.common.protocol.tcp.Command; From a64c5d3cbe3c0eb772614208960076c1766e5051 Mon Sep 17 00:00:00 2001 From: scwlkq Date: Thu, 15 Feb 2024 22:28:27 +0800 Subject: [PATCH 2/3] move some simple usage constants --- .../eventmesh/common/EventMeshCommon.java | 11 ----------- .../client/tcp/common/MessageUtils.java | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java index 5f49115c9f..d990c68fed 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java @@ -29,16 +29,5 @@ public class EventMeshCommon { */ public static final int DEFAULT_TIME_OUT_MILLS = 20 * 1000; - /** - * USERAGENT for PUB - */ - public static final String USER_AGENT_PURPOSE_PUB = "pub"; - - /** - * USERAGENT for SUB - */ - public static final String USER_AGENT_PURPOSE_SUB = "sub"; - 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 07e9134425..376121f0e0 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 @@ -47,6 +47,18 @@ public class MessageUtils { private static final int SEQ_LENGTH = 10; + /** + * USERAGENT for PUB + */ + public static final String USER_AGENT_PURPOSE_PUB = "pub"; + + /** + * USERAGENT for SUB + */ + public static final String USER_AGENT_PURPOSE_SUB = "sub"; + + public static final String OPEN_MESSAGE_PROTOCOL_NAME = "openmessage"; + public static Package hello(UserAgent user) { final Package msg = getPackage(Command.HELLO_REQUEST); msg.setBody(user); @@ -98,7 +110,7 @@ public static Package buildPackage(Object message, Command command) { msg.getHeader().putProperty(Constants.PROTOCOL_DESC, "tcp"); msg.setBody(message); } else if (message instanceof Message) { - msg.getHeader().putProperty(Constants.PROTOCOL_TYPE, EventMeshCommon.OPEN_MESSAGE_PROTOCOL_NAME); + msg.getHeader().putProperty(Constants.PROTOCOL_TYPE, OPEN_MESSAGE_PROTOCOL_NAME); // todo: this version need to be confirmed. msg.getHeader().putProperty(Constants.PROTOCOL_VERSION, SpecVersion.V1.toString()); } else { @@ -122,11 +134,11 @@ public static Package responseToClientAck(Package in) { } public static UserAgent generateSubClient(UserAgent agent) { - return getUserAgent(agent, EventMeshCommon.USER_AGENT_PURPOSE_SUB); + return getUserAgent(agent, USER_AGENT_PURPOSE_SUB); } public static UserAgent generatePubClient(UserAgent agent) { - return getUserAgent(agent, EventMeshCommon.USER_AGENT_PURPOSE_PUB); + return getUserAgent(agent, USER_AGENT_PURPOSE_PUB); } private static Subscription generateSubscription(String topic, SubscriptionMode subscriptionMode, From d75122368d6fa280e8a98745e5de7289e148e715 Mon Sep 17 00:00:00 2001 From: scwlkq Date: Thu, 22 Feb 2024 18:31:44 +0800 Subject: [PATCH 3/3] move constant OPEN_MESSAGE_PROTOCOL_NAME to EventMeshCommon.clss --- .../java/org/apache/eventmesh/common/EventMeshCommon.java | 2 ++ .../apache/eventmesh/client/tcp/common/MessageUtils.java | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java index d990c68fed..2a06f262b8 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshCommon.java @@ -30,4 +30,6 @@ public class EventMeshCommon { public static final int DEFAULT_TIME_OUT_MILLS = 20 * 1000; 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 376121f0e0..8e13f33184 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 @@ -45,19 +45,15 @@ public class MessageUtils { - private static final int SEQ_LENGTH = 10; - /** * USERAGENT for PUB */ public static final String USER_AGENT_PURPOSE_PUB = "pub"; - /** * USERAGENT for SUB */ public static final String USER_AGENT_PURPOSE_SUB = "sub"; - - public static final String OPEN_MESSAGE_PROTOCOL_NAME = "openmessage"; + private static final int SEQ_LENGTH = 10; public static Package hello(UserAgent user) { final Package msg = getPackage(Command.HELLO_REQUEST); @@ -110,7 +106,7 @@ public static Package buildPackage(Object message, Command command) { msg.getHeader().putProperty(Constants.PROTOCOL_DESC, "tcp"); msg.setBody(message); } else if (message instanceof Message) { - msg.getHeader().putProperty(Constants.PROTOCOL_TYPE, OPEN_MESSAGE_PROTOCOL_NAME); + msg.getHeader().putProperty(Constants.PROTOCOL_TYPE, EventMeshCommon.OPEN_MESSAGE_PROTOCOL_NAME); // todo: this version need to be confirmed. msg.getHeader().putProperty(Constants.PROTOCOL_VERSION, SpecVersion.V1.toString()); } else {