From dd09ba1ec869acb1538d2c73f98d44066bbbb00f Mon Sep 17 00:00:00 2001 From: odbozhou <877036922@qq.com> Date: Fri, 24 Sep 2021 17:06:48 +0800 Subject: [PATCH] merger from develop branch and fix compile error --- .../main/java/org/apache/rocketmq/acl/common/AclUtils.java | 7 +++---- .../broker/processor/AbstractSendMessageProcessor.java | 2 +- .../client/impl/producer/DefaultMQProducerImpl.java | 1 + .../java/org/apache/rocketmq/common/stats/StatsItem.java | 1 - .../test/java/org/apache/rocketmq/common/UtilAllTest.java | 3 ++- .../namesrv/processor/DefaultRequestProcessor.java | 2 -- .../rocketmq/namesrv/routeinfo/RouteInfoManager.java | 2 -- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java b/acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java index a03d1362..b801c69c 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java @@ -23,7 +23,6 @@ import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; import java.util.Map; import java.util.SortedMap; import org.apache.commons.lang3.StringUtils; @@ -210,9 +209,9 @@ public class AclUtils { // expand netaddress int separatorCount = StringUtils.countMatches(netaddress, ":"); int padCount = part - separatorCount; - if(padCount > 0){ + if (padCount > 0) { StringBuilder padStr = new StringBuilder(":"); - for(int i = 0; i < padCount; i++){ + for (int i = 0; i < padCount; i++) { padStr.append(":"); } netaddress = StringUtils.replace(netaddress, "::", padStr.toString()); @@ -221,7 +220,7 @@ public class AclUtils { // pad netaddress String[] strArray = StringUtils.splitPreserveAllTokens(netaddress, ":"); for (int i = 0; i < strArray.length; i++) { - if(strArray[i].length() < 4){ + if (strArray[i].length() < 4) { strArray[i] = StringUtils.leftPad(strArray[i], 4, '0'); } } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java index d2f751b7..cd279b92 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java @@ -24,7 +24,7 @@ import java.net.SocketAddress; import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map;Optional +import java.util.Map; import java.util.concurrent.ThreadLocalRandom; diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java index ba479d2c..046f27d2 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java @@ -88,6 +88,7 @@ import org.apache.rocketmq.common.message.MessageId; import org.apache.rocketmq.common.message.MessageQueue; import org.apache.rocketmq.common.message.MessageType; import org.apache.rocketmq.common.protocol.NamespaceUtil; +import org.apache.rocketmq.common.protocol.ResponseCode; import org.apache.rocketmq.common.protocol.header.CheckTransactionStateRequestHeader; import org.apache.rocketmq.common.protocol.header.EndTransactionRequestHeader; import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader; diff --git a/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java b/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java index 6007cb0a..d016662a 100644 --- a/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java +++ b/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java @@ -20,7 +20,6 @@ package org.apache.rocketmq.common.stats; import java.util.LinkedList; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.LongAdder; import org.apache.rocketmq.common.UtilAll; diff --git a/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java b/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java index ffbcd33e..32d2ba6c 100644 --- a/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java +++ b/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java @@ -119,7 +119,8 @@ public class UtilAllTest { String comma = ","; assertEquals("groupA=DENY,groupB=PUB|SUB,groupC=SUB", UtilAll.join(list, comma)); assertEquals(null, UtilAll.join(null, comma)); - assertEquals("", UtilAll.join(Collections.emptyList(), comma)); + List objects = Collections.emptyList(); + assertEquals("", UtilAll.join(objects, comma)); } static class DemoConfig { diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessor.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessor.java index f73705fc..85e38837 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessor.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessor.java @@ -56,8 +56,6 @@ import org.apache.rocketmq.common.protocol.header.namesrv.WipeWritePermOfBrokerR import org.apache.rocketmq.common.protocol.route.LogicalQueuesInfoUnordered; import org.apache.rocketmq.common.protocol.route.TopicRouteDataNameSrv; import org.apache.rocketmq.common.sysflag.MessageSysFlag; -import org.apache.rocketmq.logging.InternalLogger; -import org.apache.rocketmq.logging.InternalLoggerFactory; import org.apache.rocketmq.namesrv.NamesrvController; import org.apache.rocketmq.remoting.common.RemotingHelper; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java index 55866031..ab9e77f3 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java @@ -50,8 +50,6 @@ import org.apache.rocketmq.common.protocol.route.LogicalQueuesInfoUnordered; import org.apache.rocketmq.common.protocol.route.QueueData; import org.apache.rocketmq.common.protocol.route.TopicRouteDataNameSrv; import org.apache.rocketmq.common.sysflag.TopicSysFlag; -import org.apache.rocketmq.logging.InternalLogger; -import org.apache.rocketmq.logging.InternalLoggerFactory; import org.apache.rocketmq.remoting.common.RemotingUtil; import org.apache.rocketmq.srvutil.ConcurrentHashMapUtil; -- GitLab