From a2716fd634a58b4d3be69627872c9a783e1799ac Mon Sep 17 00:00:00 2001 From: Eason Chen Date: Fri, 16 Apr 2021 11:00:33 +0800 Subject: [PATCH 01/57] Update README.md --- README.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index ee0d26be5d..778b85f210 100644 --- a/README.md +++ b/README.md @@ -51,22 +51,19 @@ The protocol of eventmesh is easier and convenient, you can read more [here](doc | v1.1.0 |Support RocketMQ as eventstore| | v1.1.1 |Support https| | v1.2.0 |Support OpenMessaging API，support Plug-in architecture, support http sub, support cloud native deploy| -| V1.3.0 |Support CloudEvents protocol，support OpenMessaging Connector| +| V1.3.0 |Support CloudEvents, Event Streaming| +| |Support Event function,triggers and bindings| +| |Support Event orchestration, Servelss workflow| | |Support Event transaction| -| |Support Event filter| -| |Support Promethus as metrics| +| |Support Event schema| +| |Support Event governance, dashboard| +| |Support Event security| | |Support multi language SDK(c\go\python\wasm)| -| |Support Event orchestration| -| |Support Event governance| +| |Support Promethus as metrics| | |Support Skywalking as tracing| -| |Support Spiffe as security| -| |Support Event replay| -| |Support openmessaging-storage-dledger as default event store| -| |Support Dashboard| -| |Support schema registry| -| |Support gRPC protocol| -| |Support MQTT protocol| -| |Support routing functions with triggers and bindings| +| |Support streaming event store| +| |Support gRPC protocol| +| |Support MQTT protocol| ## Quick Start 1. Build and deploy event-store(RocketMQ), see [instruction](https://rocketmq.apache.org/docs/quick-start/). From ebe587b8e29ab372bd22f21f1f8568173334c2fa Mon Sep 17 00:00:00 2001 From: Udesh Liyanaarachchi <> Date: Mon, 19 Apr 2021 15:52:00 +0530 Subject: [PATCH 02/57] Changed com.webank to org.apache Changed 'eventmesh-connector-api' code package name to apache. --- eventmesh-connector-api/gradle.properties | 2 +- .../webank => org/apache}/eventmesh/api/AbstractContext.java | 2 +- .../{com/webank => org/apache}/eventmesh/api/RRCallback.java | 2 +- .../apache}/eventmesh/api/consumer/MeshMQPushConsumer.java | 5 +++-- .../apache}/eventmesh/api/producer/MeshMQProducer.java | 5 +++-- 5 files changed, 9 insertions(+), 7 deletions(-) rename eventmesh-connector-api/src/main/java/{com/webank => org/apache}/eventmesh/api/AbstractContext.java (52%) rename eventmesh-connector-api/src/main/java/{com/webank => org/apache}/eventmesh/api/RRCallback.java (82%) rename eventmesh-connector-api/src/main/java/{com/webank => org/apache}/eventmesh/api/consumer/MeshMQPushConsumer.java (89%) rename eventmesh-connector-api/src/main/java/{com/webank => org/apache}/eventmesh/api/producer/MeshMQProducer.java (94%) diff --git a/eventmesh-connector-api/gradle.properties b/eventmesh-connector-api/gradle.properties index 0c63593fb4..5f23385cf9 100644 --- a/eventmesh-connector-api/gradle.properties +++ b/eventmesh-connector-api/gradle.properties @@ -15,7 +15,7 @@ # limitations under the License. # -group=com.webank.eventmesh +group=org.apache.eventmesh version=1.2.0-SNAPSHOT jdk=1.7 mavenUserName= diff --git a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/AbstractContext.java b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/AbstractContext.java similarity index 52% rename from eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/AbstractContext.java rename to eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/AbstractContext.java index 4d76140d01..8e84012e37 100644 --- a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/AbstractContext.java +++ b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/AbstractContext.java @@ -1,4 +1,4 @@ -package com.webank.eventmesh.api; +package org.apache.eventmesh.api; public interface AbstractContext { } diff --git a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/RRCallback.java b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RRCallback.java similarity index 82% rename from eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/RRCallback.java rename to eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RRCallback.java index d72ccbbca2..376b0ba096 100644 --- a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/RRCallback.java +++ b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RRCallback.java @@ -1,4 +1,4 @@ -package com.webank.eventmesh.api; +package org.apache.eventmesh.api; import io.openmessaging.api.Message; diff --git a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/consumer/MeshMQPushConsumer.java b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/consumer/MeshMQPushConsumer.java similarity index 89% rename from eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/consumer/MeshMQPushConsumer.java rename to eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/consumer/MeshMQPushConsumer.java index a18ce443b5..4ead4b63f6 100644 --- a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/consumer/MeshMQPushConsumer.java +++ b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/consumer/MeshMQPushConsumer.java @@ -1,6 +1,5 @@ -package com.webank.eventmesh.api.consumer; +package org.apache.eventmesh.api.consumer; -import com.webank.eventmesh.api.AbstractContext; import io.openmessaging.api.AsyncMessageListener; import io.openmessaging.api.MessageListener; import io.openmessaging.api.Message; @@ -9,6 +8,8 @@ import java.util.List; import java.util.Properties; +import org.apache.eventmesh.api.AbstractContext; + public interface MeshMQPushConsumer extends Consumer { void init(Properties keyValue) throws Exception; diff --git a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/producer/MeshMQProducer.java b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/producer/MeshMQProducer.java similarity index 94% rename from eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/producer/MeshMQProducer.java rename to eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/producer/MeshMQProducer.java index f20a879f4b..7dd3a0744a 100644 --- a/eventmesh-connector-api/src/main/java/com/webank/eventmesh/api/producer/MeshMQProducer.java +++ b/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/producer/MeshMQProducer.java @@ -15,15 +15,16 @@ * limitations under the License. */ -package com.webank.eventmesh.api.producer; +package org.apache.eventmesh.api.producer; -import com.webank.eventmesh.api.RRCallback; import io.openmessaging.api.Message; import io.openmessaging.api.Producer; import io.openmessaging.api.SendCallback; import java.util.Properties; +import org.apache.eventmesh.api.RRCallback; + public interface MeshMQProducer extends Producer { void init(Properties properties) throws Exception; From a99adc84e9e49d8586e35973e21e7f97e3486b06 Mon Sep 17 00:00:00 2001 From: keranbingaa <397294722@qq.com> Date: Mon, 19 Apr 2021 19:30:22 +0800 Subject: [PATCH 03/57] issue #277:refactor eventmesh-common package with org.apache --- eventmesh-common/gradle.properties | 2 +- .../webank/eventmesh/common/Constants.java | 2 +- .../eventmesh/common/EventMeshException.java | 2 +- .../com/webank/eventmesh/common/IPUtil.java | 2 +- .../webank/eventmesh/common/LiteMessage.java | 2 +- .../eventmesh/common/ThreadPoolFactory.java | 2 +- .../webank/eventmesh/common/ThreadUtil.java | 2 +- .../eventmesh/common/command/HttpCommand.java | 12 +++++------ .../common/config/CommonConfiguration.java | 2 +- .../common/config/ConfigurationWraper.java | 4 ++-- .../protocol/http/body/BaseRequestBody.java | 2 +- .../protocol/http/body/BaseResponseBody.java | 4 ++-- .../common/protocol/http/body/Body.java | 16 +++++++-------- .../body/client/HeartbeatRequestBody.java | 4 ++-- .../body/client/HeartbeatResponseBody.java | 8 ++++---- .../http/body/client/RegRequestBody.java | 4 ++-- .../http/body/client/RegResponseBody.java | 8 ++++---- .../body/client/SubscribeRequestBody.java | 4 ++-- .../body/client/SubscribeResponseBody.java | 8 ++++---- .../http/body/client/UnRegRequestBody.java | 4 ++-- .../http/body/client/UnRegResponseBody.java | 8 ++++---- .../body/client/UnSubscribeRequestBody.java | 4 ++-- .../body/client/UnSubscribeResponseBody.java | 8 ++++---- .../body/message/PushMessageRequestBody.java | 4 ++-- .../body/message/PushMessageResponseBody.java | 8 ++++---- .../body/message/ReplyMessageRequestBody.java | 4 ++-- .../message/ReplyMessageResponseBody.java | 8 ++++---- .../message/SendMessageBatchRequestBody.java | 4 ++-- .../message/SendMessageBatchResponseBody.java | 8 ++++---- .../SendMessageBatchV2RequestBody.java | 4 ++-- .../SendMessageBatchV2ResponseBody.java | 8 ++++---- .../body/message/SendMessageRequestBody.java | 4 ++-- .../body/message/SendMessageResponseBody.java | 8 ++++---- .../protocol/http/common/ClientRetCode.java | 2 +- .../protocol/http/common/ClientType.java | 2 +- .../http/common/EventMeshRetCode.java | 2 +- .../protocol/http/common/ProtocolKey.java | 2 +- .../protocol/http/common/ProtocolVersion.java | 2 +- .../protocol/http/common/RequestCode.java | 2 +- .../http/header/BaseRequestHeader.java | 4 ++-- .../http/header/BaseResponseHeader.java | 4 ++-- .../common/protocol/http/header/Header.java | 20 +++++++++---------- .../header/client/HeartbeatRequestHeader.java | 10 +++++----- .../client/HeartbeatResponseHeader.java | 6 +++--- .../http/header/client/RegRequestHeader.java | 10 +++++----- .../http/header/client/RegResponseHeader.java | 6 +++--- .../header/client/SubscribeRequestHeader.java | 10 +++++----- .../client/SubscribeResponseHeader.java | 6 +++--- .../header/client/UnRegRequestHeader.java | 10 +++++----- .../header/client/UnRegResponseHeader.java | 6 +++--- .../client/UnSubscribeRequestHeader.java | 10 +++++----- .../client/UnSubscribeResponseHeader.java | 6 +++--- .../message/PushMessageRequestHeader.java | 10 +++++----- .../message/PushMessageResponseHeader.java | 10 +++++----- .../message/ReplyMessageRequestHeader.java | 10 +++++----- .../message/ReplyMessageResponseHeader.java | 6 +++--- .../SendMessageBatchRequestHeader.java | 10 +++++----- .../SendMessageBatchResponseHeader.java | 6 +++--- .../SendMessageBatchV2RequestHeader.java | 10 +++++----- .../SendMessageBatchV2ResponseHeader.java | 6 +++--- .../message/SendMessageRequestHeader.java | 10 +++++----- .../message/SendMessageResponseHeader.java | 6 +++--- .../common/protocol/tcp/Command.java | 2 +- .../protocol/tcp/EventMeshClientInfo.java | 2 +- .../common/protocol/tcp/EventMeshMessage.java | 2 +- .../eventmesh/common/protocol/tcp/Header.java | 2 +- .../common/protocol/tcp/HeartBeatInfo.java | 2 +- .../common/protocol/tcp/OPStatus.java | 2 +- .../common/protocol/tcp/Package.java | 2 +- .../common/protocol/tcp/RedirectInfo.java | 2 +- .../common/protocol/tcp/RegisterInfo.java | 2 +- .../common/protocol/tcp/Subscription.java | 2 +- .../common/protocol/tcp/UnRegisterInfo.java | 2 +- .../common/protocol/tcp/UserAgent.java | 2 +- .../common/protocol/tcp/codec/Codec.java | 18 ++++++++--------- 75 files changed, 210 insertions(+), 210 deletions(-) diff --git a/eventmesh-common/gradle.properties b/eventmesh-common/gradle.properties index bca7b2e0a4..37d0e85402 100644 --- a/eventmesh-common/gradle.properties +++ b/eventmesh-common/gradle.properties @@ -15,7 +15,7 @@ # limitations under the License. # -group=com.webank.eventmesh +group=org.apache.eventmesh version=1.2.0-SNAPSHOT defibus_version=1.0.1 jdk=1.7 diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/Constants.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/Constants.java index 97ee4bc001..937859a8b4 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/Constants.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/Constants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common; +package org.apache.eventmesh.common; public class Constants { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/EventMeshException.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/EventMeshException.java index b20fcbba25..bffa57e780 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/EventMeshException.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/EventMeshException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common; +package org.apache.eventmesh.common; public class EventMeshException extends Exception { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/IPUtil.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/IPUtil.java index e0b7826b64..677cd98996 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/IPUtil.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/IPUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common; +package org.apache.eventmesh.common; import io.netty.channel.Channel; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/LiteMessage.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/LiteMessage.java index e0d9666bf7..364925e931 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/LiteMessage.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/LiteMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common; +package org.apache.eventmesh.common; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadPoolFactory.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadPoolFactory.java index c8e5f85e56..5be65297b3 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadPoolFactory.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadPoolFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common; +package org.apache.eventmesh.common; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Executors; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadUtil.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadUtil.java index 3a25b806b3..e97bd5ae3c 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadUtil.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common; +package org.apache.eventmesh.common; import java.util.concurrent.ThreadLocalRandom; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/command/HttpCommand.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/command/HttpCommand.java index 4ac40a0b99..37142de50c 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/command/HttpCommand.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/command/HttpCommand.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.webank.eventmesh.common.command; +package org.apache.eventmesh.common.command; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.BaseResponseBody; -import com.webank.eventmesh.common.protocol.http.body.Body; -import com.webank.eventmesh.common.protocol.http.header.BaseResponseHeader; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.BaseResponseBody; +import org.apache.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.header.BaseResponseHeader; +import org.apache.eventmesh.common.protocol.http.header.Header; import com.alibaba.fastjson.JSON; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/CommonConfiguration.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/CommonConfiguration.java index 0a568af0b0..f6d484e498 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/CommonConfiguration.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/CommonConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.config; +package org.apache.eventmesh.common.config; import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/ConfigurationWraper.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/ConfigurationWraper.java index 21ded1f3bb..70fd51cfd2 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/ConfigurationWraper.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/ConfigurationWraper.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.config; +package org.apache.eventmesh.common.config; -import com.webank.eventmesh.common.ThreadPoolFactory; +import org.apache.eventmesh.common.ThreadPoolFactory; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseRequestBody.java index 23107ffe08..09a3f741a0 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseRequestBody.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body; +package org.apache.eventmesh.common.protocol.http.body; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseResponseBody.java index 4f17ffe57a..aefa711840 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseResponseBody.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body; +package org.apache.eventmesh.common.protocol.http.body; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/Body.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/Body.java index 65dce6a7ad..f1d504f006 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/Body.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/Body.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body; +package org.apache.eventmesh.common.protocol.http.body; -import com.webank.eventmesh.common.protocol.http.body.client.*; -import com.webank.eventmesh.common.protocol.http.common.RequestCode; -import com.webank.eventmesh.common.protocol.http.body.message.PushMessageRequestBody; -import com.webank.eventmesh.common.protocol.http.body.message.ReplyMessageRequestBody; -import com.webank.eventmesh.common.protocol.http.body.message.SendMessageBatchRequestBody; -import com.webank.eventmesh.common.protocol.http.body.message.SendMessageBatchV2RequestBody; -import com.webank.eventmesh.common.protocol.http.body.message.SendMessageRequestBody; +import org.apache.eventmesh.common.protocol.http.body.client.*; +import org.apache.eventmesh.common.protocol.http.common.RequestCode; +import org.apache.eventmesh.common.protocol.http.body.message.PushMessageRequestBody; +import org.apache.eventmesh.common.protocol.http.body.message.ReplyMessageRequestBody; +import org.apache.eventmesh.common.protocol.http.body.message.SendMessageBatchRequestBody; +import org.apache.eventmesh.common.protocol.http.body.message.SendMessageBatchV2RequestBody; +import org.apache.eventmesh.common.protocol.http.body.message.SendMessageRequestBody; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java index 4a273c2eb6..f96fc9a66b 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import org.apache.commons.collections4.MapUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java index fd49b5df8c..9496e63022 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegRequestBody.java index 8739590bf6..0b7b4af551 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegRequestBody.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import org.apache.commons.collections4.MapUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegResponseBody.java index cffd492eb6..d12dc3883a 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java index c7c4ea2bdd..0ea4fe74ed 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.collections4.MapUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java index 40d94dd16e..487f9dd616 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java index f0e0b7c111..7d440495f6 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import org.apache.commons.collections4.MapUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java index b4118dd7e3..4682f359c3 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java index 9fc03e3279..3291f8e9e5 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.collections4.MapUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java index 6aac822772..43cefcb101 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.client; +package org.apache.eventmesh.common.protocol.http.body.client; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java index 2613af74aa..dafa72dea3 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.MapUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java index 8b1f28e5a2..b8ab8900bd 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java index ba8ba94e64..5f00852053 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.MapUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java index 99b6a42939..75914773fe 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java index 067d398c06..7c2f6cfec7 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import org.apache.commons.collections4.MapUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java index 45ffb0dd7b..00d26f0f8b 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java index 3532da883c..cd2c6a7ca0 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.collections4.MapUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java index bc5d9b1b5e..db3f6e1417 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java index 02007ce051..acebdc38c2 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; import java.util.HashMap; import java.util.Map; import com.alibaba.fastjson.JSONObject; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java index 375878439c..ce54725344 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.body.message; +package org.apache.eventmesh.common.protocol.http.body.message; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.body.Body; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.body.Body; import org.apache.commons.lang3.time.DateFormatUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientRetCode.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientRetCode.java index 17f7e77e15..30986efa9c 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientRetCode.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientRetCode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.common; +package org.apache.eventmesh.common.protocol.http.common; public enum ClientRetCode { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientType.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientType.java index 4ddeb826ab..ec1d8526c9 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientType.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.common; +package org.apache.eventmesh.common.protocol.http.common; public enum ClientType { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/EventMeshRetCode.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/EventMeshRetCode.java index 371a4564bd..3593e0e40c 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/EventMeshRetCode.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/EventMeshRetCode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.common; +package org.apache.eventmesh.common.protocol.http.common; public enum EventMeshRetCode { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolKey.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolKey.java index c7f87e058d..c6cb15d4dd 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolKey.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.common; +package org.apache.eventmesh.common.protocol.http.common; public class ProtocolKey { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolVersion.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolVersion.java index 9c3e14e05a..3202e74ea4 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolVersion.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.common; +package org.apache.eventmesh.common.protocol.http.common; public enum ProtocolVersion { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/RequestCode.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/RequestCode.java index dd6c4341b0..f193884faa 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/RequestCode.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/RequestCode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.common; +package org.apache.eventmesh.common.protocol.http.common; public enum RequestCode { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseRequestHeader.java index 962c2600c1..a2fa09e73e 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseRequestHeader.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header; +package org.apache.eventmesh.common.protocol.http.header; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import org.apache.commons.collections4.MapUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseResponseHeader.java index 30cbbbdd7f..0eaa3efed0 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseResponseHeader.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header; +package org.apache.eventmesh.common.protocol.http.header; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/Header.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/Header.java index 3f7f09e2a8..a7cb6beb3a 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/Header.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/Header.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header; +package org.apache.eventmesh.common.protocol.http.header; -import com.webank.eventmesh.common.protocol.http.body.client.HeartbeatRequestBody; -import com.webank.eventmesh.common.protocol.http.body.message.ReplyMessageRequestBody; -import com.webank.eventmesh.common.protocol.http.common.RequestCode; -import com.webank.eventmesh.common.protocol.http.header.client.*; -import com.webank.eventmesh.common.protocol.http.header.message.PushMessageRequestHeader; -import com.webank.eventmesh.common.protocol.http.header.message.SendMessageBatchV2RequestHeader; -import com.webank.eventmesh.common.protocol.http.header.message.SendMessageRequestHeader; -import com.webank.eventmesh.common.protocol.http.header.message.ReplyMessageRequestHeader; -import com.webank.eventmesh.common.protocol.http.header.message.SendMessageBatchRequestHeader; +import org.apache.eventmesh.common.protocol.http.body.client.HeartbeatRequestBody; +import org.apache.eventmesh.common.protocol.http.body.message.ReplyMessageRequestBody; +import org.apache.eventmesh.common.protocol.http.common.RequestCode; +import org.apache.eventmesh.common.protocol.http.header.client.*; +import org.apache.eventmesh.common.protocol.http.header.message.PushMessageRequestHeader; +import org.apache.eventmesh.common.protocol.http.header.message.SendMessageBatchV2RequestHeader; +import org.apache.eventmesh.common.protocol.http.header.message.SendMessageRequestHeader; +import org.apache.eventmesh.common.protocol.http.header.message.ReplyMessageRequestHeader; +import org.apache.eventmesh.common.protocol.http.header.message.SendMessageBatchRequestHeader; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java index 263411ab7a..3e01d9c79c 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java index 978f444c34..24db8a7364 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegRequestHeader.java index 1ed7bc3643..844008cbc3 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegRequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegResponseHeader.java index b380d57201..13e76647b0 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegResponseHeader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java index a4f90855fd..f81c73e729 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java index 931d5c632b..c2c1ff257c 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java index ce6fb8e22c..91f76b95c8 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java index c6a91c6891..6db15b48a5 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java index 7cc3650627..0fe8d5c18e 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java index 486a40f3b8..773dfb684e 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.client; +package org.apache.eventmesh.common.protocol.http.header.client; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java index 8ea85ae253..7731735d67 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import java.util.HashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java index fa0af32fa5..2753730195 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java index 0a22a8b071..291391d6d0 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java index c1909f2c7c..c0c9a68501 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java index 041e6ed4ce..bc067a2ff5 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java index 55a4750f38..daefdca806 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java index 7a2972612b..12de359c3a 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java index 0f44084c75..9a8ab1585c 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java index 515f0dfc3d..402d98bba4 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.Constants; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion; +import org.apache.eventmesh.common.protocol.http.header.Header; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java index 5a89ad4adb..b738234a69 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.http.header.message; +package org.apache.eventmesh.common.protocol.http.header.message; -import com.webank.eventmesh.common.protocol.http.common.ProtocolKey; -import com.webank.eventmesh.common.protocol.http.header.Header; +import org.apache.eventmesh.common.protocol.http.common.ProtocolKey; +import org.apache.eventmesh.common.protocol.http.header.Header; import java.util.HashMap; import java.util.Map; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Command.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Command.java index d9b3e028c4..54d75b4a61 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Command.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Command.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; public enum Command { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshClientInfo.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshClientInfo.java index 1ae9365b95..93616b2b8e 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshClientInfo.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshClientInfo.java @@ -15,7 +15,7 @@ // * limitations under the License. // */ // -//package com.webank.eventmesh.common.protocol.tcp; +//package org.apache.eventmesh.common.protocol.tcp; // //import org.apache.rocketmq.common.DataVersion; // diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshMessage.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshMessage.java index 2918a95449..01d744eea1 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshMessage.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Header.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Header.java index 70a51075e3..1df51427c8 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Header.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Header.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; public class Header { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/HeartBeatInfo.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/HeartBeatInfo.java index 0e421eb966..c12d6917d2 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/HeartBeatInfo.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/HeartBeatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; import java.util.List; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/OPStatus.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/OPStatus.java index 56089c4e39..4ecfd04dbc 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/OPStatus.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/OPStatus.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; public enum OPStatus { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Package.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Package.java index 051c3223e2..d2cde02193 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Package.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Package.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; public class Package { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RedirectInfo.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RedirectInfo.java index 40a19db587..81373f8485 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RedirectInfo.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RedirectInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; public class RedirectInfo { private String ip; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RegisterInfo.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RegisterInfo.java index 0e5867506e..44303f2f58 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RegisterInfo.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RegisterInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; import java.util.List; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Subscription.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Subscription.java index 2c965bcc36..83b0dc9fcc 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Subscription.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Subscription.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; import java.util.LinkedList; import java.util.List; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UnRegisterInfo.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UnRegisterInfo.java index 6c0626de7a..33961ad486 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UnRegisterInfo.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UnRegisterInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; import java.util.List; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UserAgent.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UserAgent.java index 07200a70d3..27ba693929 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UserAgent.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UserAgent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp; +package org.apache.eventmesh.common.protocol.tcp; public class UserAgent { diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/codec/Codec.java b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/codec/Codec.java index b7f7e4ef93..f7a88f9345 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/codec/Codec.java +++ b/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/codec/Codec.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.webank.eventmesh.common.protocol.tcp.codec; - -import com.webank.eventmesh.common.protocol.tcp.Package; -import com.webank.eventmesh.common.protocol.tcp.EventMeshMessage; -import com.webank.eventmesh.common.protocol.tcp.Command; -import com.webank.eventmesh.common.protocol.tcp.Header; -import com.webank.eventmesh.common.protocol.tcp.RedirectInfo; -import com.webank.eventmesh.common.protocol.tcp.Subscription; -import com.webank.eventmesh.common.protocol.tcp.UserAgent; +package org.apache.eventmesh.common.protocol.tcp.codec; + +import org.apache.eventmesh.common.protocol.tcp.Package; +import org.apache.eventmesh.common.protocol.tcp.EventMeshMessage; +import org.apache.eventmesh.common.protocol.tcp.Command; +import org.apache.eventmesh.common.protocol.tcp.Header; +import org.apache.eventmesh.common.protocol.tcp.RedirectInfo; +import org.apache.eventmesh.common.protocol.tcp.Subscription; +import org.apache.eventmesh.common.protocol.tcp.UserAgent; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; From 8e12c9cfd0549c885fa3a1b663dcede3713e9e5f Mon Sep 17 00:00:00 2001 From: keranbingaa <397294722@qq.com> Date: Mon, 19 Apr 2021 19:34:26 +0800 Subject: [PATCH 04/57] issue #277:rename package with org.apache --- .../{com/webank => org/apache}/eventmesh/common/Constants.java | 0 .../apache}/eventmesh/common/EventMeshException.java | 0 .../{com/webank => org/apache}/eventmesh/common/IPUtil.java | 0 .../webank => org/apache}/eventmesh/common/LiteMessage.java | 0 .../apache}/eventmesh/common/ThreadPoolFactory.java | 0 .../{com/webank => org/apache}/eventmesh/common/ThreadUtil.java | 0 .../apache}/eventmesh/common/command/HttpCommand.java | 0 .../apache}/eventmesh/common/config/CommonConfiguration.java | 0 .../apache}/eventmesh/common/config/ConfigurationWraper.java | 0 .../eventmesh/common/protocol/http/body/BaseRequestBody.java | 0 .../eventmesh/common/protocol/http/body/BaseResponseBody.java | 0 .../apache}/eventmesh/common/protocol/http/body/Body.java | 0 .../common/protocol/http/body/client/HeartbeatRequestBody.java | 0 .../common/protocol/http/body/client/HeartbeatResponseBody.java | 0 .../common/protocol/http/body/client/RegRequestBody.java | 0 .../common/protocol/http/body/client/RegResponseBody.java | 0 .../common/protocol/http/body/client/SubscribeRequestBody.java | 0 .../common/protocol/http/body/client/SubscribeResponseBody.java | 0 .../common/protocol/http/body/client/UnRegRequestBody.java | 0 .../common/protocol/http/body/client/UnRegResponseBody.java | 0 .../protocol/http/body/client/UnSubscribeRequestBody.java | 0 .../protocol/http/body/client/UnSubscribeResponseBody.java | 0 .../protocol/http/body/message/PushMessageRequestBody.java | 0 .../protocol/http/body/message/PushMessageResponseBody.java | 0 .../protocol/http/body/message/ReplyMessageRequestBody.java | 0 .../protocol/http/body/message/ReplyMessageResponseBody.java | 0 .../protocol/http/body/message/SendMessageBatchRequestBody.java | 0 .../http/body/message/SendMessageBatchResponseBody.java | 0 .../http/body/message/SendMessageBatchV2RequestBody.java | 0 .../http/body/message/SendMessageBatchV2ResponseBody.java | 0 .../protocol/http/body/message/SendMessageRequestBody.java | 0 .../protocol/http/body/message/SendMessageResponseBody.java | 0 .../eventmesh/common/protocol/http/common/ClientRetCode.java | 0 .../eventmesh/common/protocol/http/common/ClientType.java | 0 .../eventmesh/common/protocol/http/common/EventMeshRetCode.java | 0 .../eventmesh/common/protocol/http/common/ProtocolKey.java | 0 .../eventmesh/common/protocol/http/common/ProtocolVersion.java | 0 .../eventmesh/common/protocol/http/common/RequestCode.java | 0 .../common/protocol/http/header/BaseRequestHeader.java | 0 .../common/protocol/http/header/BaseResponseHeader.java | 0 .../apache}/eventmesh/common/protocol/http/header/Header.java | 2 -- .../protocol/http/header/client/HeartbeatRequestHeader.java | 0 .../protocol/http/header/client/HeartbeatResponseHeader.java | 0 .../common/protocol/http/header/client/RegRequestHeader.java | 0 .../common/protocol/http/header/client/RegResponseHeader.java | 0 .../protocol/http/header/client/SubscribeRequestHeader.java | 0 .../protocol/http/header/client/SubscribeResponseHeader.java | 0 .../common/protocol/http/header/client/UnRegRequestHeader.java | 0 .../common/protocol/http/header/client/UnRegResponseHeader.java | 0 .../protocol/http/header/client/UnSubscribeRequestHeader.java | 0 .../protocol/http/header/client/UnSubscribeResponseHeader.java | 0 .../protocol/http/header/message/PushMessageRequestHeader.java | 0 .../protocol/http/header/message/PushMessageResponseHeader.java | 0 .../protocol/http/header/message/ReplyMessageRequestHeader.java | 0 .../http/header/message/ReplyMessageResponseHeader.java | 0 .../http/header/message/SendMessageBatchRequestHeader.java | 0 .../http/header/message/SendMessageBatchResponseHeader.java | 0 .../http/header/message/SendMessageBatchV2RequestHeader.java | 0 .../http/header/message/SendMessageBatchV2ResponseHeader.java | 0 .../protocol/http/header/message/SendMessageRequestHeader.java | 0 .../protocol/http/header/message/SendMessageResponseHeader.java | 0 .../apache}/eventmesh/common/protocol/tcp/Command.java | 0 .../eventmesh/common/protocol/tcp/EventMeshClientInfo.java | 0 .../apache}/eventmesh/common/protocol/tcp/EventMeshMessage.java | 0 .../apache}/eventmesh/common/protocol/tcp/Header.java | 0 .../apache}/eventmesh/common/protocol/tcp/HeartBeatInfo.java | 0 .../apache}/eventmesh/common/protocol/tcp/OPStatus.java | 0 .../apache}/eventmesh/common/protocol/tcp/Package.java | 0 .../apache}/eventmesh/common/protocol/tcp/RedirectInfo.java | 0 .../apache}/eventmesh/common/protocol/tcp/RegisterInfo.java | 0 .../apache}/eventmesh/common/protocol/tcp/Subscription.java | 0 .../apache}/eventmesh/common/protocol/tcp/UnRegisterInfo.java | 0 .../apache}/eventmesh/common/protocol/tcp/UserAgent.java | 0 .../apache}/eventmesh/common/protocol/tcp/codec/Codec.java | 0 74 files changed, 2 deletions(-) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/Constants.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/EventMeshException.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/IPUtil.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/LiteMessage.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/ThreadPoolFactory.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/ThreadUtil.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/command/HttpCommand.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/config/CommonConfiguration.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/config/ConfigurationWraper.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/BaseRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/BaseResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/Body.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/RegRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/RegResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/common/ClientRetCode.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/common/ClientType.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/common/EventMeshRetCode.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/common/ProtocolKey.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/common/ProtocolVersion.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/common/RequestCode.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/BaseRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/BaseResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/Header.java (95%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/RegRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/RegResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/Command.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/EventMeshClientInfo.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/EventMeshMessage.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/Header.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/HeartBeatInfo.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/OPStatus.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/Package.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/RedirectInfo.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/RegisterInfo.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/Subscription.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/UnRegisterInfo.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/UserAgent.java (100%) rename eventmesh-common/src/main/java/{com/webank => org/apache}/eventmesh/common/protocol/tcp/codec/Codec.java (100%) diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/Constants.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/Constants.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/EventMeshException.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshException.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/EventMeshException.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshException.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/IPUtil.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/IPUtil.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/IPUtil.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/IPUtil.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/LiteMessage.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/LiteMessage.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/LiteMessage.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/LiteMessage.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadPoolFactory.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadPoolFactory.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadPoolFactory.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadPoolFactory.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadUtil.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadUtil.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/ThreadUtil.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadUtil.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/command/HttpCommand.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/command/HttpCommand.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/command/HttpCommand.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/command/HttpCommand.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/CommonConfiguration.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/config/CommonConfiguration.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/config/ConfigurationWraper.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigurationWraper.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/config/ConfigurationWraper.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigurationWraper.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/BaseResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/Body.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/Body.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/Body.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/Body.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/RegRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/RegRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/RegResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/RegResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/RegResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/SubscribeRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/SubscribeResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnRegRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnRegResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnSubscribeRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/UnSubscribeResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/PushMessageRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/PushMessageResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2RequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageRequestBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageResponseBody.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientRetCode.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientRetCode.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientRetCode.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientRetCode.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientType.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientType.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ClientType.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientType.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/EventMeshRetCode.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/EventMeshRetCode.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/EventMeshRetCode.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/EventMeshRetCode.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolKey.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolKey.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolVersion.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolVersion.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/ProtocolVersion.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolVersion.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/RequestCode.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/RequestCode.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/common/RequestCode.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/RequestCode.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/BaseRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/BaseRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/BaseResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/BaseResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/BaseResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/Header.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/Header.java similarity index 95% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/Header.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/Header.java index a7cb6beb3a..4c570b493e 100644 --- a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/Header.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/Header.java @@ -18,8 +18,6 @@ package org.apache.eventmesh.common.protocol.http.header; -import org.apache.eventmesh.common.protocol.http.body.client.HeartbeatRequestBody; -import org.apache.eventmesh.common.protocol.http.body.message.ReplyMessageRequestBody; import org.apache.eventmesh.common.protocol.http.common.RequestCode; import org.apache.eventmesh.common.protocol.http.header.client.*; import org.apache.eventmesh.common.protocol.http.header.message.PushMessageRequestHeader; diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/RegResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/SubscribeResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnSubscribeResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Command.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Command.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Command.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Command.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshClientInfo.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/EventMeshClientInfo.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshClientInfo.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/EventMeshClientInfo.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshMessage.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/EventMeshMessage.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/EventMeshMessage.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/EventMeshMessage.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Header.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Header.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/HeartBeatInfo.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/HeartBeatInfo.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/HeartBeatInfo.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/HeartBeatInfo.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/OPStatus.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/OPStatus.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/OPStatus.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/OPStatus.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Package.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Package.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Package.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Package.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RedirectInfo.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/RedirectInfo.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RedirectInfo.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/RedirectInfo.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RegisterInfo.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/RegisterInfo.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/RegisterInfo.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/RegisterInfo.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Subscription.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Subscription.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/Subscription.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Subscription.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UnRegisterInfo.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/UnRegisterInfo.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UnRegisterInfo.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/UnRegisterInfo.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UserAgent.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/UserAgent.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/UserAgent.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/UserAgent.java diff --git a/eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/codec/Codec.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java similarity index 100% rename from eventmesh-common/src/main/java/com/webank/eventmesh/common/protocol/tcp/codec/Codec.java rename to eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java From af6c352747482b4038f24db983ddd323a2e3a6a0 Mon Sep 17 00:00:00 2001 From: sunxi Date: Mon, 19 Apr 2021 20:33:39 +0800 Subject: [PATCH 05/57] Refactor 'eventmesh-connector-rocketmq' package name to org.apache --- .../rocketmq/MessagingAccessPointImpl.java | 6 +++--- .../connector/rocketmq/common/Constants.java | 2 +- .../rocketmq/common/EventMeshConstants.java | 2 +- .../rocketmq/config/ClientConfig.java | 4 ++-- .../rocketmq/config/ClientConfiguration.java | 2 +- .../rocketmq/config/ConfigurationWraper.java | 2 +- .../rocketmq/consumer/PushConsumerImpl.java | 18 +++++++++--------- .../consumer/RocketMQConsumerImpl.java | 14 +++++++------- .../rocketmq/domain/ConsumeRequest.java | 2 +- .../rocketmq/domain/NonStandardKeys.java | 2 +- .../rocketmq/domain/RocketMQConstants.java | 2 +- .../EventMeshConsumeConcurrentlyContext.java | 2 +- .../EventMeshConsumeConcurrentlyStatus.java | 2 +- .../EventMeshMessageListenerConcurrently.java | 2 +- .../rocketmq/producer/AbstractOMSProducer.java | 8 ++++---- .../rocketmq/producer/ProducerImpl.java | 4 ++-- .../producer/RocketMQProducerImpl.java | 8 ++++---- .../rocketmq/promise/DefaultPromise.java | 2 +- .../rocketmq/promise/FutureState.java | 2 +- .../connector/rocketmq/utils/BeanUtils.java | 2 +- .../connector/rocketmq/utils/OMSUtil.java | 2 +- .../ConsumeMessageConcurrentlyService.java | 2 +- ...k.eventmesh.api.consumer.MeshMQPushConsumer | 1 - ...ebank.eventmesh.api.producer.MeshMQProducer | 1 - ...e.eventmesh.api.consumer.MeshMQPushConsumer | 1 + ...pache.eventmesh.api.producer.MeshMQProducer | 1 + .../consumer/PushConsumerImplTest.java | 6 +++--- .../rocketmq/producer/ProducerImplTest.java | 4 ++-- .../rocketmq/promise/DefaultPromiseTest.java | 0 .../apache}/rocketmq/utils/BeanUtilsTest.java | 8 ++++---- .../io.openmessaging.MessagingAccessPoint | 1 - .../io.openmessaging.producer.Producer | 1 - ...pache.io.openmessaging.MessagingAccessPoint | 1 + ...g.apache.io.openmessaging.producer.Producer | 1 + 34 files changed, 59 insertions(+), 59 deletions(-) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/MessagingAccessPointImpl.java (93%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/common/Constants.java (94%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/common/EventMeshConstants.java (98%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/config/ClientConfig.java (97%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/config/ClientConfiguration.java (99%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/config/ConfigurationWraper.java (97%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java (95%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java (93%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/domain/ConsumeRequest.java (97%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/domain/NonStandardKeys.java (96%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/domain/RocketMQConstants.java (94%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java (96%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java (95%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java (98%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/producer/AbstractOMSProducer.java (96%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/producer/ProducerImpl.java (97%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java (95%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/promise/DefaultPromise.java (99%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/promise/FutureState.java (95%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/utils/BeanUtils.java (99%) rename eventmesh-connector-rocketmq/src/main/java/{com/webank => org/apache}/eventmesh/connector/rocketmq/utils/OMSUtil.java (99%) delete mode 100644 eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.consumer.MeshMQPushConsumer delete mode 100644 eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.producer.MeshMQProducer create mode 100644 eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.consumer.MeshMQPushConsumer create mode 100644 eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.producer.MeshMQProducer rename eventmesh-connector-rocketmq/src/test/java/{ => org/apache}/rocketmq/consumer/PushConsumerImplTest.java (95%) rename eventmesh-connector-rocketmq/src/test/java/{ => org/apache}/rocketmq/producer/ProducerImplTest.java (97%) rename eventmesh-connector-rocketmq/src/test/java/{ => org/apache}/rocketmq/promise/DefaultPromiseTest.java (100%) rename eventmesh-connector-rocketmq/src/test/java/{ => org/apache}/rocketmq/utils/BeanUtilsTest.java (94%) delete mode 100644 eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.MessagingAccessPoint delete mode 100644 eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.producer.Producer create mode 100644 eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.MessagingAccessPoint create mode 100644 eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/MessagingAccessPointImpl.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/MessagingAccessPointImpl.java similarity index 93% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/MessagingAccessPointImpl.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/MessagingAccessPointImpl.java index 79d6a5f17e..9c3348ea22 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/MessagingAccessPointImpl.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/MessagingAccessPointImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq; +package org.apache.eventmesh.connector.rocketmq; -import com.webank.eventmesh.connector.rocketmq.producer.ProducerImpl; -import com.webank.eventmesh.connector.rocketmq.consumer.PushConsumerImpl; +import org.apache.eventmesh.connector.rocketmq.producer.ProducerImpl; +import org.apache.eventmesh.connector.rocketmq.consumer.PushConsumerImpl; import io.openmessaging.api.Consumer; import io.openmessaging.api.MessagingAccessPoint; import io.openmessaging.api.Producer; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/common/Constants.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/Constants.java similarity index 94% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/common/Constants.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/Constants.java index 969359da93..1fe247f2af 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/common/Constants.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/Constants.java @@ -1,4 +1,4 @@ -package com.webank.eventmesh.connector.rocketmq.common; +package org.apache.eventmesh.connector.rocketmq.common; public class Constants { public static final String BROADCAST_PREFIX = "broadcast-"; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/common/EventMeshConstants.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/EventMeshConstants.java similarity index 98% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/common/EventMeshConstants.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/EventMeshConstants.java index f3a1267397..c6501e357b 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/common/EventMeshConstants.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/common/EventMeshConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.common; +package org.apache.eventmesh.connector.rocketmq.common; public class EventMeshConstants { diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ClientConfig.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfig.java similarity index 97% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ClientConfig.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfig.java index 9a0ebacce6..d4e53fdd54 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ClientConfig.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfig.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.config; +package org.apache.eventmesh.connector.rocketmq.config; -import com.webank.eventmesh.connector.rocketmq.domain.NonStandardKeys; +import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys; import io.openmessaging.api.OMSBuiltinKeys; public class ClientConfig implements OMSBuiltinKeys, NonStandardKeys { diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ClientConfiguration.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfiguration.java similarity index 99% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ClientConfiguration.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfiguration.java index 9277678e0d..83328bf3aa 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ClientConfiguration.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ClientConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.config; +package org.apache.eventmesh.connector.rocketmq.config; import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ConfigurationWraper.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ConfigurationWraper.java similarity index 97% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ConfigurationWraper.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ConfigurationWraper.java index 72ebf6d6fb..065178e78a 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/config/ConfigurationWraper.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/ConfigurationWraper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.config; +package org.apache.eventmesh.connector.rocketmq.config; import com.webank.eventmesh.common.ThreadPoolFactory; import org.apache.commons.lang3.StringUtils; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java similarity index 95% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java index 274a6a952c..3c776c47e9 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/PushConsumerImpl.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.consumer; +package org.apache.eventmesh.connector.rocketmq.consumer; import com.webank.eventmesh.common.Constants; -import com.webank.eventmesh.connector.rocketmq.common.EventMeshConstants; -import com.webank.eventmesh.connector.rocketmq.domain.NonStandardKeys; -import com.webank.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext; -import com.webank.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyStatus; -import com.webank.eventmesh.connector.rocketmq.patch.EventMeshMessageListenerConcurrently; -import com.webank.eventmesh.connector.rocketmq.utils.BeanUtils; -import com.webank.eventmesh.connector.rocketmq.utils.OMSUtil; -import com.webank.eventmesh.connector.rocketmq.config.ClientConfig; +import org.apache.eventmesh.connector.rocketmq.common.EventMeshConstants; +import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys; +import org.apache.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext; +import org.apache.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyStatus; +import org.apache.eventmesh.connector.rocketmq.patch.EventMeshMessageListenerConcurrently; +import org.apache.eventmesh.connector.rocketmq.utils.BeanUtils; +import org.apache.eventmesh.connector.rocketmq.utils.OMSUtil; +import org.apache.eventmesh.connector.rocketmq.config.ClientConfig; import com.webank.eventmesh.api.AbstractContext; import io.openmessaging.api.*; import io.openmessaging.api.exception.OMSRuntimeException; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java similarity index 93% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java index a39d045984..76c7989458 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/consumer/RocketMQConsumerImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.consumer; +package org.apache.eventmesh.connector.rocketmq.consumer; import com.webank.eventmesh.api.AbstractContext; import com.webank.eventmesh.api.consumer.MeshMQPushConsumer; -import com.webank.eventmesh.connector.rocketmq.common.Constants; -import com.webank.eventmesh.connector.rocketmq.common.EventMeshConstants; -import com.webank.eventmesh.connector.rocketmq.config.ClientConfiguration; -import com.webank.eventmesh.connector.rocketmq.config.ConfigurationWraper; -import com.webank.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext; -import com.webank.eventmesh.connector.rocketmq.utils.OMSUtil; +import org.apache.eventmesh.connector.rocketmq.common.Constants; +import org.apache.eventmesh.connector.rocketmq.common.EventMeshConstants; +import org.apache.eventmesh.connector.rocketmq.config.ClientConfiguration; +import org.apache.eventmesh.connector.rocketmq.config.ConfigurationWraper; +import org.apache.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext; +import org.apache.eventmesh.connector.rocketmq.utils.OMSUtil; import io.openmessaging.api.*; import org.apache.rocketmq.client.impl.consumer.ConsumeMessageConcurrentlyService; import org.apache.rocketmq.client.impl.consumer.ConsumeMessageService; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/ConsumeRequest.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/ConsumeRequest.java similarity index 97% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/ConsumeRequest.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/ConsumeRequest.java index 7aefcdae73..a95accf81a 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/ConsumeRequest.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/ConsumeRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.domain; +package org.apache.eventmesh.connector.rocketmq.domain; import org.apache.rocketmq.client.impl.consumer.ProcessQueue; import org.apache.rocketmq.common.message.MessageExt; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/NonStandardKeys.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/NonStandardKeys.java similarity index 96% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/NonStandardKeys.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/NonStandardKeys.java index 453c1eca51..091ad8697a 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/NonStandardKeys.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/NonStandardKeys.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.domain; +package org.apache.eventmesh.connector.rocketmq.domain; public interface NonStandardKeys { String CONSUMER_GROUP = "rmq.consumer.group"; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/RocketMQConstants.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/RocketMQConstants.java similarity index 94% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/RocketMQConstants.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/RocketMQConstants.java index 181f89b0e2..60be685185 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/domain/RocketMQConstants.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/domain/RocketMQConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.domain; +package org.apache.eventmesh.connector.rocketmq.domain; public interface RocketMQConstants { diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java similarity index 96% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java index f0af34ad2a..39e8e067ea 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.patch; +package org.apache.eventmesh.connector.rocketmq.patch; import com.webank.eventmesh.api.AbstractContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java similarity index 95% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java index 2b505b00c0..468b14f568 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshConsumeConcurrentlyStatus.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.patch; +package org.apache.eventmesh.connector.rocketmq.patch; public enum EventMeshConsumeConcurrentlyStatus { /** diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java similarity index 98% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java index 854fa04a65..9e4fee4cb0 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/patch/EventMeshMessageListenerConcurrently.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.patch; +package org.apache.eventmesh.connector.rocketmq.patch; import org.apache.commons.collections4.CollectionUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/AbstractOMSProducer.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/AbstractOMSProducer.java similarity index 96% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/AbstractOMSProducer.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/AbstractOMSProducer.java index b47587f44a..df20c3cd4a 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/AbstractOMSProducer.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/AbstractOMSProducer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.producer; +package org.apache.eventmesh.connector.rocketmq.producer; -import com.webank.eventmesh.connector.rocketmq.utils.BeanUtils; -import com.webank.eventmesh.connector.rocketmq.utils.OMSUtil; -import com.webank.eventmesh.connector.rocketmq.config.ClientConfig; +import org.apache.eventmesh.connector.rocketmq.utils.BeanUtils; +import org.apache.eventmesh.connector.rocketmq.utils.OMSUtil; +import org.apache.eventmesh.connector.rocketmq.config.ClientConfig; import io.openmessaging.api.exception.OMSRuntimeException; import io.openmessaging.api.exception.OMSMessageFormatException; import io.openmessaging.api.exception.OMSTimeOutException; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/ProducerImpl.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/ProducerImpl.java similarity index 97% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/ProducerImpl.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/ProducerImpl.java index 89591df066..39a924ad8a 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/ProducerImpl.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/ProducerImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.producer; +package org.apache.eventmesh.connector.rocketmq.producer; -import com.webank.eventmesh.connector.rocketmq.utils.OMSUtil; +import org.apache.eventmesh.connector.rocketmq.utils.OMSUtil; import io.openmessaging.api.*; import io.openmessaging.api.exception.OMSRuntimeException; import org.apache.rocketmq.common.message.MessageClientIDSetter; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java similarity index 95% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java index 061854574f..f37fb8ad43 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/producer/RocketMQProducerImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.producer; +package org.apache.eventmesh.connector.rocketmq.producer; import com.webank.eventmesh.api.RRCallback; import com.webank.eventmesh.api.producer.MeshMQProducer; -import com.webank.eventmesh.connector.rocketmq.common.EventMeshConstants; -import com.webank.eventmesh.connector.rocketmq.config.ClientConfiguration; -import com.webank.eventmesh.connector.rocketmq.config.ConfigurationWraper; +import org.apache.eventmesh.connector.rocketmq.common.EventMeshConstants; +import org.apache.eventmesh.connector.rocketmq.config.ClientConfiguration; +import org.apache.eventmesh.connector.rocketmq.config.ConfigurationWraper; import io.openmessaging.api.*; import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.exception.MQClientException; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/promise/DefaultPromise.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/promise/DefaultPromise.java similarity index 99% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/promise/DefaultPromise.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/promise/DefaultPromise.java index 8469db4705..acd9c62beb 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/promise/DefaultPromise.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/promise/DefaultPromise.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.promise; +package org.apache.eventmesh.connector.rocketmq.promise; import io.openmessaging.api.Future; import io.openmessaging.api.FutureListener; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/promise/FutureState.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/promise/FutureState.java similarity index 95% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/promise/FutureState.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/promise/FutureState.java index 9903953a5c..1f364a89fc 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/promise/FutureState.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/promise/FutureState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.promise; +package org.apache.eventmesh.connector.rocketmq.promise; public enum FutureState { /** diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/utils/BeanUtils.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/BeanUtils.java similarity index 99% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/utils/BeanUtils.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/BeanUtils.java index e55c336e55..67c3349080 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/utils/BeanUtils.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/BeanUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.utils; +package org.apache.eventmesh.connector.rocketmq.utils; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.log.ClientLogger; diff --git a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/utils/OMSUtil.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/OMSUtil.java similarity index 99% rename from eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/utils/OMSUtil.java rename to eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/OMSUtil.java index d087acc3cb..3f2503b27f 100644 --- a/eventmesh-connector-rocketmq/src/main/java/com/webank/eventmesh/connector/rocketmq/utils/OMSUtil.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/utils/OMSUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.webank.eventmesh.connector.rocketmq.utils; +package org.apache.eventmesh.connector.rocketmq.utils; import com.webank.eventmesh.common.Constants; import io.openmessaging.api.Message; diff --git a/eventmesh-connector-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java b/eventmesh-connector-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java index b2d116dbd0..89e98db119 100644 --- a/eventmesh-connector-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java +++ b/eventmesh-connector-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java @@ -16,7 +16,7 @@ */ package org.apache.rocketmq.client.impl.consumer; -import com.webank.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext; +import org.apache.eventmesh.connector.rocketmq.patch.EventMeshConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; diff --git a/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.consumer.MeshMQPushConsumer b/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.consumer.MeshMQPushConsumer deleted file mode 100644 index 8e4788c49e..0000000000 --- a/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.consumer.MeshMQPushConsumer +++ /dev/null @@ -1 +0,0 @@ -com.webank.eventmesh.connector.rocketmq.consumer.RocketMQConsumerImpl \ No newline at end of file diff --git a/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.producer.MeshMQProducer b/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.producer.MeshMQProducer deleted file mode 100644 index 6fcd066b38..0000000000 --- a/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/com.webank.eventmesh.api.producer.MeshMQProducer +++ /dev/null @@ -1 +0,0 @@ -com.webank.eventmesh.connector.rocketmq.producer.RocketMQProducerImpl \ No newline at end of file diff --git a/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.consumer.MeshMQPushConsumer b/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.consumer.MeshMQPushConsumer new file mode 100644 index 0000000000..bce30c2e1f --- /dev/null +++ b/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.consumer.MeshMQPushConsumer @@ -0,0 +1 @@ +org.apache.eventmesh.connector.rocketmq.consumer.RocketMQConsumerImpl \ No newline at end of file diff --git a/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.producer.MeshMQProducer b/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.producer.MeshMQProducer new file mode 100644 index 0000000000..f6c9d0223d --- /dev/null +++ b/eventmesh-connector-rocketmq/src/main/resources/META-INF/services/org.apache.eventmesh.api.producer.MeshMQProducer @@ -0,0 +1 @@ +org.apache.eventmesh.connector.rocketmq.producer.RocketMQProducerImpl \ No newline at end of file diff --git a/eventmesh-connector-rocketmq/src/test/java/rocketmq/consumer/PushConsumerImplTest.java b/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java similarity index 95% rename from eventmesh-connector-rocketmq/src/test/java/rocketmq/consumer/PushConsumerImplTest.java rename to eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java index 630cdad03b..3ec8841eee 100644 --- a/eventmesh-connector-rocketmq/src/test/java/rocketmq/consumer/PushConsumerImplTest.java +++ b/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/consumer/PushConsumerImplTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rocketmq.consumer; +package org.apache.rocketmq.consumer; -import com.webank.eventmesh.connector.rocketmq.consumer.PushConsumerImpl; -import com.webank.eventmesh.connector.rocketmq.domain.NonStandardKeys; +import org.apache.eventmesh.connector.rocketmq.consumer.PushConsumerImpl; +import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys; import io.openmessaging.api.*; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; diff --git a/eventmesh-connector-rocketmq/src/test/java/rocketmq/producer/ProducerImplTest.java b/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java similarity index 97% rename from eventmesh-connector-rocketmq/src/test/java/rocketmq/producer/ProducerImplTest.java rename to eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java index b053213d14..e5dfaeb76e 100644 --- a/eventmesh-connector-rocketmq/src/test/java/rocketmq/producer/ProducerImplTest.java +++ b/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rocketmq.producer; +package org.apache.rocketmq.producer; -import com.webank.eventmesh.connector.rocketmq.producer.AbstractOMSProducer; +import org.apache.eventmesh.connector.rocketmq.producer.AbstractOMSProducer; import io.openmessaging.api.OMS; import io.openmessaging.api.MessagingAccessPoint; import io.openmessaging.api.Producer; diff --git a/eventmesh-connector-rocketmq/src/test/java/rocketmq/promise/DefaultPromiseTest.java b/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/promise/DefaultPromiseTest.java similarity index 100% rename from eventmesh-connector-rocketmq/src/test/java/rocketmq/promise/DefaultPromiseTest.java rename to eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/promise/DefaultPromiseTest.java diff --git a/eventmesh-connector-rocketmq/src/test/java/rocketmq/utils/BeanUtilsTest.java b/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java similarity index 94% rename from eventmesh-connector-rocketmq/src/test/java/rocketmq/utils/BeanUtilsTest.java rename to eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java index b5a221ed91..5cb3a87e78 100644 --- a/eventmesh-connector-rocketmq/src/test/java/rocketmq/utils/BeanUtilsTest.java +++ b/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/utils/BeanUtilsTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rocketmq.utils; +package org.apache.rocketmq.utils; -import com.webank.eventmesh.connector.rocketmq.config.ClientConfig; -import com.webank.eventmesh.connector.rocketmq.domain.NonStandardKeys; -import com.webank.eventmesh.connector.rocketmq.utils.BeanUtils; +import org.apache.eventmesh.connector.rocketmq.config.ClientConfig; +import org.apache.eventmesh.connector.rocketmq.domain.NonStandardKeys; +import org.apache.eventmesh.connector.rocketmq.utils.BeanUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.MessagingAccessPoint b/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.MessagingAccessPoint deleted file mode 100644 index 9174f1a18a..0000000000 --- a/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.MessagingAccessPoint +++ /dev/null @@ -1 +0,0 @@ -com.webank.eventmesh.connector.rocketmq.MessagingAccessPointImpl \ No newline at end of file diff --git a/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.producer.Producer b/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.producer.Producer deleted file mode 100644 index 7cfe963b5f..0000000000 --- a/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/io.openmessaging.producer.Producer +++ /dev/null @@ -1 +0,0 @@ -com.webank.eventmesh.connector.rocketmq.producer.ProducerImpl \ No newline at end of file diff --git a/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.MessagingAccessPoint b/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.MessagingAccessPoint new file mode 100644 index 0000000000..7347e69999 --- /dev/null +++ b/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.MessagingAccessPoint @@ -0,0 +1 @@ +org.apache.eventmesh.connector.rocketmq.MessagingAccessPointImpl \ No newline at end of file diff --git a/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer b/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer new file mode 100644 index 0000000000..5ea8a1853f --- /dev/null +++ b/eventmesh-connector-rocketmq/src/test/resources/META-INF/services/org.apache.io.openmessaging.producer.Producer @@ -0,0 +1 @@ +org.apache.eventmesh.connector.rocketmq.producer.ProducerImpl \ No newline at end of file From 60f7c96065d6c231c4e61469f6a6575ec413d8c8 Mon Sep 17 00:00:00 2001 From: Eason Chen Date: Mon, 19 Apr 2021 22:22:41 +0800 Subject: [PATCH 06/57] Update README.zh-CN.md --- README.zh-CN.md | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/README.zh-CN.md b/README.zh-CN.md index 6604ae83fa..e9603adfc7 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -39,28 +39,25 @@ Event Mesh的一般功能: eventmesh的通信协议更加简洁方便，详细内容，阅读更多[这里](docs/cn/instructions/eventmesh-runtime-protocol.zh-CN.md) ## RoadMap -| version | feature | -| ------- | ------------------------------------------------------------ | -| v1.0.0 | Support java-sdk , tcp pub/sub, http pub | -| v1.1.0 | Support RocketMQ as eventstore | -| v1.1.1 | Support https | -| v1.2.0 | Support Plug-in architecture, support http sub, support cloud native deploy | -| V1.3.0 | Support CloudEvents protocol | -| | Support Event transaction | -| | Support Event filter | -| | Support Promethus as metrics | -| | Support multi language SDK(c\go\python\wasm) | -| | Support Event orchestration | -| | Support Event governance | -| | Support Skywalking as tracing | -| | Support Spiffe as security | -| | Support Event replay | -| | Support openmessaging-storage-dledger as default event store | -| | Support Dashboard | -| | Support schema registry | -| | Support gRPC protocol | -| | Support MQTT protocol | -| | Support routing functions with triggers and bindings | +| version | feature | +| ---- | ---- | +| v1.0.0 |Support java-sdk , tcp pub/sub, http pub| +| v1.1.0 |Support RocketMQ as eventstore| +| v1.1.1 |Support https| +| v1.2.0 |Support OpenMessaging API，support Plug-in architecture, support http sub, support cloud native deploy| +| V1.3.0 |Support CloudEvents, Event Streaming| +| |Support Event function,triggers and bindings| +| |Support Event orchestration, Servelss workflow| +| |Support Event transaction| +| |Support Event schema| +| |Support Event governance, dashboard| +| |Support Event security| +| |Support multi language SDK(c\go\python\wasm)| +| |Support Promethus as metrics| +| |Support Skywalking as tracing| +| |Support streaming event store| +| |Support gRPC protocol| +| |Support MQTT protocol| ## 快速开始 1. 构建并部署event-store(RocketMQ), 请参见[说明](https://rocketmq.apache.org/docs/quick-start/) From 8146fe67d8780e982382c3147d993c187c936a23 Mon Sep 17 00:00:00 2001 From: sanchen Date: Tue, 20 Apr 2021 09:32:35 +0800 Subject: [PATCH 07/57] [ISSUE #282]Refactor 'eventmesh-starter' package name to org.apache --- eventmesh-starter/gradle.properties | 2 +- .../com/webank/eventmesh/starter/StartUp.java | 9 ------- .../org/apache/eventmesh/starter/StartUp.java | 26 +++++++++++++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 eventmesh-starter/src/main/java/com/webank/eventmesh/starter/StartUp.java create mode 100644 eventmesh-starter/src/main/java/org/apache/eventmesh/starter/StartUp.java diff --git a/eventmesh-starter/gradle.properties b/eventmesh-starter/gradle.properties index b0d1e599ec..8d6313096d 100644 --- a/eventmesh-starter/gradle.properties +++ b/eventmesh-starter/gradle.properties @@ -15,7 +15,7 @@ # limitations under the License. # -group=com.webank.eventmesh +group=org.apache.eventmesh version=1.2.0-SNAPSHOT defibus_version=1.0.1 mavenUserName= diff --git a/eventmesh-starter/src/main/java/com/webank/eventmesh/starter/StartUp.java b/eventmesh-starter/src/main/java/com/webank/eventmesh/starter/StartUp.java deleted file mode 100644 index 3771f27b21..0000000000 --- a/eventmesh-starter/src/main/java/com/webank/eventmesh/starter/StartUp.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.webank.eventmesh.starter; - -import com.webank.eventmesh.runtime.boot.EventMeshStartup; - -public class StartUp { - public static void main(String[] args) throws Exception { - EventMeshStartup.main(args); - } -} diff --git a/eventmesh-starter/src/main/java/org/apache/eventmesh/starter/StartUp.java b/eventmesh-starter/src/main/java/org/apache/eventmesh/starter/StartUp.java new file mode 100644 index 0000000000..4a2ab9d5ac --- /dev/null +++ b/eventmesh-starter/src/main/java/org/apache/eventmesh/starter/StartUp.java @@ -0,0 +1,26 @@ +/* + * 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.starter; + +import org.apache.eventmesh.runtime.boot.EventMeshStartup; + +public class StartUp { + public static void main(String[] args) throws Exception { + EventMeshStartup.main(args); + } +} From 71b6441cf0068634127d737a35b0433210369314 Mon Sep 17 00:00:00 2001 From: Eason Chen Date: Tue, 20 Apr 2021 14:19:30 +0800 Subject: [PATCH 08/57] Update codeStyle.xml --- style/codeStyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style/codeStyle.xml b/style/codeStyle.xml index 9b4e561f9c..6b60186f16 100644 --- a/style/codeStyle.xml +++ b/style/codeStyle.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - +