Merge pull request #8 from WeBankFinTech/develop

pre release v1.0.1
WeBankFinTech · Aug 23, 2020 · 90a4ba4 · 90a4ba4
2 parents d206dbf + 3a050fd
commit 90a4ba4
Show file tree

Hide file tree

Showing 123 changed files with 451 additions and 368 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,68 @@
+# Contributing to Defibus
+
+Welcome to Defibus! This document is a guideline about how to contribute to Defibus.
+If you find something incorrect or missing, please leave comments / suggestions.
+
+## Before you get started
+
+### Setting up your development environment
+
+You should have JDK installed in your operating system.
+
+## Contributing
+
+We are always very happy to have contributions, whether for typo fix, bug fix or big new features.
+Please do not ever hesitate to ask a question or send a pull request.
+
+We strongly value documentation and integration with other projects.
+We are very glad to accept improvements for these aspects.
+
+### GitHub workflow
+
+We use the `develop` branch as the development branch, which indicates that this is an unstable branch.
+
+Here are the workflow for contributors:
+
+1. Fork to your own
+2. Clone fork to local repository
+3. Create a new branch and work on it
+4. Keep your branch in sync
+5. Commit your changes (make sure your commit message concise)
+6. Push your commits to your forked repository
+7. Create a pull request
+
+Please follow [the pull request template](./.github/PULL_REQUEST_TEMPLATE.md).
+Please make sure the PR has a corresponding issue.
+
+After creating a PR, one or more reviewers will be assigned to the pull request.
+The reviewers will review the code.
+
+Before merging a PR, squash any fix review feedback, typo, merged, and rebased sorts of commits.
+The final commit message should be clear and concise.
+
+### Open an issue / PR
+
+We use [GitHub Issues](https://github.com/WeBankFinTech/Defibus/issues) and [Pull Requests](https://github.com/WeBankFinTech/Defibus/pulls) for trackers.
+
+If you find a typo in a document, find a bug in code, or want new features, or want to give suggestions,
+you can [open an issue on GitHub](https://github.com/WeBankFinTech/Defibus/issues/new) to report it.
+Please follow the guideline message in the issue template.
+
+If you want to contribute, please follow the [contribution workflow](#github-workflow) and create a new pull request.
+If your PR contains large changes, e.g. component refactor or new components, please write detailed documents
+about its design and usage.
+
+Note that a single pull request should not be too large. If heavy changes are required, it's better to separate the changes
+to a few individual PRs.
+
+### Code review
+
+All code should be well reviewed by one or more committers. Some principles:
+
+- Readability: Important code should be well-documented. Comply with our code style.
+- Elegance: New functions, classes or components should be well-designed.
+- Testability: Important code should be well-tested (high unit test coverage).
+
+## Community
+
+### Contact us
diff --git a/build.gradle b/build.gradle
@@ -79,7 +79,7 @@ subprojects {
     apply plugin: "idea"
     apply plugin: "project-reports"
     apply plugin: "jacoco"
-    apply plugin: "checkstyle"
+//    apply plugin: "checkstyle"
     apply plugin: "pmd"
     apply plugin: 'com.github.spotbugs'
 
@@ -103,20 +103,20 @@ subprojects {
         }
     }
 
-    checkstyle {
-        toolVersion = "8.32"
-        ignoreFailures = true
-        sourceSets = [sourceSets.main]
-        configFile = 'conf/checkstyle.xml' as File
-        showViolations true
-    }
-
-    tasks.withType(Checkstyle) {
-        reports {
-            xml.enabled false
-            html.enabled true
-        }
-    }
+//    checkstyle {
+//        toolVersion = "8.32"
+//        ignoreFailures = true
+//        sourceSets = [sourceSets.main]
+//        configFile = 'conf/checkstyle.xml' as File
+//        showViolations true
+//    }
+//
+//    tasks.withType(Checkstyle) {
+//        reports {
+//            xml.enabled false
+//            html.enabled true
+//        }
+//    }
 
     spotbugs {
         toolVersion = '4.0.2'
@@ -178,11 +178,11 @@ subprojects {
     ]
 
     List logback = [
-            "org.slf4j:slf4j-api:1.7.25"
+            "org.slf4j:slf4j-api:1.7.30"
     ]
 
     List guava = [
-            "com.google.guava:guava:20.0"
+            "com.google.guava:guava:29.0-jre"
     ]
 
     List fastjson = [
@@ -300,15 +300,14 @@ subprojects {
     uploadArchives {
         repositories {
             mavenDeployer {
-                snapshotRepository(url: 'file://D:\\LocalRepo') {
+                snapshotRepository(url: 'Your target repo address') {
                     authentication(userName: 'Your user name', password: 'Your password')
                 }
-                repository(url: 'file://D:\\LocalRepo') {
+                repository(url: 'Your target repo address') {
                     authentication(userName: 'Your user name', password: 'Your password')
                 }
             }
         }
     }
-
 }
 
diff --git a/defibus-broker/conf/checkstyle.xml b/defibus-broker/conf/checkstyle.xml
@@ -241,7 +241,7 @@
         <module name="CustomImportOrder">
            <property name="customImportOrderRules"
                       value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS"/>
-            <property name="specialImportsRegExp" value="cn.webank"/>
+            <property name="specialImportsRegExp" value="com.webank"/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
             <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>

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

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

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

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

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

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

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

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

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

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

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

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

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

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