diff --git a/defibus-broker/conf/checkstyle.xml b/defibus-broker/conf/checkstyle.xml index 3d02411..01b058d 100644 --- a/defibus-broker/conf/checkstyle.xml +++ b/defibus-broker/conf/checkstyle.xml @@ -241,7 +241,7 @@ - + diff --git a/defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBrokerController.java b/defibus-broker/src/main/java/com/webank/defibus/broker/DeFiBrokerController.java similarity index 93% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBrokerController.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/DeFiBrokerController.java index 76eb754..4a4db14 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBrokerController.java +++ b/defibus-broker/src/main/java/com/webank/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/defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBrokerPathConfigHelper.java b/defibus-broker/src/main/java/com/webank/defibus/broker/DeFiBrokerPathConfigHelper.java similarity index 97% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBrokerPathConfigHelper.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/DeFiBrokerPathConfigHelper.java index ceb5a27..767d58e 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBrokerPathConfigHelper.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/src/main/java/cn/webank/defibus/broker/DeFiBusBrokerStartup.java b/defibus-broker/src/main/java/com/webank/defibus/broker/DeFiBusBrokerStartup.java similarity index 98% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBusBrokerStartup.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/DeFiBusBrokerStartup.java index 8c59ffc..c99af44 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/DeFiBusBrokerStartup.java +++ b/defibus-broker/src/main/java/com/webank/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/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java b/defibus-broker/src/main/java/com/webank/defibus/broker/client/AdjustQueueNumStrategy.java similarity index 99% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/client/AdjustQueueNumStrategy.java index ed89963..a6d3354 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiConsumerGroupInfo.java b/defibus-broker/src/main/java/com/webank/defibus/broker/client/DeFiConsumerGroupInfo.java similarity index 99% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiConsumerGroupInfo.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/client/DeFiConsumerGroupInfo.java index c76e492..5bc5b99 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiConsumerGroupInfo.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiConsumerManager.java b/defibus-broker/src/main/java/com/webank/defibus/broker/client/DeFiConsumerManager.java similarity index 99% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiConsumerManager.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/client/DeFiConsumerManager.java index 4da50e9..769280f 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiConsumerManager.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiProducerManager.java b/defibus-broker/src/main/java/com/webank/defibus/broker/client/DeFiProducerManager.java similarity index 98% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiProducerManager.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/client/DeFiProducerManager.java index dcd6812..e4cc422 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/client/DeFiProducerManager.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ClientRebalanceResultManager.java b/defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/ClientRebalanceResultManager.java similarity index 96% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ClientRebalanceResultManager.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/ClientRebalanceResultManager.java index 7edd4f7..d7300b1 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ClientRebalanceResultManager.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/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/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueManager.java b/defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/ConsumeQueueManager.java similarity index 98% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueManager.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/ConsumeQueueManager.java index dda1113..5710f36 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueManager.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueWaterMark.java b/defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/ConsumeQueueWaterMark.java similarity index 98% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueWaterMark.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/ConsumeQueueWaterMark.java index 93afb47..bd68419 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueWaterMark.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/MessageRedirectManager.java b/defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/MessageRedirectManager.java similarity index 98% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/MessageRedirectManager.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/consumequeue/MessageRedirectManager.java index 092c988..6858049 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/consumequeue/MessageRedirectManager.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/monitor/QueueListeningMonitor.java b/defibus-broker/src/main/java/com/webank/defibus/broker/monitor/QueueListeningMonitor.java similarity index 98% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/monitor/QueueListeningMonitor.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/monitor/QueueListeningMonitor.java index 9ed0702..9f5b2f7 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/monitor/QueueListeningMonitor.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/net/DeFiBusBroker2Client.java b/defibus-broker/src/main/java/com/webank/defibus/broker/net/DeFiBusBroker2Client.java similarity index 91% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/net/DeFiBusBroker2Client.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/net/DeFiBusBroker2Client.java index 37827d8..728eaf1 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/net/DeFiBusBroker2Client.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/plugin/DeFiPluginMessageStore.java b/defibus-broker/src/main/java/com/webank/defibus/broker/plugin/DeFiPluginMessageStore.java similarity index 96% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/plugin/DeFiPluginMessageStore.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/plugin/DeFiPluginMessageStore.java index fee6736..f488ee1 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/plugin/DeFiPluginMessageStore.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/plugin/PluginStoreStatService.java b/defibus-broker/src/main/java/com/webank/defibus/broker/plugin/PluginStoreStatService.java similarity index 99% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/plugin/PluginStoreStatService.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/plugin/PluginStoreStatService.java index 01e987e..5f09e4a 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/plugin/PluginStoreStatService.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiAdminBrokerProcessor.java b/defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiAdminBrokerProcessor.java similarity index 97% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiAdminBrokerProcessor.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiAdminBrokerProcessor.java index 51af081..2ff2d6a 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiAdminBrokerProcessor.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiClientManageProcessor.java b/defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiClientManageProcessor.java similarity index 93% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiClientManageProcessor.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiClientManageProcessor.java index 159b464..babff9a 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiClientManageProcessor.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiPullMessageProcessor.java b/defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiPullMessageProcessor.java similarity index 97% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiPullMessageProcessor.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiPullMessageProcessor.java index caf77e0..d4599b4 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiPullMessageProcessor.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiReplyMessageProcessor.java b/defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiReplyMessageProcessor.java similarity index 98% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiReplyMessageProcessor.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiReplyMessageProcessor.java index 189d052..6e7fe9b 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiReplyMessageProcessor.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiSendMessageProcessor.java b/defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiSendMessageProcessor.java similarity index 94% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiSendMessageProcessor.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/processor/DeFiSendMessageProcessor.java index 7139277..5849593 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/processor/DeFiSendMessageProcessor.java +++ b/defibus-broker/src/main/java/com/webank/defibus/broker/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/defibus-broker/src/main/java/cn/webank/defibus/broker/topic/DeFiTopicConfigManager.java b/defibus-broker/src/main/java/com/webank/defibus/broker/topic/DeFiTopicConfigManager.java similarity index 97% rename from defibus-broker/src/main/java/cn/webank/defibus/broker/topic/DeFiTopicConfigManager.java rename to defibus-broker/src/main/java/com/webank/defibus/broker/topic/DeFiTopicConfigManager.java index 52e03ee..f09bb2a 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/topic/DeFiTopicConfigManager.java +++ b/defibus-broker/src/main/java/com/webank/defibus/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/defibus-broker/src/test/java/cn/webank/defibus/broker/BrokerFuseTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/BrokerFuseTest.java similarity index 95% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/BrokerFuseTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/BrokerFuseTest.java index 20d2d9c..1f9ca49 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/BrokerFuseTest.java +++ b/defibus-broker/src/test/java/com/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; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/DeFiBrokerControllerTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/DeFiBrokerControllerTest.java similarity index 95% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/DeFiBrokerControllerTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/DeFiBrokerControllerTest.java index e0c436c..73477a7 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/DeFiBrokerControllerTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/DeFiBrokerControllerTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.broker; +package com.webank.defibus.broker; -import cn.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.common.DeFiBusBrokerConfig; import java.io.File; import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.common.UtilAll; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/DeFiBusBrokerStartupTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/DeFiBusBrokerStartupTest.java similarity index 97% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/DeFiBusBrokerStartupTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/DeFiBusBrokerStartupTest.java index f67ea67..93bc3ba 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/DeFiBusBrokerStartupTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/DeFiBusBrokerStartupTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.broker; +package com.webank.defibus.broker; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategyTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/client/AdjustQueueNumStrategyTest.java similarity index 94% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategyTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/client/AdjustQueueNumStrategyTest.java index 09cd0c7..81e2376 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategyTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/client/AdjustQueueNumStrategyTest.java @@ -1,7 +1,7 @@ -package cn.webank.defibus.broker.client; +package com.webank.defibus.broker.client; -import cn.webank.defibus.broker.DeFiBrokerController; -import cn.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.common.TopicConfig; import org.apache.rocketmq.remoting.netty.NettyClientConfig; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/client/DeFiConsumerManagerTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/client/DeFiConsumerManagerTest.java similarity index 96% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/client/DeFiConsumerManagerTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/client/DeFiConsumerManagerTest.java index ac5164a..3a29ae1 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/client/DeFiConsumerManagerTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/client/DeFiConsumerManagerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package cn.webank.defibus.broker.client; +package com.webank.defibus.broker.client; -import cn.webank.defibus.broker.DeFiBrokerController; -import cn.webank.defibus.common.DeFiBusBrokerConfig; -import cn.webank.defibus.common.util.ReflectUtil; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.common.util.ReflectUtil; import io.netty.channel.Channel; import java.util.HashSet; import java.util.Set; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/client/DeFiProducerManagerTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/client/DeFiProducerManagerTest.java similarity index 98% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/client/DeFiProducerManagerTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/client/DeFiProducerManagerTest.java index ab13d85..4d2cef8 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/client/DeFiProducerManagerTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/client/DeFiProducerManagerTest.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/defibus-broker/src/test/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueManagerTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/consumequeue/ConsumeQueueManagerTest.java similarity index 97% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueManagerTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/consumequeue/ConsumeQueueManagerTest.java index c85d2e0..8d7d1b0 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/consumequeue/ConsumeQueueManagerTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/consumequeue/ConsumeQueueManagerTest.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.common.DeFiBusBrokerConfig; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; import io.netty.channel.Channel; import java.util.HashSet; import java.util.Set; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/consumequeue/MessageRedirectManagerTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/consumequeue/MessageRedirectManagerTest.java similarity index 94% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/consumequeue/MessageRedirectManagerTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/consumequeue/MessageRedirectManagerTest.java index 1884b27..25ba453 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/consumequeue/MessageRedirectManagerTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/consumequeue/MessageRedirectManagerTest.java @@ -1,13 +1,14 @@ -package cn.webank.defibus.broker.consumequeue; +package com.webank.defibus.broker.consumequeue; -import cn.webank.defibus.broker.DeFiBrokerController; -import cn.webank.defibus.common.DeFiBusBrokerConfig; -import cn.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.common.DeFiBusConstant; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; + import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.message.Message; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/monitor/QueueListeningMonitorTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/monitor/QueueListeningMonitorTest.java similarity index 93% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/monitor/QueueListeningMonitorTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/monitor/QueueListeningMonitorTest.java index c062162..5d4fb4d 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/monitor/QueueListeningMonitorTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/monitor/QueueListeningMonitorTest.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package cn.webank.defibus.broker.monitor; +package com.webank.defibus.broker.monitor; -import cn.webank.defibus.broker.DeFiBrokerController; -import cn.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; import java.lang.reflect.Field; + import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.remoting.netty.NettyClientConfig; import org.apache.rocketmq.remoting.netty.NettyServerConfig; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/plugin/DeFiPluginMessageStoreTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/plugin/DeFiPluginMessageStoreTest.java similarity index 95% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/plugin/DeFiPluginMessageStoreTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/plugin/DeFiPluginMessageStoreTest.java index f7eeb92..379d54d 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/plugin/DeFiPluginMessageStoreTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/plugin/DeFiPluginMessageStoreTest.java @@ -1,8 +1,9 @@ -package cn.webank.defibus.broker.plugin; +package com.webank.defibus.broker.plugin; -import cn.webank.defibus.broker.DeFiBrokerController; -import cn.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; import java.lang.reflect.Field; + import org.apache.rocketmq.broker.plugin.MessageStorePluginContext; import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.remoting.netty.NettyClientConfig; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/plugin/PluginStoreStatServiceTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/plugin/PluginStoreStatServiceTest.java similarity index 95% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/plugin/PluginStoreStatServiceTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/plugin/PluginStoreStatServiceTest.java index 7fb1428..c0f5df5 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/plugin/PluginStoreStatServiceTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/plugin/PluginStoreStatServiceTest.java @@ -1,4 +1,4 @@ -package cn.webank.defibus.broker.plugin; +package com.webank.defibus.broker.plugin; import org.junit.After; import org.junit.Before; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiAdminBrokerProcessorTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiAdminBrokerProcessorTest.java similarity index 96% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiAdminBrokerProcessorTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiAdminBrokerProcessorTest.java index 39604c5..470291a 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiAdminBrokerProcessorTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiAdminBrokerProcessorTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * 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.common.DeFiBusBrokerConfig; -import cn.webank.defibus.common.admin.DeFiBusConsumeStats; -import cn.webank.defibus.common.protocol.DeFiBusRequestCode; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.common.admin.DeFiBusConsumeStats; +import com.webank.defibus.common.protocol.DeFiBusRequestCode; import io.netty.channel.ChannelHandlerContext; import java.nio.ByteBuffer; import org.apache.rocketmq.common.BrokerConfig; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiClientManageProcessorTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiClientManageProcessorTest.java similarity index 95% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiClientManageProcessorTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiClientManageProcessorTest.java index fe73c0d..2f48c60 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiClientManageProcessorTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiClientManageProcessorTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * 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.common.DeFiBusBrokerConfig; -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.common.DeFiBusBrokerConfig; +import com.webank.defibus.common.protocol.DeFiBusRequestCode; +import com.webank.defibus.common.protocol.header.GetConsumerListByGroupAndTopicRequestHeader; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import java.util.HashSet; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiPullMessageProcessorTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiPullMessageProcessorTest.java similarity index 97% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiPullMessageProcessorTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiPullMessageProcessorTest.java index 5a6d81c..261d7ae 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiPullMessageProcessorTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiPullMessageProcessorTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * 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.common.DeFiBusBrokerConfig; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import java.util.HashSet; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiReplyMessageProcessorTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiReplyMessageProcessorTest.java similarity index 94% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiReplyMessageProcessorTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiReplyMessageProcessorTest.java index fb58552..6722be0 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiReplyMessageProcessorTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiReplyMessageProcessorTest.java @@ -15,14 +15,14 @@ * 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.net.DeFiBusBroker2Client; -import cn.webank.defibus.common.DeFiBusBrokerConfig; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.protocol.DeFiBusRequestCode; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.broker.client.DeFiProducerManager; +import com.webank.defibus.broker.net.DeFiBusBroker2Client; +import com.webank.defibus.common.DeFiBusBrokerConfig; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.protocol.DeFiBusRequestCode; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import java.net.InetSocketAddress; diff --git a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiSendMessageProcessorTest.java b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiSendMessageProcessorTest.java similarity index 97% rename from defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiSendMessageProcessorTest.java rename to defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiSendMessageProcessorTest.java index 3e4f99e..974e383 100644 --- a/defibus-broker/src/test/java/cn/webank/defibus/broker/processor/DeFiSendMessageProcessorTest.java +++ b/defibus-broker/src/test/java/com/webank/defibus/broker/processor/DeFiSendMessageProcessorTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * 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.common.DeFiBusBrokerConfig; +import com.webank.defibus.broker.DeFiBrokerController; +import com.webank.defibus.common.DeFiBusBrokerConfig; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import java.net.InetSocketAddress; diff --git a/defibus-client/conf/checkstyle.xml b/defibus-client/conf/checkstyle.xml index 3d02411..01b058d 100644 --- a/defibus-client/conf/checkstyle.xml +++ b/defibus-client/conf/checkstyle.xml @@ -241,7 +241,7 @@ - + diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/DeFiBusClientManager.java b/defibus-client/src/main/java/com/webank/defibus/client/DeFiBusClientManager.java similarity index 95% rename from defibus-client/src/main/java/cn/webank/defibus/client/DeFiBusClientManager.java rename to defibus-client/src/main/java/com/webank/defibus/client/DeFiBusClientManager.java index 1c76d16..78cd570 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/DeFiBusClientManager.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/DeFiBusClientManager.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package cn.webank.defibus.client; +package com.webank.defibus.client; -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.common.util.ReflectUtil; +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.common.util.ReflectUtil; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.apache.rocketmq.client.ClientConfig; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/common/DeFiBusClientConfig.java b/defibus-client/src/main/java/com/webank/defibus/client/common/DeFiBusClientConfig.java similarity index 99% rename from defibus-client/src/main/java/cn/webank/defibus/client/common/DeFiBusClientConfig.java rename to defibus-client/src/main/java/com/webank/defibus/client/common/DeFiBusClientConfig.java index 73e0353..fb68313 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/common/DeFiBusClientConfig.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/common/DeFiBusClientConfig.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.client.common; +package com.webank.defibus.client.common; -import cn.webank.defibus.common.DeFiBusVersion; +import com.webank.defibus.common.DeFiBusVersion; import org.apache.rocketmq.remoting.RPCHook; public class DeFiBusClientConfig { diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/common/DeFiBusClientUtil.java b/defibus-client/src/main/java/com/webank/defibus/client/common/DeFiBusClientUtil.java similarity index 96% rename from defibus-client/src/main/java/cn/webank/defibus/client/common/DeFiBusClientUtil.java rename to defibus-client/src/main/java/com/webank/defibus/client/common/DeFiBusClientUtil.java index 664f495..e252d3a 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/common/DeFiBusClientUtil.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/common/DeFiBusClientUtil.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.client.common; +package com.webank.defibus.client.common; -import cn.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.DeFiBusConstant; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.common.message.MessageExt; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/DeFiBusClientAPIImpl.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/DeFiBusClientAPIImpl.java similarity index 97% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/DeFiBusClientAPIImpl.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/DeFiBusClientAPIImpl.java index a14abe5..cb62411 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/DeFiBusClientAPIImpl.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/DeFiBusClientAPIImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl; +package com.webank.defibus.client.impl; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.protocol.DeFiBusRequestCode; -import cn.webank.defibus.common.protocol.body.GetConsumerListByGroupAndTopicResponseBody; -import cn.webank.defibus.common.protocol.header.GetConsumerListByGroupAndTopicRequestHeader; -import cn.webank.defibus.common.util.ReflectUtil; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.protocol.DeFiBusRequestCode; +import com.webank.defibus.common.protocol.body.GetConsumerListByGroupAndTopicResponseBody; +import com.webank.defibus.common.protocol.header.GetConsumerListByGroupAndTopicRequestHeader; +import com.webank.defibus.common.util.ReflectUtil; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.apache.rocketmq.client.ClientConfig; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/DeFiBusClientRemotingProcessor.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/DeFiBusClientRemotingProcessor.java similarity index 92% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/DeFiBusClientRemotingProcessor.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/DeFiBusClientRemotingProcessor.java index 4feace3..4bf7178 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/DeFiBusClientRemotingProcessor.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/DeFiBusClientRemotingProcessor.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl; - -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.client.impl.producer.RRResponseFuture; -import cn.webank.defibus.client.impl.producer.ResponseTable; -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.NotifyTopicChangedRequestHeader; -import cn.webank.defibus.common.protocol.header.ReplyMessageRequestHeader; +package com.webank.defibus.client.impl; + +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.client.impl.producer.RRResponseFuture; +import com.webank.defibus.client.impl.producer.ResponseTable; +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.NotifyTopicChangedRequestHeader; +import com.webank.defibus.common.protocol.header.ReplyMessageRequestHeader; import io.netty.channel.ChannelHandlerContext; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/consumer/DeFiBusPullMessageService.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/consumer/DeFiBusPullMessageService.java similarity index 97% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/consumer/DeFiBusPullMessageService.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/consumer/DeFiBusPullMessageService.java index afbf3a4..992fcf9 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/consumer/DeFiBusPullMessageService.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/consumer/DeFiBusPullMessageService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.consumer; +package com.webank.defibus.client.impl.consumer; -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.common.util.ReflectUtil; +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.common.util.ReflectUtil; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/factory/DeFiBusClientInstance.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/factory/DeFiBusClientInstance.java similarity index 95% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/factory/DeFiBusClientInstance.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/factory/DeFiBusClientInstance.java index 888d383..5058124 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/factory/DeFiBusClientInstance.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/factory/DeFiBusClientInstance.java @@ -15,19 +15,20 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.factory; +package com.webank.defibus.client.impl.factory; -import cn.webank.defibus.client.impl.DeFiBusClientAPIImpl; -import cn.webank.defibus.client.impl.DeFiBusClientRemotingProcessor; -import cn.webank.defibus.client.impl.consumer.DeFiBusPullMessageService; -import cn.webank.defibus.common.protocol.DeFiBusRequestCode; -import cn.webank.defibus.common.util.ReflectUtil; +import com.webank.defibus.client.impl.DeFiBusClientAPIImpl; +import com.webank.defibus.client.impl.DeFiBusClientRemotingProcessor; +import com.webank.defibus.client.impl.consumer.DeFiBusPullMessageService; +import com.webank.defibus.common.protocol.DeFiBusRequestCode; +import com.webank.defibus.common.util.ReflectUtil; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; + import org.apache.commons.lang3.RandomUtils; import org.apache.rocketmq.client.ClientConfig; import org.apache.rocketmq.client.impl.ClientRemotingProcessor; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/hook/DeFiBusClientHookFactory.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/hook/DeFiBusClientHookFactory.java similarity index 97% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/hook/DeFiBusClientHookFactory.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/hook/DeFiBusClientHookFactory.java index 8b2c74d..5905a2b 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/hook/DeFiBusClientHookFactory.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/hook/DeFiBusClientHookFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.hook; +package com.webank.defibus.client.impl.hook; import org.apache.rocketmq.remoting.RPCHook; import org.apache.rocketmq.remoting.protocol.RemotingCommand; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/DeFiBusProducerImpl.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/DeFiBusProducerImpl.java similarity index 97% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/DeFiBusProducerImpl.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/producer/DeFiBusProducerImpl.java index f5e7b01..69465e1 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/DeFiBusProducerImpl.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/DeFiBusProducerImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; - -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.DeFiBusErrorCode; -import cn.webank.defibus.common.exception.DeFiBusException; -import cn.webank.defibus.common.protocol.DeFiBusResponseCode; -import cn.webank.defibus.common.util.DeFiBusRequestIDUtil; -import cn.webank.defibus.producer.DeFiBusProducer; +package com.webank.defibus.client.impl.producer; + +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.DeFiBusErrorCode; +import com.webank.defibus.common.exception.DeFiBusException; +import com.webank.defibus.common.protocol.DeFiBusResponseCode; +import com.webank.defibus.common.util.DeFiBusRequestIDUtil; +import com.webank.defibus.producer.DeFiBusProducer; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -39,6 +39,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; + import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.Validators; import org.apache.rocketmq.client.exception.MQBrokerException; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/HealthyMessageQueueSelector.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/HealthyMessageQueueSelector.java similarity index 99% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/HealthyMessageQueueSelector.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/producer/HealthyMessageQueueSelector.java index d0f616b..a5ac604 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/HealthyMessageQueueSelector.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/HealthyMessageQueueSelector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; +package com.webank.defibus.client.impl.producer; import java.util.ArrayList; import java.util.HashMap; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/MessageQueueHealthManager.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/MessageQueueHealthManager.java similarity index 97% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/MessageQueueHealthManager.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/producer/MessageQueueHealthManager.java index 52aee44..1ff0d8f 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/MessageQueueHealthManager.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/MessageQueueHealthManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; +package com.webank.defibus.client.impl.producer; import java.util.concurrent.ConcurrentHashMap; import org.apache.rocketmq.common.message.MessageQueue; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/RRCallback.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/RRCallback.java similarity index 95% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/RRCallback.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/producer/RRCallback.java index 4614be0..8627221 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/RRCallback.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/RRCallback.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; +package com.webank.defibus.client.impl.producer; import org.apache.rocketmq.common.message.Message; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/RRResponseFuture.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/RRResponseFuture.java similarity index 97% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/RRResponseFuture.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/producer/RRResponseFuture.java index 330f698..7163c52 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/RRResponseFuture.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/RRResponseFuture.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; +package com.webank.defibus.client.impl.producer; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/ResponseTable.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/ResponseTable.java similarity index 96% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/ResponseTable.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/producer/ResponseTable.java index 04d0069..09757e7 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/producer/ResponseTable.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/producer/ResponseTable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; +package com.webank.defibus.client.impl.producer; import java.util.concurrent.ConcurrentHashMap; diff --git a/defibus-client/src/main/java/cn/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDC.java b/defibus-client/src/main/java/com/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDC.java similarity index 98% rename from defibus-client/src/main/java/cn/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDC.java rename to defibus-client/src/main/java/com/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDC.java index 59ff32b..80404c0 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDC.java +++ b/defibus-client/src/main/java/com/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDC.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.rebalance; +package com.webank.defibus.client.impl.rebalance; -import cn.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.DeFiBusConstant; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrently.java b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrently.java similarity index 95% rename from defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrently.java rename to defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrently.java index 2856c66..17a25a7 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrently.java +++ b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrently.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package cn.webank.defibus.consumer; +package com.webank.defibus.consumer; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.message.DeFiBusMessageConst; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.message.DeFiBusMessageConst; import java.util.ArrayList; import java.util.List; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; diff --git a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyOnce.java b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyOnce.java similarity index 95% rename from defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyOnce.java rename to defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyOnce.java index de5e786..47b7fa0 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyOnce.java +++ b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyOnce.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package cn.webank.defibus.consumer; +package com.webank.defibus.consumer; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.message.DeFiBusMessageConst; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.message.DeFiBusMessageConst; import java.util.ArrayList; import java.util.List; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; diff --git a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyWithReply.java b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyWithReply.java similarity index 94% rename from defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyWithReply.java rename to defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyWithReply.java index 051f501..96383f3 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyWithReply.java +++ b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusMessageListenerConcurrentlyWithReply.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package cn.webank.defibus.consumer; +package com.webank.defibus.consumer; -import cn.webank.defibus.client.common.DeFiBusClientUtil; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.message.DeFiBusMessageConst; -import cn.webank.defibus.producer.DeFiBusProducer; +import com.webank.defibus.client.common.DeFiBusClientUtil; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.message.DeFiBusMessageConst; +import com.webank.defibus.producer.DeFiBusProducer; import java.util.ArrayList; import java.util.List; + import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; diff --git a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusPushConsumer.java b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusPushConsumer.java similarity index 94% rename from defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusPushConsumer.java rename to defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusPushConsumer.java index 1b36bf3..9f9d691 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/consumer/DeFiBusPushConsumer.java +++ b/defibus-client/src/main/java/com/webank/defibus/consumer/DeFiBusPushConsumer.java @@ -15,19 +15,20 @@ * limitations under the License. */ -package cn.webank.defibus.consumer; - -import cn.webank.defibus.client.DeFiBusClientManager; -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.client.impl.DeFiBusClientAPIImpl; -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.client.impl.hook.DeFiBusClientHookFactory; -import cn.webank.defibus.client.impl.rebalance.AllocateMessageQueueByIDC; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.DeFiBusVersion; +package com.webank.defibus.consumer; + +import com.webank.defibus.client.DeFiBusClientManager; +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.client.impl.DeFiBusClientAPIImpl; +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.client.impl.hook.DeFiBusClientHookFactory; +import com.webank.defibus.client.impl.rebalance.AllocateMessageQueueByIDC; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.DeFiBusVersion; import java.util.Map; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.rocketmq.client.consumer.AllocateMessageQueueStrategy; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; diff --git a/defibus-client/src/main/java/cn/webank/defibus/producer/DeFiBusProducer.java b/defibus-client/src/main/java/com/webank/defibus/producer/DeFiBusProducer.java similarity index 93% rename from defibus-client/src/main/java/cn/webank/defibus/producer/DeFiBusProducer.java rename to defibus-client/src/main/java/com/webank/defibus/producer/DeFiBusProducer.java index 80dc1fc..b2bf941 100644 --- a/defibus-client/src/main/java/cn/webank/defibus/producer/DeFiBusProducer.java +++ b/defibus-client/src/main/java/com/webank/defibus/producer/DeFiBusProducer.java @@ -15,20 +15,21 @@ * limitations under the License. */ -package cn.webank.defibus.producer; - -import cn.webank.defibus.client.DeFiBusClientManager; -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.client.impl.DeFiBusClientAPIImpl; -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.client.impl.hook.DeFiBusClientHookFactory; -import cn.webank.defibus.client.impl.producer.DeFiBusProducerImpl; -import cn.webank.defibus.client.impl.producer.RRCallback; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.common.DeFiBusVersion; +package com.webank.defibus.producer; + +import com.webank.defibus.client.DeFiBusClientManager; +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.client.impl.DeFiBusClientAPIImpl; +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.client.impl.hook.DeFiBusClientHookFactory; +import com.webank.defibus.client.impl.producer.DeFiBusProducerImpl; +import com.webank.defibus.client.impl.producer.RRCallback; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.DeFiBusVersion; import java.util.Collection; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.producer.DefaultMQProducer; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/common/DeFiBusCLientUtilTest.java b/defibus-client/src/test/java/com/webank/defibus/client/common/DeFiBusCLientUtilTest.java similarity index 96% rename from defibus-client/src/test/java/cn/webank/defibus/client/common/DeFiBusCLientUtilTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/common/DeFiBusCLientUtilTest.java index 9d20241..127eab6 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/common/DeFiBusCLientUtilTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/common/DeFiBusCLientUtilTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.client.common; +package com.webank.defibus.client.common; -import cn.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.DeFiBusConstant; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.common.message.MessageExt; import org.junit.Test; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyOnceTest.java b/defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyOnceTest.java similarity index 95% rename from defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyOnceTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyOnceTest.java index 39b1200..dfc22dd 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyOnceTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyOnceTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package cn.webank.defibus.client.consumer; - -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.client.impl.DeFiBusClientAPIImpl; -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.consumer.DeFiBusMessageListenerConcurrentlyOnce; -import cn.webank.defibus.consumer.DeFiBusPushConsumer; +package com.webank.defibus.client.consumer; + +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.client.impl.DeFiBusClientAPIImpl; +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.consumer.DeFiBusMessageListenerConcurrentlyOnce; +import com.webank.defibus.consumer.DeFiBusPushConsumer; import java.io.ByteArrayOutputStream; import java.lang.reflect.Field; import java.net.InetSocketAddress; @@ -33,6 +33,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; + import org.apache.rocketmq.client.consumer.PullCallback; import org.apache.rocketmq.client.consumer.PullResult; import org.apache.rocketmq.client.consumer.PullStatus; @@ -58,6 +59,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; @@ -116,7 +118,7 @@ public ConsumeConcurrentlyStatus handleMessage(MessageExt msg, ConsumeConcurrent pushConsumer.subscribe(topic); pushConsumer.start(); - defiBusClientFactory = spy(pushConsumer.getDeFiBusClientInstance()); + defiBusClientFactory = Mockito.spy(pushConsumer.getDeFiBusClientInstance()); field = DefaultMQPushConsumerImpl.class.getDeclaredField("mQClientFactory"); field.setAccessible(true); field.set(pushConsumerImpl, defiBusClientFactory); diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyTest.java b/defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyTest.java similarity index 95% rename from defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyTest.java index b8dcf2a..0a09e2f 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusMessageListenerConcurrentlyTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package cn.webank.defibus.client.consumer; - -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.client.impl.DeFiBusClientAPIImpl; -import cn.webank.defibus.client.impl.factory.DeFiBusClientInstance; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.consumer.DeFiBusMessageListenerConcurrently; -import cn.webank.defibus.consumer.DeFiBusPushConsumer; +package com.webank.defibus.client.consumer; + +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.client.impl.DeFiBusClientAPIImpl; +import com.webank.defibus.client.impl.factory.DeFiBusClientInstance; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.consumer.DeFiBusMessageListenerConcurrently; +import com.webank.defibus.consumer.DeFiBusPushConsumer; import java.io.ByteArrayOutputStream; import java.lang.reflect.Field; import java.net.InetSocketAddress; @@ -31,6 +31,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CountDownLatch; + import org.apache.rocketmq.client.consumer.PullCallback; import org.apache.rocketmq.client.consumer.PullResult; import org.apache.rocketmq.client.consumer.PullStatus; @@ -59,6 +60,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; @@ -116,7 +118,7 @@ public ConsumeConcurrentlyStatus handleMessage(List msgs, ConsumeCon pushConsumer.subscribe(topic); pushConsumer.start(); - defiBusClientFactory = spy(pushConsumer.getDeFiBusClientInstance()); + defiBusClientFactory = Mockito.spy(pushConsumer.getDeFiBusClientInstance()); field = DefaultMQPushConsumerImpl.class.getDeclaredField("mQClientFactory"); field.setAccessible(true); field.set(pushConsumerImpl, defiBusClientFactory); diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusPushConsumerTest.java b/defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusPushConsumerTest.java similarity index 94% rename from defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusPushConsumerTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusPushConsumerTest.java index 38d5c93..cfc021d 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/consumer/DeFiBusPushConsumerTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/consumer/DeFiBusPushConsumerTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.client.consumer; +package com.webank.defibus.client.consumer; -import cn.webank.defibus.consumer.DeFiBusPushConsumer; +import com.webank.defibus.consumer.DeFiBusPushConsumer; import org.apache.rocketmq.client.exception.MQClientException; import org.junit.Test; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/DeFiBusClientAPIImplTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/DeFiBusClientAPIImplTest.java similarity index 99% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/DeFiBusClientAPIImplTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/DeFiBusClientAPIImplTest.java index ae05cd0..1ae25d5 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/DeFiBusClientAPIImplTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/DeFiBusClientAPIImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl; +package com.webank.defibus.client.impl; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/DeFiBusClientManagerTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/DeFiBusClientManagerTest.java similarity index 97% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/DeFiBusClientManagerTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/DeFiBusClientManagerTest.java index 62c2b38..8e5ac38 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/DeFiBusClientManagerTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/DeFiBusClientManagerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl; +package com.webank.defibus.client.impl; import static org.assertj.core.api.Assertions.assertThat; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/consumer/DeFiBusPullMessageServiceTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/consumer/DeFiBusPullMessageServiceTest.java similarity index 94% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/consumer/DeFiBusPullMessageServiceTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/consumer/DeFiBusPullMessageServiceTest.java index 25dd18f..9816fe1 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/consumer/DeFiBusPullMessageServiceTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/consumer/DeFiBusPullMessageServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.consumer; +package com.webank.defibus.client.impl.consumer; public class DeFiBusPullMessageServiceTest { } diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/factory/DeFiBusClientInstanceTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/factory/DeFiBusClientInstanceTest.java similarity index 99% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/factory/DeFiBusClientInstanceTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/factory/DeFiBusClientInstanceTest.java index 615766b..71c4808 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/factory/DeFiBusClientInstanceTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/factory/DeFiBusClientInstanceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.factory; +package com.webank.defibus.client.impl.factory; import static org.assertj.core.api.Assertions.assertThat; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/hook/DeFiBusClientHookFactoryTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/hook/DeFiBusClientHookFactoryTest.java similarity index 97% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/hook/DeFiBusClientHookFactoryTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/hook/DeFiBusClientHookFactoryTest.java index adbdd69..905ee55 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/hook/DeFiBusClientHookFactoryTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/hook/DeFiBusClientHookFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.hook; +package com.webank.defibus.client.impl.hook; import java.util.concurrent.atomic.AtomicInteger; import org.apache.rocketmq.remoting.RPCHook; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/producer/MessageQueueHealthManagerTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/producer/MessageQueueHealthManagerTest.java similarity index 97% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/producer/MessageQueueHealthManagerTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/producer/MessageQueueHealthManagerTest.java index 0131eec..1f1f4fa 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/producer/MessageQueueHealthManagerTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/producer/MessageQueueHealthManagerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; +package com.webank.defibus.client.impl.producer; import org.apache.rocketmq.common.message.MessageQueue; import org.junit.Test; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/producer/RRResponseFutureTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/producer/RRResponseFutureTest.java similarity index 98% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/producer/RRResponseFutureTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/producer/RRResponseFutureTest.java index c28e6dc..247e855 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/producer/RRResponseFutureTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/producer/RRResponseFutureTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.producer; +package com.webank.defibus.client.impl.producer; import org.apache.rocketmq.common.message.Message; import org.junit.Test; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDCTest.java b/defibus-client/src/test/java/com/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDCTest.java similarity index 98% rename from defibus-client/src/test/java/cn/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDCTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDCTest.java index 6c52c29..24c64bc 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDCTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/impl/rebalance/AllocateMessageQueueByIDCTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.client.impl.rebalance; +package com.webank.defibus.client.impl.rebalance; -import cn.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.common.DeFiBusConstant; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/producer/ClientFuseTest.java b/defibus-client/src/test/java/com/webank/defibus/client/producer/ClientFuseTest.java similarity index 94% rename from defibus-client/src/test/java/cn/webank/defibus/client/producer/ClientFuseTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/producer/ClientFuseTest.java index ae1cfab..c2dbb4d 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/producer/ClientFuseTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/producer/ClientFuseTest.java @@ -15,20 +15,21 @@ * limitations under the License. */ -package cn.webank.defibus.client.producer; - -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.client.impl.producer.DeFiBusProducerImpl; -import cn.webank.defibus.client.impl.producer.HealthyMessageQueueSelector; -import cn.webank.defibus.client.impl.producer.MessageQueueHealthManager; -import cn.webank.defibus.common.protocol.DeFiBusResponseCode; -import cn.webank.defibus.producer.DeFiBusProducer; +package com.webank.defibus.client.producer; + +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.client.impl.producer.DeFiBusProducerImpl; +import com.webank.defibus.client.impl.producer.HealthyMessageQueueSelector; +import com.webank.defibus.client.impl.producer.MessageQueueHealthManager; +import com.webank.defibus.common.protocol.DeFiBusResponseCode; +import com.webank.defibus.producer.DeFiBusProducer; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; + import org.apache.rocketmq.client.ClientConfig; import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.hook.SendMessageContext; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/producer/DeFiBusProducerTest.java b/defibus-client/src/test/java/com/webank/defibus/client/producer/DeFiBusProducerTest.java similarity index 99% rename from defibus-client/src/test/java/cn/webank/defibus/client/producer/DeFiBusProducerTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/producer/DeFiBusProducerTest.java index cea5ad5..d8532b9 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/producer/DeFiBusProducerTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/producer/DeFiBusProducerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.client.producer; +package com.webank.defibus.client.producer; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/defibus-client/src/test/java/cn/webank/defibus/client/producer/HealthyMessageQueueSelectorTest.java b/defibus-client/src/test/java/com/webank/defibus/client/producer/HealthyMessageQueueSelectorTest.java similarity index 97% rename from defibus-client/src/test/java/cn/webank/defibus/client/producer/HealthyMessageQueueSelectorTest.java rename to defibus-client/src/test/java/com/webank/defibus/client/producer/HealthyMessageQueueSelectorTest.java index 81a749a..8937e3d 100644 --- a/defibus-client/src/test/java/cn/webank/defibus/client/producer/HealthyMessageQueueSelectorTest.java +++ b/defibus-client/src/test/java/com/webank/defibus/client/producer/HealthyMessageQueueSelectorTest.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package cn.webank.defibus.client.producer; +package com.webank.defibus.client.producer; -import cn.webank.defibus.client.impl.producer.DeFiBusProducerImpl; -import cn.webank.defibus.client.impl.producer.HealthyMessageQueueSelector; -import cn.webank.defibus.client.impl.producer.MessageQueueHealthManager; +import com.webank.defibus.client.impl.producer.DeFiBusProducerImpl; +import com.webank.defibus.client.impl.producer.HealthyMessageQueueSelector; +import com.webank.defibus.client.impl.producer.MessageQueueHealthManager; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; + import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.common.message.MessageQueue; import org.junit.Assert; diff --git a/defibus-common/conf/checkstyle.xml b/defibus-common/conf/checkstyle.xml index 3d02411..01b058d 100644 --- a/defibus-common/conf/checkstyle.xml +++ b/defibus-common/conf/checkstyle.xml @@ -241,7 +241,7 @@ - + diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusBrokerConfig.java b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusBrokerConfig.java similarity index 99% rename from defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusBrokerConfig.java rename to defibus-common/src/main/java/com/webank/defibus/common/DeFiBusBrokerConfig.java index 01f085a..ed904fa 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusBrokerConfig.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusBrokerConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common; +package com.webank.defibus.common; import org.apache.rocketmq.common.annotation.ImportantField; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusConstant.java b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusConstant.java similarity index 93% rename from defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusConstant.java rename to defibus-common/src/main/java/com/webank/defibus/common/DeFiBusConstant.java index c51ec50..12d97d5 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusConstant.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusConstant.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common; +package com.webank.defibus.common; public class DeFiBusConstant { public static final String PROPERTY_MESSAGE_REPLY_TO = "REPLY_TO"; //requester clientId @@ -32,7 +32,7 @@ public class DeFiBusConstant { public static final String REDIRECT_FLAG = "REDIRECT_FLAG"; - public static final String PLUGIN_CLASS_NAME = "cn.webank.defibus.broker.plugin.DeFiPluginMessageStore"; + public static final String PLUGIN_CLASS_NAME = "com.webank.defibus.broker.plugin.DeFiPluginMessageStore"; public static final String RR_REPLY_TOPIC = "rr-reply-topic"; //post fix for reply topic diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusErrorCode.java b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusErrorCode.java similarity index 96% rename from defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusErrorCode.java rename to defibus-common/src/main/java/com/webank/defibus/common/DeFiBusErrorCode.java index 2f90a50..63a375e 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusErrorCode.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusErrorCode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common; +package com.webank.defibus.common; public class DeFiBusErrorCode { public static final int RR_REQUEST_TIMEOUT = 1; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusVersion.java b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusVersion.java similarity index 98% rename from defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusVersion.java rename to defibus-common/src/main/java/com/webank/defibus/common/DeFiBusVersion.java index 389ffc5..7a879e0 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/DeFiBusVersion.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/DeFiBusVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common; +package com.webank.defibus.common; public class DeFiBusVersion { public static final int CURRENT_VERSION = Version.V1_0_0.ordinal(); diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/admin/DeFiBusConsumeStats.java b/defibus-common/src/main/java/com/webank/defibus/common/admin/DeFiBusConsumeStats.java similarity index 98% rename from defibus-common/src/main/java/cn/webank/defibus/common/admin/DeFiBusConsumeStats.java rename to defibus-common/src/main/java/com/webank/defibus/common/admin/DeFiBusConsumeStats.java index 1be8386..156e1f6 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/admin/DeFiBusConsumeStats.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/admin/DeFiBusConsumeStats.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.admin; +package com.webank.defibus.common.admin; import java.util.HashMap; import java.util.Iterator; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/admin/DeFiBusOffsetWrapper.java b/defibus-common/src/main/java/com/webank/defibus/common/admin/DeFiBusOffsetWrapper.java similarity index 96% rename from defibus-common/src/main/java/cn/webank/defibus/common/admin/DeFiBusOffsetWrapper.java rename to defibus-common/src/main/java/com/webank/defibus/common/admin/DeFiBusOffsetWrapper.java index 7e7ae40..4fb7582 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/admin/DeFiBusOffsetWrapper.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/admin/DeFiBusOffsetWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.admin; +package com.webank.defibus.common.admin; import org.apache.rocketmq.common.admin.OffsetWrapper; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/exception/DeFiBusException.java b/defibus-common/src/main/java/com/webank/defibus/common/exception/DeFiBusException.java similarity index 97% rename from defibus-common/src/main/java/cn/webank/defibus/common/exception/DeFiBusException.java rename to defibus-common/src/main/java/com/webank/defibus/common/exception/DeFiBusException.java index c562b97..d4ab3cb 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/exception/DeFiBusException.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/exception/DeFiBusException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.exception; +package com.webank.defibus.common.exception; public class DeFiBusException extends Exception { diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/exception/DeFiBusRuntimeException.java b/defibus-common/src/main/java/com/webank/defibus/common/exception/DeFiBusRuntimeException.java similarity index 95% rename from defibus-common/src/main/java/cn/webank/defibus/common/exception/DeFiBusRuntimeException.java rename to defibus-common/src/main/java/com/webank/defibus/common/exception/DeFiBusRuntimeException.java index 60aa924..2048f1f 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/exception/DeFiBusRuntimeException.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/exception/DeFiBusRuntimeException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.exception; +package com.webank.defibus.common.exception; public class DeFiBusRuntimeException extends RuntimeException { public DeFiBusRuntimeException(String message) { diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/message/DeFiBusMessageConst.java b/defibus-common/src/main/java/com/webank/defibus/common/message/DeFiBusMessageConst.java similarity index 95% rename from defibus-common/src/main/java/cn/webank/defibus/common/message/DeFiBusMessageConst.java rename to defibus-common/src/main/java/com/webank/defibus/common/message/DeFiBusMessageConst.java index 391fa5f..a42e8ac 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/message/DeFiBusMessageConst.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/message/DeFiBusMessageConst.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.message; +package com.webank.defibus.common.message; public class DeFiBusMessageConst { public static final String LEAVE_TIME = "LEAVE_TIME"; //leaveBrokerTime diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusRequestCode.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusRequestCode.java similarity index 96% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusRequestCode.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusRequestCode.java index ce64bf5..99fbe06 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusRequestCode.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusRequestCode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol; +package com.webank.defibus.common.protocol; public class DeFiBusRequestCode { public static final int PUSH_RR_REPLY_MSG_TO_CLIENT = 400; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusResponseCode.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusResponseCode.java similarity index 95% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusResponseCode.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusResponseCode.java index 0c958b9..910d3dc 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusResponseCode.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusResponseCode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol; +package com.webank.defibus.common.protocol; public class DeFiBusResponseCode { public static final int CONSUME_DIFF_SPAN_TOO_LONG = 301; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusTopicConfig.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusTopicConfig.java similarity index 98% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusTopicConfig.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusTopicConfig.java index e343b9a..443815e 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/DeFiBusTopicConfig.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/DeFiBusTopicConfig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.webank.defibus.common.protocol; +package com.webank.defibus.common.protocol; import com.google.common.base.Preconditions; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/body/DeFiBusTopicConfigSerializeWrapper.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/body/DeFiBusTopicConfigSerializeWrapper.java similarity index 93% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/body/DeFiBusTopicConfigSerializeWrapper.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/body/DeFiBusTopicConfigSerializeWrapper.java index 16407fe..8615405 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/body/DeFiBusTopicConfigSerializeWrapper.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/body/DeFiBusTopicConfigSerializeWrapper.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol.body; +package com.webank.defibus.common.protocol.body; -import cn.webank.defibus.common.protocol.DeFiBusTopicConfig; +import com.webank.defibus.common.protocol.DeFiBusTopicConfig; import java.util.concurrent.ConcurrentHashMap; + import org.apache.rocketmq.common.DataVersion; import org.apache.rocketmq.remoting.protocol.RemotingSerializable; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/body/GetConsumerListByGroupAndTopicResponseBody.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/body/GetConsumerListByGroupAndTopicResponseBody.java similarity index 96% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/body/GetConsumerListByGroupAndTopicResponseBody.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/body/GetConsumerListByGroupAndTopicResponseBody.java index 49e8750..bc03c08 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/body/GetConsumerListByGroupAndTopicResponseBody.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/body/GetConsumerListByGroupAndTopicResponseBody.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol.body; +package com.webank.defibus.common.protocol.body; import java.util.List; import org.apache.rocketmq.remoting.protocol.RemotingSerializable; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicRequestHeader.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicRequestHeader.java similarity index 96% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicRequestHeader.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicRequestHeader.java index f65936e..1030543 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicRequestHeader.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicRequestHeader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol.header; +package com.webank.defibus.common.protocol.header; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicResponseHeader.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicResponseHeader.java similarity index 95% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicResponseHeader.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicResponseHeader.java index 0486fbe..0839400 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicResponseHeader.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/GetConsumerListByGroupAndTopicResponseHeader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol.header; +package com.webank.defibus.common.protocol.header; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/NotifyTopicChangedRequestHeader.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/NotifyTopicChangedRequestHeader.java similarity index 96% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/NotifyTopicChangedRequestHeader.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/header/NotifyTopicChangedRequestHeader.java index 04cec6b..2c9f7a6 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/NotifyTopicChangedRequestHeader.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/NotifyTopicChangedRequestHeader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol.header; +package com.webank.defibus.common.protocol.header; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/ReplyMessageRequestHeader.java b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/ReplyMessageRequestHeader.java similarity index 98% rename from defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/ReplyMessageRequestHeader.java rename to defibus-common/src/main/java/com/webank/defibus/common/protocol/header/ReplyMessageRequestHeader.java index e26c109..b09bc75 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/protocol/header/ReplyMessageRequestHeader.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/protocol/header/ReplyMessageRequestHeader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol.header; +package com.webank.defibus.common.protocol.header; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/util/DeFiBusRequestIDUtil.java b/defibus-common/src/main/java/com/webank/defibus/common/util/DeFiBusRequestIDUtil.java similarity index 96% rename from defibus-common/src/main/java/cn/webank/defibus/common/util/DeFiBusRequestIDUtil.java rename to defibus-common/src/main/java/com/webank/defibus/common/util/DeFiBusRequestIDUtil.java index ae2c9dd..95d6815 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/util/DeFiBusRequestIDUtil.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/util/DeFiBusRequestIDUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.util; +package com.webank.defibus.common.util; import java.util.UUID; diff --git a/defibus-common/src/main/java/cn/webank/defibus/common/util/ReflectUtil.java b/defibus-common/src/main/java/com/webank/defibus/common/util/ReflectUtil.java similarity index 97% rename from defibus-common/src/main/java/cn/webank/defibus/common/util/ReflectUtil.java rename to defibus-common/src/main/java/com/webank/defibus/common/util/ReflectUtil.java index 11ee6fd..2ec850b 100644 --- a/defibus-common/src/main/java/cn/webank/defibus/common/util/ReflectUtil.java +++ b/defibus-common/src/main/java/com/webank/defibus/common/util/ReflectUtil.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.common.util; +package com.webank.defibus.common.util; -import cn.webank.defibus.common.exception.DeFiBusRuntimeException; +import com.webank.defibus.common.exception.DeFiBusRuntimeException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/defibus-common/src/test/java/cn/webank/defibus/common/DeFiBusBrokerConfigTest.java b/defibus-common/src/test/java/com/webank/defibus/common/DeFiBusBrokerConfigTest.java similarity index 97% rename from defibus-common/src/test/java/cn/webank/defibus/common/DeFiBusBrokerConfigTest.java rename to defibus-common/src/test/java/com/webank/defibus/common/DeFiBusBrokerConfigTest.java index 961f36d..6a42577 100644 --- a/defibus-common/src/test/java/cn/webank/defibus/common/DeFiBusBrokerConfigTest.java +++ b/defibus-common/src/test/java/com/webank/defibus/common/DeFiBusBrokerConfigTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common; +package com.webank.defibus.common; import org.junit.Test; diff --git a/defibus-common/src/test/java/cn/webank/defibus/common/admin/DeFiBusConsumeStatsTest.java b/defibus-common/src/test/java/com/webank/defibus/common/admin/DeFiBusConsumeStatsTest.java similarity index 98% rename from defibus-common/src/test/java/cn/webank/defibus/common/admin/DeFiBusConsumeStatsTest.java rename to defibus-common/src/test/java/com/webank/defibus/common/admin/DeFiBusConsumeStatsTest.java index 3419fab..17150df 100644 --- a/defibus-common/src/test/java/cn/webank/defibus/common/admin/DeFiBusConsumeStatsTest.java +++ b/defibus-common/src/test/java/com/webank/defibus/common/admin/DeFiBusConsumeStatsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.admin; +package com.webank.defibus.common.admin; import java.util.HashMap; import org.apache.rocketmq.common.message.MessageQueue; diff --git a/defibus-common/src/test/java/cn/webank/defibus/common/protocol/DeFiBusTopicConfigTest.java b/defibus-common/src/test/java/com/webank/defibus/common/protocol/DeFiBusTopicConfigTest.java similarity index 97% rename from defibus-common/src/test/java/cn/webank/defibus/common/protocol/DeFiBusTopicConfigTest.java rename to defibus-common/src/test/java/com/webank/defibus/common/protocol/DeFiBusTopicConfigTest.java index 36c0ff1..861ddba 100644 --- a/defibus-common/src/test/java/cn/webank/defibus/common/protocol/DeFiBusTopicConfigTest.java +++ b/defibus-common/src/test/java/com/webank/defibus/common/protocol/DeFiBusTopicConfigTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.protocol; +package com.webank.defibus.common.protocol; import org.junit.Test; diff --git a/defibus-common/src/test/java/cn/webank/defibus/common/util/DeFiBusRequestIDUtilTest.java b/defibus-common/src/test/java/com/webank/defibus/common/util/DeFiBusRequestIDUtilTest.java similarity index 97% rename from defibus-common/src/test/java/cn/webank/defibus/common/util/DeFiBusRequestIDUtilTest.java rename to defibus-common/src/test/java/com/webank/defibus/common/util/DeFiBusRequestIDUtilTest.java index 447f10f..2dfd0f5 100644 --- a/defibus-common/src/test/java/cn/webank/defibus/common/util/DeFiBusRequestIDUtilTest.java +++ b/defibus-common/src/test/java/com/webank/defibus/common/util/DeFiBusRequestIDUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.common.util; +package com.webank.defibus.common.util; import org.junit.Test; diff --git a/defibus-examples/conf/checkstyle.xml b/defibus-examples/conf/checkstyle.xml index 3d02411..01b058d 100644 --- a/defibus-examples/conf/checkstyle.xml +++ b/defibus-examples/conf/checkstyle.xml @@ -241,7 +241,7 @@ - + diff --git a/defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/RequestProducer.java b/defibus-examples/src/main/java/com/webank/defibus/examples/rpc/RequestProducer.java similarity index 94% rename from defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/RequestProducer.java rename to defibus-examples/src/main/java/com/webank/defibus/examples/rpc/RequestProducer.java index 8cccab0..dcfd681 100644 --- a/defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/RequestProducer.java +++ b/defibus-examples/src/main/java/com/webank/defibus/examples/rpc/RequestProducer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package cn.webank.defibus.examples.rpc; +package com.webank.defibus.examples.rpc; -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.producer.DeFiBusProducer; +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.producer.DeFiBusProducer; import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.Message; diff --git a/defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/ResponseConsumer.java b/defibus-examples/src/main/java/com/webank/defibus/examples/rpc/ResponseConsumer.java similarity index 91% rename from defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/ResponseConsumer.java rename to defibus-examples/src/main/java/com/webank/defibus/examples/rpc/ResponseConsumer.java index ff585db..2255656 100644 --- a/defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/ResponseConsumer.java +++ b/defibus-examples/src/main/java/com/webank/defibus/examples/rpc/ResponseConsumer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.examples.rpc; +package com.webank.defibus.examples.rpc; import java.util.List; @@ -31,12 +31,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.client.common.DeFiBusClientUtil; -import cn.webank.defibus.common.DeFiBusConstant; -import cn.webank.defibus.consumer.DeFiBusMessageListenerConcurrently; -import cn.webank.defibus.consumer.DeFiBusPushConsumer; -import cn.webank.defibus.producer.DeFiBusProducer; +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.client.common.DeFiBusClientUtil; +import com.webank.defibus.common.DeFiBusConstant; +import com.webank.defibus.consumer.DeFiBusMessageListenerConcurrently; +import com.webank.defibus.consumer.DeFiBusPushConsumer; +import com.webank.defibus.producer.DeFiBusProducer; public class ResponseConsumer { private static final Logger logger = LoggerFactory.getLogger(ResponseConsumer.class); diff --git a/defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/ResponseConsumerAutoReply.java b/defibus-examples/src/main/java/com/webank/defibus/examples/rpc/ResponseConsumerAutoReply.java similarity index 90% rename from defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/ResponseConsumerAutoReply.java rename to defibus-examples/src/main/java/com/webank/defibus/examples/rpc/ResponseConsumerAutoReply.java index 36eb9c5..bd6ac67 100644 --- a/defibus-examples/src/main/java/cn/webank/defibus/examples/rpc/ResponseConsumerAutoReply.java +++ b/defibus-examples/src/main/java/com/webank/defibus/examples/rpc/ResponseConsumerAutoReply.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.examples.rpc; +package com.webank.defibus.examples.rpc; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.exception.MQClientException; @@ -23,10 +23,10 @@ import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.consumer.DeFiBusMessageListenerConcurrentlyWithReply; -import cn.webank.defibus.consumer.DeFiBusPushConsumer; -import cn.webank.defibus.producer.DeFiBusProducer; +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.consumer.DeFiBusMessageListenerConcurrentlyWithReply; +import com.webank.defibus.consumer.DeFiBusPushConsumer; +import com.webank.defibus.producer.DeFiBusProducer; /** * the example of responder with auto reply diff --git a/defibus-examples/src/main/java/cn/webank/defibus/examples/simple/PubProducer.java b/defibus-examples/src/main/java/com/webank/defibus/examples/simple/PubProducer.java similarity index 92% rename from defibus-examples/src/main/java/cn/webank/defibus/examples/simple/PubProducer.java rename to defibus-examples/src/main/java/com/webank/defibus/examples/simple/PubProducer.java index aab3f60..efae684 100644 --- a/defibus-examples/src/main/java/cn/webank/defibus/examples/simple/PubProducer.java +++ b/defibus-examples/src/main/java/com/webank/defibus/examples/simple/PubProducer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package cn.webank.defibus.examples.simple; +package com.webank.defibus.examples.simple; -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.producer.DeFiBusProducer; +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.producer.DeFiBusProducer; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.remoting.exception.RemotingException; diff --git a/defibus-examples/src/main/java/cn/webank/defibus/examples/simple/SubConsumer.java b/defibus-examples/src/main/java/com/webank/defibus/examples/simple/SubConsumer.java similarity index 90% rename from defibus-examples/src/main/java/cn/webank/defibus/examples/simple/SubConsumer.java rename to defibus-examples/src/main/java/com/webank/defibus/examples/simple/SubConsumer.java index 3c8af43..83e2552 100644 --- a/defibus-examples/src/main/java/cn/webank/defibus/examples/simple/SubConsumer.java +++ b/defibus-examples/src/main/java/com/webank/defibus/examples/simple/SubConsumer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.examples.simple; +package com.webank.defibus.examples.simple; import java.util.List; @@ -26,10 +26,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import cn.webank.defibus.client.common.DeFiBusClientConfig; -import cn.webank.defibus.consumer.DeFiBusMessageListenerConcurrently; -import cn.webank.defibus.consumer.DeFiBusPushConsumer; -import cn.webank.defibus.producer.DeFiBusProducer; +import com.webank.defibus.client.common.DeFiBusClientConfig; +import com.webank.defibus.consumer.DeFiBusMessageListenerConcurrently; +import com.webank.defibus.consumer.DeFiBusPushConsumer; +import com.webank.defibus.producer.DeFiBusProducer; public class SubConsumer { private static final Logger logger = LoggerFactory.getLogger(SubConsumer.class); diff --git a/defibus-namesrv/conf/checkstyle.xml b/defibus-namesrv/conf/checkstyle.xml index 3d02411..01b058d 100644 --- a/defibus-namesrv/conf/checkstyle.xml +++ b/defibus-namesrv/conf/checkstyle.xml @@ -241,7 +241,7 @@ - + diff --git a/defibus-namesrv/src/main/java/cn/webank/defibus/namesrv/DeFiBusNamesrvStartup.java b/defibus-namesrv/src/main/java/com/webank/defibus/namesrv/DeFiBusNamesrvStartup.java similarity index 97% rename from defibus-namesrv/src/main/java/cn/webank/defibus/namesrv/DeFiBusNamesrvStartup.java rename to defibus-namesrv/src/main/java/com/webank/defibus/namesrv/DeFiBusNamesrvStartup.java index a35aeee..9f7af5c 100644 --- a/defibus-namesrv/src/main/java/cn/webank/defibus/namesrv/DeFiBusNamesrvStartup.java +++ b/defibus-namesrv/src/main/java/com/webank/defibus/namesrv/DeFiBusNamesrvStartup.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.namesrv; +package com.webank.defibus.namesrv; import org.apache.rocketmq.namesrv.NamesrvStartup; import org.apache.commons.lang3.StringUtils; diff --git a/defibus-tools/conf/checkstyle.xml b/defibus-tools/conf/checkstyle.xml index 3d02411..01b058d 100644 --- a/defibus-tools/conf/checkstyle.xml +++ b/defibus-tools/conf/checkstyle.xml @@ -241,7 +241,7 @@ - + diff --git a/defibus-tools/src/main/java/cn/webank/defibus/tools/admin/DeFiBusAdminExt.java b/defibus-tools/src/main/java/com/webank/defibus/tools/admin/DeFiBusAdminExt.java similarity index 96% rename from defibus-tools/src/main/java/cn/webank/defibus/tools/admin/DeFiBusAdminExt.java rename to defibus-tools/src/main/java/com/webank/defibus/tools/admin/DeFiBusAdminExt.java index 68abd18..602f784 100644 --- a/defibus-tools/src/main/java/cn/webank/defibus/tools/admin/DeFiBusAdminExt.java +++ b/defibus-tools/src/main/java/com/webank/defibus/tools/admin/DeFiBusAdminExt.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.webank.defibus.tools.admin; +package com.webank.defibus.tools.admin; import org.apache.rocketmq.remoting.RPCHook; import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; diff --git a/defibus-tools/src/main/java/cn/webank/defibus/tools/command/DeFiBusAdminStartup.java b/defibus-tools/src/main/java/com/webank/defibus/tools/command/DeFiBusAdminStartup.java similarity index 98% rename from defibus-tools/src/main/java/cn/webank/defibus/tools/command/DeFiBusAdminStartup.java rename to defibus-tools/src/main/java/com/webank/defibus/tools/command/DeFiBusAdminStartup.java index 561fa43..7ebcc1e 100644 --- a/defibus-tools/src/main/java/cn/webank/defibus/tools/command/DeFiBusAdminStartup.java +++ b/defibus-tools/src/main/java/com/webank/defibus/tools/command/DeFiBusAdminStartup.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package cn.webank.defibus.tools.command; +package com.webank.defibus.tools.command; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.joran.spi.JoranException; -import cn.webank.defibus.tools.command.topic.UpdateTopicPermSubCommand; +import com.webank.defibus.tools.command.topic.UpdateTopicPermSubCommand; import com.alibaba.fastjson.JSONObject; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; diff --git a/defibus-tools/src/main/java/cn/webank/defibus/tools/command/topic/UpdateTopicPermSubCommand.java b/defibus-tools/src/main/java/com/webank/defibus/tools/command/topic/UpdateTopicPermSubCommand.java similarity index 98% rename from defibus-tools/src/main/java/cn/webank/defibus/tools/command/topic/UpdateTopicPermSubCommand.java rename to defibus-tools/src/main/java/com/webank/defibus/tools/command/topic/UpdateTopicPermSubCommand.java index 0db2518..380e72b 100644 --- a/defibus-tools/src/main/java/cn/webank/defibus/tools/command/topic/UpdateTopicPermSubCommand.java +++ b/defibus-tools/src/main/java/com/webank/defibus/tools/command/topic/UpdateTopicPermSubCommand.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package cn.webank.defibus.tools.command.topic; +package com.webank.defibus.tools.command.topic; -import cn.webank.defibus.tools.admin.DeFiBusAdminExt; +import com.webank.defibus.tools.admin.DeFiBusAdminExt; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; diff --git a/gradle.properties b/gradle.properties index 0b010e9..9c15ca7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ # limitations under the License. # group=com.webank.defibus -version=1.0.0 +version=1.0.1 rocketmqVersion=4.4.0 jdk=1.8 snapshot=false diff --git a/script/runadmin.cmd b/script/runadmin.cmd index 61a1170..f401060 100644 --- a/script/runadmin.cmd +++ b/script/runadmin.cmd @@ -29,4 +29,4 @@ rem ============================================================================ set "JAVA_OPT=%JAVA_OPT% -server -Xms1g -Xmx1g -Xmn256m -XX:PermSize=128m -XX:MaxPermSize=128m" set "JAVA_OPT=%JAVA_OPT% -Djava.ext.dirs="%BASE_DIR%\lib;%BASE_DIR%\apps";"%JAVA_HOME%\jre\lib\ext"" set "JAVA_OPT=%JAVA_OPT% -cp "%CLASSPATH%"" -"%JAVA%" %JAVA_OPT% cn.webank.defibus.tools.command.DeFiBusAdminStartup %* \ No newline at end of file +"%JAVA%" %JAVA_OPT% com.webank.defibus.tools.command.DeFiBusAdminStartup %* \ No newline at end of file diff --git a/script/runadmin.sh b/script/runadmin.sh index 4e19a72..573ee89 100644 --- a/script/runadmin.sh +++ b/script/runadmin.sh @@ -54,7 +54,7 @@ JAVA_OPT="${JAVA_OPT} -Djava.security.egd=file:/dev/./urandom" APP_HOME=../. -APP_MAIN=cn.webank.defibus.tools.command.DeFiBusAdminStartup +APP_MAIN=com.webank.defibus.tools.command.DeFiBusAdminStartup CLASSPATH=$APP_HOME/lib:$APP_HOME/apps:$APP_HOME/conf ARGS="$@" diff --git a/script/runbroker.cmd b/script/runbroker.cmd index 3cf476e..b529e53 100644 --- a/script/runbroker.cmd +++ b/script/runbroker.cmd @@ -30,7 +30,7 @@ set "JAVA_OPT=%JAVA_OPT% -XX:-OmitStackTraceInFastThrow" set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages" set "JAVA_OPT=%JAVA_OPT% -Djava.ext.dirs=%BASE_DIR%lib;%BASE_DIR%apps" set "JAVA_OPT=%JAVA_OPT% -cp "%CLASSPATH%"" -"%JAVA%" %JAVA_OPT% cn.webank.defibus.broker.DeFiBusBrokerStartup %* +"%JAVA%" %JAVA_OPT% com.webank.defibus.broker.DeFiBusBrokerStartup %* IF %ERRORLEVEL% EQU 0 ( ECHO "DeFiBusBroker starts OK" diff --git a/script/runbroker.sh b/script/runbroker.sh index f86d72b..272ee80 100644 --- a/script/runbroker.sh +++ b/script/runbroker.sh @@ -32,7 +32,7 @@ function is_java8 { #0(not running), 1(is running) function is_brokerRunning { local _pid="$1" - local pid=`ps ax | grep -i 'cn.webank.defibus.broker.DeFiBusBrokerStartup' |grep java | grep -v grep | awk '{print $1}'|grep $_pid` + local pid=`ps ax | grep -i 'com.webank.defibus.broker.DeFiBusBrokerStartup' |grep java | grep -v grep | awk '{print $1}'|grep $_pid` if [ -z "$pid" ] ; then return 0 else @@ -102,5 +102,5 @@ if [ -f "pid.file" ]; then fi -nohup $JAVA ${JAVA_OPT} cn.webank.defibus.broker.DeFiBusBrokerStartup -c ../conf/broker.properties 2>&1 >/dev/null & +nohup $JAVA ${JAVA_OPT} com.webank.defibus.broker.DeFiBusBrokerStartup -c ../conf/broker.properties 2>&1 >/dev/null & echo $!>pid.file diff --git a/script/runbroker_cloud.sh b/script/runbroker_cloud.sh index efafa39..218a715 100644 --- a/script/runbroker_cloud.sh +++ b/script/runbroker_cloud.sh @@ -31,7 +31,7 @@ function is_java8 { #0(not running), 1(is running) function is_brokerRunning { local _pid="$1" - local pid=`ps ax | grep -i 'cn.webank.defibus.broker.DeFiBusBrokerStartup' |grep java | grep -v grep | awk '{print $1}'|grep $_pid` + local pid=`ps ax | grep -i 'com.webank.defibus.broker.DeFiBusBrokerStartup' |grep java | grep -v grep | awk '{print $1}'|grep $_pid` if [ -z "$pid" ] ; then return 0 else @@ -101,5 +101,5 @@ if [ -f "pid.file" ]; then fi -nohup $JAVA ${JAVA_OPT} cn.webank.defibus.broker.DeFiBusBrokerStartup -c ../conf/broker.properties 2>&1 >/dev/null & +nohup $JAVA ${JAVA_OPT} com.webank.defibus.broker.DeFiBusBrokerStartup -c ../conf/broker.properties 2>&1 >/dev/null & echo $!>pid.file diff --git a/script/runnamesrv.cmd b/script/runnamesrv.cmd index b3344ad..85cbc51 100644 --- a/script/runnamesrv.cmd +++ b/script/runnamesrv.cmd @@ -30,7 +30,7 @@ set "JAVA_OPT=%JAVA_OPT% -XX:-OmitStackTraceInFastThrow" set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages" set "JAVA_OPT=%JAVA_OPT% -Djava.ext.dirs=%BASE_DIR%lib;%BASE_DIR%apps" set "JAVA_OPT=%JAVA_OPT% -cp "%CLASSPATH%"" -"%JAVA%" %JAVA_OPT% cn.webank.defibus.namesrv.DeFiBusNamesrvStartup -c ../conf/broker.properties %* +"%JAVA%" %JAVA_OPT% com.webank.defibus.namesrv.DeFiBusNamesrvStartup -c ../conf/broker.properties %* IF %ERRORLEVEL% EQU 0 ( ECHO "DeFiBusNamesrv starts OK" diff --git a/script/runnamesrv.sh b/script/runnamesrv.sh index f4395da..ffad7ff 100644 --- a/script/runnamesrv.sh +++ b/script/runnamesrv.sh @@ -77,7 +77,7 @@ JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${BASE_DIR}/lib:${BASE_DIR}/apps" JAVA_OPT="${JAVA_OPT} -cp ${CLASSPATH}" JAVA_OPT="${JAVA_OPT} -Djava.security.egd=file:/dev/./urandom" -nohup $JAVA ${JAVA_OPT} cn.webank.defibus.namesrv.DeFiBusNamesrvStartup -c ../conf/namesrv.properties 2>&1 >/dev/null & +nohup $JAVA ${JAVA_OPT} com.webank.defibus.namesrv.DeFiBusNamesrvStartup -c ../conf/namesrv.properties 2>&1 >/dev/null & echo "Now Add crontab...." crontab -l | grep -v namesrv_watchdog > tmp_crontab.txt diff --git a/script/stop.sh b/script/stop.sh index d4dfb13..6f5611e 100644 --- a/script/stop.sh +++ b/script/stop.sh @@ -25,7 +25,7 @@ echo "Finish...." case $1 in broker) - pid=`ps ax | grep -i 'cn.webank.defibus.broker.DeFiBusBrokerStartup' |grep java | grep -v grep | awk '{print $1}'` + pid=`ps ax | grep -i 'com.webank.defibus.broker.DeFiBusBrokerStartup' |grep java | grep -v grep | awk '{print $1}'` if [ -z "$pid" ] ; then echo "No DeFiBusBroker running." exit -1; @@ -50,7 +50,7 @@ case $1 in ;; namesrv) - pid=`ps ax | grep -i 'cn.webank.defibus.namesrv.DeFiBusNameSrvStartup' |grep java | grep -v grep | awk '{print $1}'` + pid=`ps ax | grep -i 'com.webank.defibus.namesrv.DeFiBusNameSrvStartup' |grep java | grep -v grep | awk '{print $1}'` if [ -z "$pid" ] ; then echo "No DeFiBusNameSrv running." exit -1;