diff --git a/acl/pom.xml b/acl/pom.xml index 47c953471e..90ce2c8bef 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -81,28 +81,4 @@ test - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - diff --git a/broker/pom.xml b/broker/pom.xml index 9a9abad145..aa4a7cc6a3 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -94,27 +94,6 @@ false - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - diff --git a/client/pom.xml b/client/pom.xml index 6ef7f703ba..601e2e51c7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -59,28 +59,4 @@ guava - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - diff --git a/common/pom.xml b/common/pom.xml index fac02c785d..196b7fa2d7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -66,28 +66,4 @@ commons-codec - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - diff --git a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java index 5fc88dded3..eb40085f57 100644 --- a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java +++ b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java @@ -27,7 +27,11 @@ import java.util.Set; import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.broker.out.BrokerOuterAPI; -import org.apache.rocketmq.common.*; +import org.apache.rocketmq.common.UtilAll; +import org.apache.rocketmq.common.BrokerConfig; +import org.apache.rocketmq.common.BrokerIdentity; +import org.apache.rocketmq.common.TopicConfig; +import org.apache.rocketmq.common.DataVersion; import org.apache.rocketmq.common.constant.PermName; import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper; import org.apache.rocketmq.remoting.netty.NettyClientConfig; @@ -45,7 +49,13 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyBoolean; public class BrokerContainerTest { private static final List TMP_FILE_LIST = new ArrayList<>(); diff --git a/controller/pom.xml b/controller/pom.xml index 2eaa305168..1f7698add1 100644 --- a/controller/pom.xml +++ b/controller/pom.xml @@ -59,28 +59,4 @@ slf4j-api - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - \ No newline at end of file diff --git a/logging/pom.xml b/logging/pom.xml index 3cca568561..4d879cf1ea 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -45,29 +45,4 @@ - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - - \ No newline at end of file diff --git a/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java b/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java index c8bf057606..0ed452d3af 100644 --- a/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java +++ b/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessorTest.java @@ -82,7 +82,7 @@ public class ClusterTestRequestProcessorTest { TopicRouteData topicRouteData = new TopicRouteData(); List brokerDatas = new ArrayList<>(); HashMap brokerAddrs = new HashMap<>(); - brokerAddrs.put(1234l, "127.0.0.1:10911"); + brokerAddrs.put(1234L, "127.0.0.1:10911"); BrokerData brokerData = new BrokerData(); brokerData.setCluster("default-cluster"); brokerData.setBrokerName("default-broker"); diff --git a/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager_NewTest.java b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerNewTest.java similarity index 99% rename from namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager_NewTest.java rename to namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerNewTest.java index e098f0ef92..b0d4cbac41 100644 --- a/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager_NewTest.java +++ b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerNewTest.java @@ -17,7 +17,6 @@ package org.apache.rocketmq.namesrv.routeinfo; -import com.alibaba.fastjson.JSON; import com.google.common.collect.Sets; import io.netty.channel.Channel; import java.time.Duration; @@ -49,7 +48,7 @@ import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -public class RouteInfoManager_NewTest { +public class RouteInfoManagerNewTest { private RouteInfoManager routeInfoManager; private static final String DEFAULT_CLUSTER = "Default_Cluster"; private static final String DEFAULT_BROKER = "Default_Broker"; @@ -189,8 +188,6 @@ public class RouteInfoManager_NewTest { registerBrokerWithNormalTopic(BrokerBasicInfo.defaultBroker(), "TestTopic", "TestTopic1"); - System.out.println(JSON.toJSONString(routeInfoManager.pickupTopicRouteData("TestTopic1"))); - assertThat(routeInfoManager.pickupTopicRouteData("TestTopic1").getBrokerDatas().get(0).getBrokerAddrs()).containsKeys(0L, 1L); assertThat(routeInfoManager.pickupTopicRouteData("TestTopic1").getBrokerDatas().get(0).getBrokerAddrs()) .containsValues(BrokerBasicInfo.defaultBroker().brokerAddr, BrokerBasicInfo.slaveBroker().brokerAddr); diff --git a/pom.xml b/pom.xml index 11cbcb17d9..aab37e0ab3 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,8 @@ UTF-8 true true - false + true + **/generated*/**/* check diff --git a/proxy/pom.xml b/proxy/pom.xml index 09973d1548..3390a560e6 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -99,28 +99,4 @@ test - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - \ No newline at end of file diff --git a/remoting/pom.xml b/remoting/pom.xml index 04bd6ea9cf..a61764319f 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -55,28 +55,4 @@ test - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - diff --git a/store/pom.xml b/store/pom.xml index 0ccdce2d08..d0ea8bef58 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -64,28 +64,4 @@ guava - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - - diff --git a/test/pom.xml b/test/pom.xml index a4531c4924..17c51cadef 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -112,26 +112,6 @@ - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - diff --git a/tools/pom.xml b/tools/pom.xml index 473842d0d8..83329ca654 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -65,28 +65,4 @@ guava - - - - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - validate - validate - - ${project.parent.basedir}/style/rmq_checkstyle.xml - UTF-8 - true - true - true - - - check - - - - - -