adjust package path

WeBankFinTech · Aug 19, 2020 · 70c21b1 · 70c21b1
1 parent d206dbf
commit 70c21b1
Show file tree

Hide file tree

Showing 120 changed files with 362 additions and 346 deletions.
diff --git a/defibus-broker/conf/checkstyle.xml b/defibus-broker/conf/checkstyle.xml
@@ -241,7 +241,7 @@
         <module name="CustomImportOrder">
            <property name="customImportOrderRules"
                       value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS"/>
-            <property name="specialImportsRegExp" value="cn.webank"/>
+            <property name="specialImportsRegExp" value="com.webank"/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
             <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>

diff --git a/.../defibus/broker/DeFiBrokerController.java → .../defibus/broker/DeFiBrokerController.java b/.../defibus/broker/DeFiBrokerController.java → .../defibus/broker/DeFiBrokerController.java
@@ -15,26 +15,26 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker;
-
-import cn.webank.defibus.broker.client.AdjustQueueNumStrategy;
-import cn.webank.defibus.broker.client.DeFiConsumerManager;
-import cn.webank.defibus.broker.client.DeFiProducerManager;
-import cn.webank.defibus.broker.consumequeue.ClientRebalanceResultManager;
-import cn.webank.defibus.broker.consumequeue.ConsumeQueueManager;
-import cn.webank.defibus.broker.consumequeue.MessageRedirectManager;
-import cn.webank.defibus.broker.monitor.QueueListeningMonitor;
-import cn.webank.defibus.broker.net.DeFiBusBroker2Client;
-import cn.webank.defibus.broker.processor.DeFiAdminBrokerProcessor;
-import cn.webank.defibus.broker.processor.DeFiClientManageProcessor;
-import cn.webank.defibus.broker.processor.DeFiPullMessageProcessor;
-import cn.webank.defibus.broker.processor.DeFiReplyMessageProcessor;
-import cn.webank.defibus.broker.processor.DeFiSendMessageProcessor;
-import cn.webank.defibus.broker.topic.DeFiTopicConfigManager;
-import cn.webank.defibus.common.DeFiBusBrokerConfig;
-import cn.webank.defibus.common.DeFiBusConstant;
-import cn.webank.defibus.common.protocol.DeFiBusRequestCode;
-import cn.webank.defibus.common.util.ReflectUtil;
+package com.webank.defibus.broker;
+
+import com.webank.defibus.broker.client.AdjustQueueNumStrategy;
+import com.webank.defibus.broker.client.DeFiConsumerManager;
+import com.webank.defibus.broker.client.DeFiProducerManager;
+import com.webank.defibus.broker.consumequeue.ClientRebalanceResultManager;
+import com.webank.defibus.broker.consumequeue.ConsumeQueueManager;
+import com.webank.defibus.broker.consumequeue.MessageRedirectManager;
+import com.webank.defibus.broker.monitor.QueueListeningMonitor;
+import com.webank.defibus.broker.net.DeFiBusBroker2Client;
+import com.webank.defibus.broker.processor.DeFiAdminBrokerProcessor;
+import com.webank.defibus.broker.processor.DeFiClientManageProcessor;
+import com.webank.defibus.broker.processor.DeFiPullMessageProcessor;
+import com.webank.defibus.broker.processor.DeFiReplyMessageProcessor;
+import com.webank.defibus.broker.processor.DeFiSendMessageProcessor;
+import com.webank.defibus.broker.topic.DeFiTopicConfigManager;
+import com.webank.defibus.common.DeFiBusBrokerConfig;
+import com.webank.defibus.common.DeFiBusConstant;
+import com.webank.defibus.common.protocol.DeFiBusRequestCode;
+import com.webank.defibus.common.util.ReflectUtil;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

diff --git a/...us/broker/DeFiBrokerPathConfigHelper.java → ...us/broker/DeFiBrokerPathConfigHelper.java b/...us/broker/DeFiBrokerPathConfigHelper.java → ...us/broker/DeFiBrokerPathConfigHelper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker;
+package com.webank.defibus.broker;
 
 import java.io.File;
 import org.apache.rocketmq.broker.BrokerPathConfigHelper;

diff --git a/.../defibus/broker/DeFiBusBrokerStartup.java → .../defibus/broker/DeFiBusBrokerStartup.java b/.../defibus/broker/DeFiBusBrokerStartup.java → .../defibus/broker/DeFiBusBrokerStartup.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker;
+package com.webank.defibus.broker;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
-import cn.webank.defibus.common.DeFiBusBrokerConfig;
-import cn.webank.defibus.common.DeFiBusConstant;
+import com.webank.defibus.common.DeFiBusBrokerConfig;
+import com.webank.defibus.common.DeFiBusConstant;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/...broker/client/AdjustQueueNumStrategy.java → ...broker/client/AdjustQueueNumStrategy.java b/...broker/client/AdjustQueueNumStrategy.java → ...broker/client/AdjustQueueNumStrategy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.client;
+package com.webank.defibus.broker.client;
 
 import java.util.List;
 import java.util.Set;
@@ -25,6 +25,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 
+import com.webank.defibus.broker.DeFiBrokerController;
 import io.netty.channel.Channel;
 
 import org.apache.rocketmq.broker.client.ConsumerGroupInfo;
@@ -36,8 +37,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.common.DeFiBusConstant;
+import com.webank.defibus.common.DeFiBusConstant;
 
 public class AdjustQueueNumStrategy {
     private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);

diff --git a/.../broker/client/DeFiConsumerGroupInfo.java → .../broker/client/DeFiConsumerGroupInfo.java b/.../broker/client/DeFiConsumerGroupInfo.java → .../broker/client/DeFiConsumerGroupInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.client;
+package com.webank.defibus.broker.client;
 
 import io.netty.channel.Channel;
 import java.util.HashSet;

diff --git a/...us/broker/client/DeFiConsumerManager.java → ...us/broker/client/DeFiConsumerManager.java b/...us/broker/client/DeFiConsumerManager.java → ...us/broker/client/DeFiConsumerManager.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.client;
+package com.webank.defibus.broker.client;
 
-import cn.webank.defibus.common.util.ReflectUtil;
+import com.webank.defibus.common.util.ReflectUtil;
 import io.netty.channel.Channel;
 import java.util.Iterator;
 import java.util.Map;

diff --git a/...us/broker/client/DeFiProducerManager.java → ...us/broker/client/DeFiProducerManager.java b/...us/broker/client/DeFiProducerManager.java → ...us/broker/client/DeFiProducerManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.client;
+package com.webank.defibus.broker.client;
 
 import io.netty.channel.Channel;
 import java.util.HashMap;

diff --git a/...mequeue/ClientRebalanceResultManager.java → ...mequeue/ClientRebalanceResultManager.java b/...mequeue/ClientRebalanceResultManager.java → ...mequeue/ClientRebalanceResultManager.java
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.consumequeue;
+package com.webank.defibus.broker.consumequeue;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.DeFiBrokerController;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ker/consumequeue/ConsumeQueueManager.java → ...ker/consumequeue/ConsumeQueueManager.java b/...ker/consumequeue/ConsumeQueueManager.java → ...ker/consumequeue/ConsumeQueueManager.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.consumequeue;
+package com.webank.defibus.broker.consumequeue;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.broker.client.DeFiConsumerGroupInfo;
-import cn.webank.defibus.broker.client.DeFiConsumerManager;
-import cn.webank.defibus.common.DeFiBusConstant;
-import cn.webank.defibus.common.protocol.DeFiBusTopicConfig;
+import com.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.client.DeFiConsumerGroupInfo;
+import com.webank.defibus.broker.client.DeFiConsumerManager;
+import com.webank.defibus.common.DeFiBusConstant;
+import com.webank.defibus.common.protocol.DeFiBusTopicConfig;
 import io.netty.channel.Channel;
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/...r/consumequeue/ConsumeQueueWaterMark.java → ...r/consumequeue/ConsumeQueueWaterMark.java b/...r/consumequeue/ConsumeQueueWaterMark.java → ...r/consumequeue/ConsumeQueueWaterMark.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.consumequeue;
+package com.webank.defibus.broker.consumequeue;
 
 public class ConsumeQueueWaterMark {
     private String consumerGroup;

diff --git a/.../consumequeue/MessageRedirectManager.java → .../consumequeue/MessageRedirectManager.java b/.../consumequeue/MessageRedirectManager.java → .../consumequeue/MessageRedirectManager.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.consumequeue;
+package com.webank.defibus.broker.consumequeue;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.broker.DeFiBrokerPathConfigHelper;
+import com.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.DeFiBrokerPathConfigHelper;
 import com.alibaba.fastjson.JSON;
 import java.io.File;
 import java.util.ArrayList;
@@ -28,6 +28,7 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.ConfigManager;
 import org.apache.rocketmq.common.constant.LoggerName;

diff --git a/...broker/monitor/QueueListeningMonitor.java → ...broker/monitor/QueueListeningMonitor.java b/...broker/monitor/QueueListeningMonitor.java → ...broker/monitor/QueueListeningMonitor.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.monitor;
+package com.webank.defibus.broker.monitor;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.DeFiBrokerController;
 import io.netty.channel.Channel;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ibus/broker/net/DeFiBusBroker2Client.java → ...ibus/broker/net/DeFiBusBroker2Client.java b/...ibus/broker/net/DeFiBusBroker2Client.java → ...ibus/broker/net/DeFiBusBroker2Client.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.net;
+package com.webank.defibus.broker.net;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.common.protocol.DeFiBusRequestCode;
-import cn.webank.defibus.common.protocol.header.NotifyTopicChangedRequestHeader;
-import cn.webank.defibus.common.protocol.header.ReplyMessageRequestHeader;
+import com.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.common.protocol.DeFiBusRequestCode;
+import com.webank.defibus.common.protocol.header.NotifyTopicChangedRequestHeader;
+import com.webank.defibus.common.protocol.header.ReplyMessageRequestHeader;
 import io.netty.channel.Channel;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.common.message.MessageExt;

diff --git a/...broker/plugin/DeFiPluginMessageStore.java → ...broker/plugin/DeFiPluginMessageStore.java b/...broker/plugin/DeFiPluginMessageStore.java → ...broker/plugin/DeFiPluginMessageStore.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.plugin;
+package com.webank.defibus.broker.plugin;
 
-import cn.webank.defibus.broker.consumequeue.ConsumeQueueManager;
-import cn.webank.defibus.common.DeFiBusConstant;
+import com.webank.defibus.broker.consumequeue.ConsumeQueueManager;
+import com.webank.defibus.common.DeFiBusConstant;
 import org.apache.rocketmq.broker.plugin.AbstractPluginMessageStore;
 import org.apache.rocketmq.broker.plugin.MessageStorePluginContext;
 import org.apache.rocketmq.common.constant.LoggerName;

diff --git a/...broker/plugin/PluginStoreStatService.java → ...broker/plugin/PluginStoreStatService.java b/...broker/plugin/PluginStoreStatService.java → ...broker/plugin/PluginStoreStatService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.plugin;
+package com.webank.defibus.broker.plugin;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/...r/processor/DeFiAdminBrokerProcessor.java → ...r/processor/DeFiAdminBrokerProcessor.java b/...r/processor/DeFiAdminBrokerProcessor.java → ...r/processor/DeFiAdminBrokerProcessor.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.processor;
-
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.common.DeFiBusVersion;
-import cn.webank.defibus.common.admin.DeFiBusConsumeStats;
-import cn.webank.defibus.common.admin.DeFiBusOffsetWrapper;
-import cn.webank.defibus.common.protocol.DeFiBusRequestCode;
-import cn.webank.defibus.common.protocol.DeFiBusTopicConfig;
+package com.webank.defibus.broker.processor;
+
+import com.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.common.DeFiBusVersion;
+import com.webank.defibus.common.admin.DeFiBusConsumeStats;
+import com.webank.defibus.common.admin.DeFiBusOffsetWrapper;
+import com.webank.defibus.common.protocol.DeFiBusRequestCode;
+import com.webank.defibus.common.protocol.DeFiBusTopicConfig;
 import io.netty.channel.ChannelHandlerContext;
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/.../processor/DeFiClientManageProcessor.java → .../processor/DeFiClientManageProcessor.java b/.../processor/DeFiClientManageProcessor.java → .../processor/DeFiClientManageProcessor.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.processor;
+package com.webank.defibus.broker.processor;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.broker.client.DeFiConsumerGroupInfo;
-import cn.webank.defibus.broker.client.DeFiConsumerManager;
-import cn.webank.defibus.common.protocol.DeFiBusRequestCode;
-import cn.webank.defibus.common.protocol.header.GetConsumerListByGroupAndTopicRequestHeader;
+import com.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.client.DeFiConsumerGroupInfo;
+import com.webank.defibus.broker.client.DeFiConsumerManager;
+import com.webank.defibus.common.protocol.DeFiBusRequestCode;
+import com.webank.defibus.common.protocol.header.GetConsumerListByGroupAndTopicRequestHeader;
 import io.netty.channel.ChannelHandlerContext;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...r/processor/DeFiPullMessageProcessor.java → ...r/processor/DeFiPullMessageProcessor.java b/...r/processor/DeFiPullMessageProcessor.java → ...r/processor/DeFiPullMessageProcessor.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.processor;
+package com.webank.defibus.broker.processor;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.DeFiBrokerController;
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.rocketmq.broker.BrokerController;
 import org.apache.rocketmq.broker.client.ClientChannelInfo;

diff --git a/.../processor/DeFiReplyMessageProcessor.java → .../processor/DeFiReplyMessageProcessor.java b/.../processor/DeFiReplyMessageProcessor.java → .../processor/DeFiReplyMessageProcessor.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.processor;
-
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.broker.plugin.DeFiPluginMessageStore;
-import cn.webank.defibus.common.DeFiBusConstant;
-import cn.webank.defibus.common.message.DeFiBusMessageConst;
-import cn.webank.defibus.common.protocol.DeFiBusRequestCode;
-import cn.webank.defibus.common.protocol.header.ReplyMessageRequestHeader;
+package com.webank.defibus.broker.processor;
+
+import com.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.plugin.DeFiPluginMessageStore;
+import com.webank.defibus.common.DeFiBusConstant;
+import com.webank.defibus.common.message.DeFiBusMessageConst;
+import com.webank.defibus.common.protocol.DeFiBusRequestCode;
+import com.webank.defibus.common.protocol.header.ReplyMessageRequestHeader;
 import io.netty.channel.ChannelHandlerContext;
 import java.net.SocketAddress;
 import java.util.Map;

diff --git a/...r/processor/DeFiSendMessageProcessor.java → ...r/processor/DeFiSendMessageProcessor.java b/...r/processor/DeFiSendMessageProcessor.java → ...r/processor/DeFiSendMessageProcessor.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker.processor;
+package com.webank.defibus.broker.processor;
 
-import cn.webank.defibus.broker.DeFiBrokerController;
-import cn.webank.defibus.broker.client.DeFiProducerManager;
-import cn.webank.defibus.broker.consumequeue.ConsumeQueueManager;
-import cn.webank.defibus.broker.consumequeue.ConsumeQueueWaterMark;
-import cn.webank.defibus.broker.consumequeue.MessageRedirectManager;
-import cn.webank.defibus.common.DeFiBusConstant;
-import cn.webank.defibus.common.protocol.DeFiBusResponseCode;
+import com.webank.defibus.broker.DeFiBrokerController;
+import com.webank.defibus.broker.client.DeFiProducerManager;
+import com.webank.defibus.broker.consumequeue.ConsumeQueueManager;
+import com.webank.defibus.broker.consumequeue.ConsumeQueueWaterMark;
+import com.webank.defibus.broker.consumequeue.MessageRedirectManager;
+import com.webank.defibus.common.DeFiBusConstant;
+import com.webank.defibus.common.protocol.DeFiBusResponseCode;
 import io.netty.channel.ChannelHandlerContext;
 import java.util.Map;
 import org.apache.rocketmq.broker.BrokerController;

diff --git a/.../broker/topic/DeFiTopicConfigManager.java → .../broker/topic/DeFiTopicConfigManager.java b/.../broker/topic/DeFiTopicConfigManager.java → .../broker/topic/DeFiTopicConfigManager.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.webank.defibus.broker.topic;
+package com.webank.defibus.broker.topic;
 
-import cn.webank.defibus.common.protocol.DeFiBusTopicConfig;
-import cn.webank.defibus.common.protocol.body.DeFiBusTopicConfigSerializeWrapper;
+import com.webank.defibus.common.protocol.DeFiBusTopicConfig;
+import com.webank.defibus.common.protocol.body.DeFiBusTopicConfigSerializeWrapper;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...webank/defibus/broker/BrokerFuseTest.java → ...webank/defibus/broker/BrokerFuseTest.java b/...webank/defibus/broker/BrokerFuseTest.java → ...webank/defibus/broker/BrokerFuseTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package cn.webank.defibus.broker;
-
-import cn.webank.defibus.broker.client.DeFiConsumerGroupInfo;
-import cn.webank.defibus.broker.consumequeue.ConsumeQueueManager;
-import cn.webank.defibus.broker.consumequeue.ConsumeQueueWaterMark;
-import cn.webank.defibus.broker.processor.DeFiSendMessageProcessor;
-import cn.webank.defibus.common.DeFiBusBrokerConfig;
-import cn.webank.defibus.common.protocol.DeFiBusResponseCode;
+package com.webank.defibus.broker;
+
+import com.webank.defibus.broker.client.DeFiConsumerGroupInfo;
+import com.webank.defibus.broker.consumequeue.ConsumeQueueManager;
+import com.webank.defibus.broker.consumequeue.ConsumeQueueWaterMark;
+import com.webank.defibus.broker.processor.DeFiSendMessageProcessor;
+import com.webank.defibus.common.DeFiBusBrokerConfig;
+import com.webank.defibus.common.protocol.DeFiBusResponseCode;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import java.lang.reflect.Field;