Merge pull request #286 from keranbingaa/develop

[ISSUE#277]refactor:refactor 'eventmesh-common' package name to org.apache close #277
apache · Apr 21, 2021 · 92cf430 · 92cf430
2 parents b8a5e80 + 8e12c9c
commit 92cf430
Show file tree

Hide file tree

Showing 75 changed files with 208 additions and 210 deletions.
diff --git 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/...om/webank/eventmesh/common/Constants.java → ...rg/apache/eventmesh/common/Constants.java b/...om/webank/eventmesh/common/Constants.java → ...rg/apache/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/EventMeshException.java → .../eventmesh/common/EventMeshException.java b/.../eventmesh/common/EventMeshException.java → .../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/...a/com/webank/eventmesh/common/IPUtil.java → ...a/org/apache/eventmesh/common/IPUtil.java b/...a/com/webank/eventmesh/common/IPUtil.java → ...a/org/apache/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/.../webank/eventmesh/common/LiteMessage.java → .../apache/eventmesh/common/LiteMessage.java b/.../webank/eventmesh/common/LiteMessage.java → .../apache/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/...k/eventmesh/common/ThreadPoolFactory.java → ...e/eventmesh/common/ThreadPoolFactory.java b/...k/eventmesh/common/ThreadPoolFactory.java → ...e/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/...m/webank/eventmesh/common/ThreadUtil.java → ...g/apache/eventmesh/common/ThreadUtil.java b/...m/webank/eventmesh/common/ThreadUtil.java → ...g/apache/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/command/HttpCommand.java → ...eventmesh/common/command/HttpCommand.java b/...eventmesh/common/command/HttpCommand.java → ...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/...sh/common/config/CommonConfiguration.java → ...sh/common/config/CommonConfiguration.java b/...sh/common/config/CommonConfiguration.java → ...sh/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/...sh/common/config/ConfigurationWraper.java → ...sh/common/config/ConfigurationWraper.java b/...sh/common/config/ConfigurationWraper.java → ...sh/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/...n/protocol/http/body/BaseRequestBody.java → ...n/protocol/http/body/BaseRequestBody.java b/...n/protocol/http/body/BaseRequestBody.java → ...n/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/.../protocol/http/body/BaseResponseBody.java → .../protocol/http/body/BaseResponseBody.java b/.../protocol/http/body/BaseResponseBody.java → .../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/...tmesh/common/protocol/http/body/Body.java → ...tmesh/common/protocol/http/body/Body.java b/...tmesh/common/protocol/http/body/Body.java → ...tmesh/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/...ttp/body/client/HeartbeatRequestBody.java → ...ttp/body/client/HeartbeatRequestBody.java b/...ttp/body/client/HeartbeatRequestBody.java → ...ttp/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/...tp/body/client/HeartbeatResponseBody.java → ...tp/body/client/HeartbeatResponseBody.java b/...tp/body/client/HeartbeatResponseBody.java → ...tp/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/...ocol/http/body/client/RegRequestBody.java → ...ocol/http/body/client/RegRequestBody.java b/...ocol/http/body/client/RegRequestBody.java → ...ocol/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/...col/http/body/client/RegResponseBody.java → ...col/http/body/client/RegResponseBody.java b/...col/http/body/client/RegResponseBody.java → ...col/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/...ttp/body/client/SubscribeRequestBody.java → ...ttp/body/client/SubscribeRequestBody.java b/...ttp/body/client/SubscribeRequestBody.java → ...ttp/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/...tp/body/client/SubscribeResponseBody.java → ...tp/body/client/SubscribeResponseBody.java b/...tp/body/client/SubscribeResponseBody.java → ...tp/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/...ol/http/body/client/UnRegRequestBody.java → ...ol/http/body/client/UnRegRequestBody.java b/...ol/http/body/client/UnRegRequestBody.java → ...ol/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/...l/http/body/client/UnRegResponseBody.java → ...l/http/body/client/UnRegResponseBody.java b/...l/http/body/client/UnRegResponseBody.java → ...l/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/...p/body/client/UnSubscribeRequestBody.java → ...p/body/client/UnSubscribeRequestBody.java b/...p/body/client/UnSubscribeRequestBody.java → ...p/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/.../body/client/UnSubscribeResponseBody.java → .../body/client/UnSubscribeResponseBody.java b/.../body/client/UnSubscribeResponseBody.java → .../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/.../body/message/PushMessageRequestBody.java → .../body/message/PushMessageRequestBody.java b/.../body/message/PushMessageRequestBody.java → .../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/...body/message/PushMessageResponseBody.java → ...body/message/PushMessageResponseBody.java b/...body/message/PushMessageResponseBody.java → ...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/...body/message/ReplyMessageRequestBody.java → ...body/message/ReplyMessageRequestBody.java b/...body/message/ReplyMessageRequestBody.java → ...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/...ody/message/ReplyMessageResponseBody.java → ...ody/message/ReplyMessageResponseBody.java b/...ody/message/ReplyMessageResponseBody.java → ...ody/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/.../message/SendMessageBatchRequestBody.java → .../message/SendMessageBatchRequestBody.java b/.../message/SendMessageBatchRequestBody.java → .../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/...message/SendMessageBatchResponseBody.java → ...message/SendMessageBatchResponseBody.java b/...message/SendMessageBatchResponseBody.java → ...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/...essage/SendMessageBatchV2RequestBody.java → ...essage/SendMessageBatchV2RequestBody.java b/...essage/SendMessageBatchV2RequestBody.java → ...essage/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;