This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 4661e58eb [ISSUE #4934] Checking for violations as part of build
(#4935)
4661e58eb is described below
commit 4661e58ebe4ef886b375f9d54eff03fbe4bc154b
Author: Aaron Ai <[email protected]>
AuthorDate: Wed Aug 31 10:55:04 2022 +0800
[ISSUE #4934] Checking for violations as part of build (#4935)
* Checking for violations as part of build
* Extend await time for FileWatchServiceTest#watchTwoFiles_ModifyOne
---
.../org/apache/rocketmq/broker/BrokerStartup.java | 6 +-
.../queue/TransactionalMessageBridge.java | 2 +-
.../queue/TransactionalMessageServiceImpl.java | 2 +-
.../queue/TransactionalMessageUtil.java | 2 +-
.../org/apache/rocketmq/broker/util/HookUtils.java | 1 -
.../rocketmq/common/AbstractBrokerRunnable.java | 2 +-
.../rocketmq/container/BrokerContainerStartup.java | 12 +--
.../rocketmq/logging/InternalLoggerFactory.java | 2 +-
.../rocketmq/logging/Slf4jLoggerFactory.java | 2 +-
pom.xml | 4 +-
.../rocketmq/srvutil/FileWatchServiceTest.java | 2 +-
.../rocketmq/store/timer/TimerMessageStore.java | 4 +-
.../apache/rocketmq/store/timer/TimerMetrics.java | 2 -
.../rocketmq/test/listener/AbstractListener.java | 12 +--
.../listener/rmq/concurrent/RMQDelayListener.java | 2 +-
.../listener/rmq/concurrent/RMQNormalListener.java | 4 +-
.../test/listener/rmq/order/RMQOrderListener.java | 4 +-
.../apache/rocketmq/test/schema/SchemaDefiner.java | 102 ++++++++++-----------
.../apache/rocketmq/test/schema/SchemaTools.java | 11 +--
.../org/apache/rocketmq/test/util/FileUtil.java | 1 -
.../apache/rocketmq/test/schema/SchemaTest.java | 8 +-
.../rocketmq/tools/command/MQAdminStartup.java | 18 ++--
.../topic/RemappingStaticTopicSubCommand.java | 2 -
.../rocketmq/tools/monitor/MonitorService.java | 1 -
24 files changed, 100 insertions(+), 108 deletions(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
index 92ace559a..87c651379 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
@@ -53,7 +53,7 @@ public class BrokerStartup {
public static CommandLine commandLine = null;
public static String configFile = null;
public static InternalLogger log;
- public static final SystemConfigFileHelper configFileHelper = new
SystemConfigFileHelper();
+ public static final SystemConfigFileHelper CONFIG_FILE_HELPER = new
SystemConfigFileHelper();
public static void main(String[] args) {
start(createBrokerController(args));
@@ -117,10 +117,10 @@ public class BrokerStartup {
if (commandLine.hasOption('c')) {
String file = commandLine.getOptionValue('c');
if (file != null) {
- configFileHelper.setFile(file);
+ CONFIG_FILE_HELPER.setFile(file);
configFile = file;
BrokerPathConfigHelper.setBrokerConfigPath(file);
- properties = configFileHelper.loadConfig();
+ properties = CONFIG_FILE_HELPER.loadConfig();
}
}
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
index a6e90f874..30a2330dd 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
@@ -309,7 +309,7 @@ public class TransactionalMessageBridge {
*/
private boolean addRemoveTagInTransactionOp(MessageExt prepareMessage,
MessageQueue messageQueue) {
Message message = new Message(TransactionalMessageUtil.buildOpTopic(),
TransactionalMessageUtil.REMOVETAG,
-
String.valueOf(prepareMessage.getQueueOffset()).getBytes(TransactionalMessageUtil.charset));
+
String.valueOf(prepareMessage.getQueueOffset()).getBytes(TransactionalMessageUtil.CHARSET));
writeOp(message, messageQueue);
return true;
}
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
index 7f13e3abf..1ae0f7aed 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
@@ -297,7 +297,7 @@ public class TransactionalMessageServiceImpl implements
TransactionalMessageServ
return pullResult;
}
for (MessageExt opMessageExt : opMsg) {
- Long queueOffset = getLong(new String(opMessageExt.getBody(),
TransactionalMessageUtil.charset));
+ Long queueOffset = getLong(new String(opMessageExt.getBody(),
TransactionalMessageUtil.CHARSET));
log.debug("Topic: {} tags: {}, OpOffset: {}, HalfOffset: {}",
opMessageExt.getTopic(),
opMessageExt.getTags(), opMessageExt.getQueueOffset(),
queueOffset);
if
(TransactionalMessageUtil.REMOVETAG.equals(opMessageExt.getTags())) {
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageUtil.java
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageUtil.java
index cdb010482..03855221a 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageUtil.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageUtil.java
@@ -24,7 +24,7 @@ import java.nio.charset.StandardCharsets;
public class TransactionalMessageUtil {
public static final String REMOVETAG = "d";
- public static final Charset charset = StandardCharsets.UTF_8;
+ public static final Charset CHARSET = StandardCharsets.UTF_8;
public static String buildOpTopic() {
return TopicValidator.RMQ_SYS_TRANS_OP_HALF_TOPIC;
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java
b/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java
index 6a09475f6..78a1ee2cd 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java
@@ -37,7 +37,6 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
import org.apache.rocketmq.store.PutMessageResult;
import org.apache.rocketmq.store.PutMessageStatus;
import org.apache.rocketmq.store.config.BrokerRole;
-import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.apache.rocketmq.store.timer.TimerMessageStore;
public class HookUtils {
diff --git
a/common/src/main/java/org/apache/rocketmq/common/AbstractBrokerRunnable.java
b/common/src/main/java/org/apache/rocketmq/common/AbstractBrokerRunnable.java
index 89b780a49..fa799be9c 100644
---
a/common/src/main/java/org/apache/rocketmq/common/AbstractBrokerRunnable.java
+++
b/common/src/main/java/org/apache/rocketmq/common/AbstractBrokerRunnable.java
@@ -35,7 +35,7 @@ public abstract class AbstractBrokerRunnable implements
Runnable {
public void run() {
if (brokerIdentity.isInBrokerContainer()) {
// set threadlocal broker identity to forward logging to
corresponding broker
-
InnerLoggerFactory.brokerIdentity.set(brokerIdentity.getCanonicalName());
+
InnerLoggerFactory.BROKER_IDENTITY.set(brokerIdentity.getCanonicalName());
}
run2();
}
diff --git
a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java
b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java
index 3d78275a1..4da323dda 100644
---
a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java
+++
b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerStartup.java
@@ -59,9 +59,9 @@ public class BrokerContainerStartup {
public static CommandLine commandLine = null;
public static String configFile = null;
public static InternalLogger log;
- public static final SystemConfigFileHelper configFileHelper = new
SystemConfigFileHelper();
+ public static final SystemConfigFileHelper CONFIG_FILE_HELPER = new
SystemConfigFileHelper();
public static String rocketmqHome = null;
- public static final JoranConfigurator configurator = new
JoranConfigurator();
+ public static final JoranConfigurator CONFIGURATOR = new
JoranConfigurator();
public static void main(String[] args) {
final BrokerContainer brokerContainer =
startBrokerContainer(createBrokerContainer(args));
@@ -280,13 +280,13 @@ public class BrokerContainerStartup {
if (commandLine.hasOption(BROKER_CONTAINER_CONFIG_OPTION)) {
String file =
commandLine.getOptionValue(BROKER_CONTAINER_CONFIG_OPTION);
if (file != null) {
- configFileHelper.setFile(file);
+ CONFIG_FILE_HELPER.setFile(file);
configFile = file;
BrokerPathConfigHelper.setBrokerConfigPath(file);
}
}
- properties = configFileHelper.loadConfig();
+ properties = CONFIG_FILE_HELPER.loadConfig();
if (properties != null) {
properties2SystemEnv(properties);
MixAll.properties2Object(properties, containerConfig);
@@ -318,12 +318,12 @@ public class BrokerContainerStartup {
}
LoggerContext lc = (LoggerContext)
LoggerFactory.getILoggerFactory();
- configurator.setContext(lc);
+ CONFIGURATOR.setContext(lc);
lc.reset();
//https://logback.qos.ch/manual/configuration.html
lc.setPackagingDataEnabled(false);
- configurator.doConfigure(rocketmqHome +
"/conf/logback_broker.xml");
+ CONFIGURATOR.doConfigure(rocketmqHome +
"/conf/logback_broker.xml");
if (commandLine.hasOption(PRINT_PROPERTIES_OPTION)) {
InternalLogger console =
InternalLoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME);
diff --git
a/logging/src/main/java/org/apache/rocketmq/logging/InternalLoggerFactory.java
b/logging/src/main/java/org/apache/rocketmq/logging/InternalLoggerFactory.java
index 2370a911e..c71b108ba 100644
---
a/logging/src/main/java/org/apache/rocketmq/logging/InternalLoggerFactory.java
+++
b/logging/src/main/java/org/apache/rocketmq/logging/InternalLoggerFactory.java
@@ -38,7 +38,7 @@ public abstract class InternalLoggerFactory {
private static String loggerType = null;
- public static final ThreadLocal<String> brokerIdentity = new
ThreadLocal<String>();
+ public static final ThreadLocal<String> BROKER_IDENTITY = new
ThreadLocal<String>();
private static ConcurrentHashMap<String, InternalLoggerFactory>
loggerFactoryCache = new ConcurrentHashMap<String, InternalLoggerFactory>();
diff --git
a/logging/src/main/java/org/apache/rocketmq/logging/Slf4jLoggerFactory.java
b/logging/src/main/java/org/apache/rocketmq/logging/Slf4jLoggerFactory.java
index c8516c37a..5e1cd5b8b 100644
--- a/logging/src/main/java/org/apache/rocketmq/logging/Slf4jLoggerFactory.java
+++ b/logging/src/main/java/org/apache/rocketmq/logging/Slf4jLoggerFactory.java
@@ -65,7 +65,7 @@ public class Slf4jLoggerFactory extends InternalLoggerFactory
{
|| loggerSuffix.equals(COMMERCIAL_LOGGER_NAME)) {
return defaultLogger;
}
- String brokerIdentity = InnerLoggerFactory.brokerIdentity.get();
+ String brokerIdentity = InnerLoggerFactory.BROKER_IDENTITY.get();
if (brokerIdentity == null) {
Matcher m = PATTERN.matcher(Thread.currentThread().getName());
if (m.find()) {
diff --git a/pom.xml b/pom.xml
index 25d4d4d1a..958c9015a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,8 +270,8 @@
<version>${maven-checkstyle-plugin.version}</version>
<executions>
<execution>
- <id>verify</id>
- <phase>verify</phase>
+ <id>validate</id>
+ <phase>validate</phase>
<configuration>
<configLocation>style/rmq_checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
diff --git
a/srvutil/src/test/java/org/apache/rocketmq/srvutil/FileWatchServiceTest.java
b/srvutil/src/test/java/org/apache/rocketmq/srvutil/FileWatchServiceTest.java
index ff5abf7d4..aeae62531 100644
---
a/srvutil/src/test/java/org/apache/rocketmq/srvutil/FileWatchServiceTest.java
+++
b/srvutil/src/test/java/org/apache/rocketmq/srvutil/FileWatchServiceTest.java
@@ -110,7 +110,7 @@ public class FileWatchServiceTest {
fileWatchService.start();
fileWatchService.awaitStarted(1000);
modifyFile(fileA);
- boolean result = waitSemaphore.tryAcquire(1, 1000,
TimeUnit.MILLISECONDS);
+ boolean result = waitSemaphore.tryAcquire(1, 2000,
TimeUnit.MILLISECONDS);
assertThat(result).isTrue();
fileWatchService.shutdown();
}
diff --git
a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
index 0bdd42e74..5be739d35 100644
--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
@@ -439,7 +439,7 @@ public class TimerMessageStore {
@Override public void run() {
if (TimerMessageStore.this.messageStore instanceof
DefaultMessageStore &&
((DefaultMessageStore)
TimerMessageStore.this.messageStore).getBrokerConfig().isInBrokerContainer()) {
-
InnerLoggerFactory.brokerIdentity.set(((DefaultMessageStore)
TimerMessageStore.this.messageStore).getBrokerConfig().getLoggerIdentifier());
+
InnerLoggerFactory.BROKER_IDENTITY.set(((DefaultMessageStore)
TimerMessageStore.this.messageStore).getBrokerConfig().getLoggerIdentifier());
}
try {
long minPy = messageStore.getMinPhyOffset();
@@ -455,7 +455,7 @@ public class TimerMessageStore {
@Override public void run() {
if (TimerMessageStore.this.messageStore instanceof
DefaultMessageStore &&
((DefaultMessageStore)
TimerMessageStore.this.messageStore).getBrokerConfig().isInBrokerContainer()) {
-
InnerLoggerFactory.brokerIdentity.set(((DefaultMessageStore)
TimerMessageStore.this.messageStore).getBrokerConfig().getLoggerIdentifier());
+
InnerLoggerFactory.BROKER_IDENTITY.set(((DefaultMessageStore)
TimerMessageStore.this.messageStore).getBrokerConfig().getLoggerIdentifier());
}
try {
if (storeConfig.isTimerEnableCheckMetrics()) {
diff --git
a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java
b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java
index b82569b89..f8573b369 100644
--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java
+++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java
@@ -22,7 +22,6 @@ import com.google.common.io.Files;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
import org.apache.rocketmq.common.ConfigManager;
import org.apache.rocketmq.common.DataVersion;
import org.apache.rocketmq.common.constant.LoggerName;
@@ -32,7 +31,6 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
import java.io.IOException;
-import java.io.FileWriter;
import java.io.Writer;
import java.io.BufferedWriter;
import java.io.File;
diff --git
a/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java
b/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java
index dd269392e..c2a3891dd 100644
--- a/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java
+++ b/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java
@@ -28,7 +28,7 @@ import org.apache.rocketmq.test.clientinterface.MQCollector;
import org.apache.rocketmq.test.util.TestUtil;
public class AbstractListener extends MQCollector implements MessageListener {
- public static final Logger logger =
Logger.getLogger(AbstractListener.class);
+ public static final Logger LOGGER =
Logger.getLogger(AbstractListener.class);
protected boolean isDebug = true;
protected String listenerName = null;
protected Collection<Object> allSendMsgs = null;
@@ -81,11 +81,11 @@ public class AbstractListener extends MQCollector
implements MessageListener {
break;
} else {
if (System.currentTimeMillis() - curTime >= timeoutMills) {
- logger.error(String.format("timeout but [%s] not recv
all send messages!",
+ LOGGER.error(String.format("timeout but [%s] not recv
all send messages!",
listenerName));
break;
} else {
- logger.info(String.format("[%s] still [%s] msg not recv!",
listenerName,
+ LOGGER.info(String.format("[%s] still [%s] msg not recv!",
listenerName,
sendMsgs.size()));
TestUtil.waitForMonment(500);
}
@@ -104,11 +104,11 @@ public class AbstractListener extends MQCollector
implements MessageListener {
break;
}
if (System.currentTimeMillis() - curTime >= timeoutMills) {
- logger.error(String.format("timeout but [%s] not recv all
send messages!",
+ LOGGER.error(String.format("timeout but [%s] not recv all
send messages!",
listenerName));
break;
} else {
- logger.info(String.format("[%s] still [%s] msg not recv!",
listenerName,
+ LOGGER.info(String.format("[%s] still [%s] msg not recv!",
listenerName,
size - msgBodys.getDataSize()));
TestUtil.waitForMonment(500);
}
@@ -120,7 +120,7 @@ public class AbstractListener extends MQCollector
implements MessageListener {
public void waitForMessageConsume(Map<Object, Object> sendMsgIndex, int
timeoutMills) {
Collection<Object> notRecvMsgs =
waitForMessageConsume(sendMsgIndex.keySet(), timeoutMills);
for (Object object : notRecvMsgs) {
- logger.info(sendMsgIndex.get(object));
+ LOGGER.info(sendMsgIndex.get(object));
}
}
}
diff --git
a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListener.java
b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListener.java
index 78cbb4e90..e414d1f3a 100644
---
a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListener.java
+++
b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListener.java
@@ -51,7 +51,7 @@ public class RMQDelayListener extends AbstractListener
implements MessageListene
long recvTime = System.currentTimeMillis();
for (MessageExt msg : msgs) {
if (isDebug) {
- logger.info(listenerName + ":" + msg);
+ LOGGER.info(listenerName + ":" + msg);
}
msgBodys.addData(new String(msg.getBody(),
StandardCharsets.UTF_8));
diff --git
a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListener.java
b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListener.java
index e49a90af4..908aed1be 100644
---
a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListener.java
+++
b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListener.java
@@ -53,12 +53,12 @@ public class RMQNormalListener extends AbstractListener
implements MessageListen
msgIndex.getAndIncrement();
if (isDebug) {
if (listenerName != null && !listenerName.isEmpty()) {
- logger.info(listenerName + ":" + msgIndex.get() + ":"
+ LOGGER.info(listenerName + ":" + msgIndex.get() + ":"
+ String.format("msgid:%s broker:%s queueId:%s
offset:%s",
msg.getMsgId(), msg.getStoreHost(), msg.getQueueId(),
msg.getQueueOffset()));
} else {
- logger.info(msg);
+ LOGGER.info(msg);
}
}
diff --git
a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java
b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java
index b4d5442bf..bddb34914 100644
---
a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java
+++
b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java
@@ -71,9 +71,9 @@ public class RMQOrderListener extends AbstractListener
implements MessageListene
for (MessageExt msg : msgs) {
if (isDebug) {
if (listenerName != null && listenerName != "") {
- logger.info(listenerName + ": " + msg);
+ LOGGER.info(listenerName + ": " + msg);
} else {
- logger.info(msg);
+ LOGGER.info(msg);
}
}
diff --git
a/test/src/main/java/org/apache/rocketmq/test/schema/SchemaDefiner.java
b/test/src/main/java/org/apache/rocketmq/test/schema/SchemaDefiner.java
index 85d267773..4fdd64650 100644
--- a/test/src/main/java/org/apache/rocketmq/test/schema/SchemaDefiner.java
+++ b/test/src/main/java/org/apache/rocketmq/test/schema/SchemaDefiner.java
@@ -53,74 +53,74 @@ import org.apache.rocketmq.tools.admin.DefaultMQAdminExt;
import org.reflections.Reflections;
public class SchemaDefiner {
- public static final Map<Class<?>, Set<String>> ignoredFields = new
HashMap<>();
+ public static final Map<Class<?>, Set<String>> IGNORED_FIELDS = new
HashMap<>();
//Use name as the key instead of X.class directly. X.class is not equal to
field.getType().
- public static final Set<String> fieldClassNames = new HashSet<>();
- public static final List<Class<?>> apiClassList = new ArrayList<>();
- public static final List<Class<?>> protocolClassList = new ArrayList<>();
+ public static final Set<String> FIELD_CLASS_NAMES = new HashSet<>();
+ public static final List<Class<?>> API_CLASS_LIST = new ArrayList<>();
+ public static final List<Class<?>> PROTOCOL_CLASS_LIST = new ArrayList<>();
public static void doLoad() {
{
- ignoredFields.put(ClientConfig.class,
Sets.newHashSet("namesrvAddr", "clientIP", "clientCallbackExecutorThreads"));
- ignoredFields.put(DefaultLitePullConsumer.class,
Sets.newHashSet("consumeTimestamp"));
- ignoredFields.put(DefaultMQPushConsumer.class,
Sets.newHashSet("consumeTimestamp"));
- fieldClassNames.add(String.class.getName());
- fieldClassNames.add(Long.class.getName());
- fieldClassNames.add(Integer.class.getName());
- fieldClassNames.add(Short.class.getName());
- fieldClassNames.add(Byte.class.getName());
- fieldClassNames.add(Double.class.getName());
- fieldClassNames.add(Float.class.getName());
- fieldClassNames.add(Boolean.class.getName());
+ IGNORED_FIELDS.put(ClientConfig.class,
Sets.newHashSet("namesrvAddr", "clientIP", "clientCallbackExecutorThreads"));
+ IGNORED_FIELDS.put(DefaultLitePullConsumer.class,
Sets.newHashSet("consumeTimestamp"));
+ IGNORED_FIELDS.put(DefaultMQPushConsumer.class,
Sets.newHashSet("consumeTimestamp"));
+ FIELD_CLASS_NAMES.add(String.class.getName());
+ FIELD_CLASS_NAMES.add(Long.class.getName());
+ FIELD_CLASS_NAMES.add(Integer.class.getName());
+ FIELD_CLASS_NAMES.add(Short.class.getName());
+ FIELD_CLASS_NAMES.add(Byte.class.getName());
+ FIELD_CLASS_NAMES.add(Double.class.getName());
+ FIELD_CLASS_NAMES.add(Float.class.getName());
+ FIELD_CLASS_NAMES.add(Boolean.class.getName());
}
{
//basic
- apiClassList.add(DefaultMQPushConsumer.class);
- apiClassList.add(DefaultMQProducer.class);
- apiClassList.add(DefaultMQPullConsumer.class);
- apiClassList.add(DefaultLitePullConsumer.class);
- apiClassList.add(DefaultMQAdminExt.class);
+ API_CLASS_LIST.add(DefaultMQPushConsumer.class);
+ API_CLASS_LIST.add(DefaultMQProducer.class);
+ API_CLASS_LIST.add(DefaultMQPullConsumer.class);
+ API_CLASS_LIST.add(DefaultLitePullConsumer.class);
+ API_CLASS_LIST.add(DefaultMQAdminExt.class);
//argument
- apiClassList.add(Message.class);
- apiClassList.add(MessageQueue.class);
- apiClassList.add(SendCallback.class);
- apiClassList.add(PullCallback.class);
- apiClassList.add(MessageQueueSelector.class);
- apiClassList.add(AllocateMessageQueueStrategy.class);
+ API_CLASS_LIST.add(Message.class);
+ API_CLASS_LIST.add(MessageQueue.class);
+ API_CLASS_LIST.add(SendCallback.class);
+ API_CLASS_LIST.add(PullCallback.class);
+ API_CLASS_LIST.add(MessageQueueSelector.class);
+ API_CLASS_LIST.add(AllocateMessageQueueStrategy.class);
//result
- apiClassList.add(MessageExt.class);
- apiClassList.add(SendResult.class);
- apiClassList.add(SendStatus.class);
- apiClassList.add(PullResult.class);
- apiClassList.add(PullStatus.class);
+ API_CLASS_LIST.add(MessageExt.class);
+ API_CLASS_LIST.add(SendResult.class);
+ API_CLASS_LIST.add(SendStatus.class);
+ API_CLASS_LIST.add(PullResult.class);
+ API_CLASS_LIST.add(PullStatus.class);
//listener and context
- apiClassList.add(MessageListener.class);
- apiClassList.add(MessageListenerConcurrently.class);
- apiClassList.add(ConsumeConcurrentlyContext.class);
- apiClassList.add(ConsumeConcurrentlyStatus.class);
- apiClassList.add(MessageListenerOrderly.class);
- apiClassList.add(ConsumeOrderlyContext.class);
- apiClassList.add(ConsumeOrderlyStatus.class);
+ API_CLASS_LIST.add(MessageListener.class);
+ API_CLASS_LIST.add(MessageListenerConcurrently.class);
+ API_CLASS_LIST.add(ConsumeConcurrentlyContext.class);
+ API_CLASS_LIST.add(ConsumeConcurrentlyStatus.class);
+ API_CLASS_LIST.add(MessageListenerOrderly.class);
+ API_CLASS_LIST.add(ConsumeOrderlyContext.class);
+ API_CLASS_LIST.add(ConsumeOrderlyStatus.class);
//hook and context
- apiClassList.add(RPCHook.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.FilterMessageHook.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.SendMessageHook.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.CheckForbiddenHook.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.ConsumeMessageHook.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.EndTransactionHook.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.FilterMessageContext.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.SendMessageContext.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.ConsumeMessageContext.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.ConsumeMessageContext.class);
-
apiClassList.add(org.apache.rocketmq.client.hook.EndTransactionContext.class);
+ API_CLASS_LIST.add(RPCHook.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.FilterMessageHook.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.SendMessageHook.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.CheckForbiddenHook.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.ConsumeMessageHook.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.EndTransactionHook.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.FilterMessageContext.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.SendMessageContext.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.ConsumeMessageContext.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.ConsumeMessageContext.class);
+
API_CLASS_LIST.add(org.apache.rocketmq.client.hook.EndTransactionContext.class);
}
{
- protocolClassList.add(RequestCode.class);
+ PROTOCOL_CLASS_LIST.add(RequestCode.class);
Reflections reflections = new Reflections("org.apache.rocketmq");
for (Class<?> protocolClass:
reflections.getSubTypesOf(CommandCustomHeader.class)) {
- protocolClassList.add(protocolClass);
+ PROTOCOL_CLASS_LIST.add(protocolClass);
}
}
diff --git
a/test/src/main/java/org/apache/rocketmq/test/schema/SchemaTools.java
b/test/src/main/java/org/apache/rocketmq/test/schema/SchemaTools.java
index 06fcaf4c6..04a71d6ac 100644
--- a/test/src/main/java/org/apache/rocketmq/test/schema/SchemaTools.java
+++ b/test/src/main/java/org/apache/rocketmq/test/schema/SchemaTools.java
@@ -20,7 +20,6 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -38,8 +37,8 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.stream.Collectors;
-import static org.apache.rocketmq.test.schema.SchemaDefiner.fieldClassNames;
-import static org.apache.rocketmq.test.schema.SchemaDefiner.ignoredFields;
+import static org.apache.rocketmq.test.schema.SchemaDefiner.FIELD_CLASS_NAMES;
+import static org.apache.rocketmq.test.schema.SchemaDefiner.IGNORED_FIELDS;
public class SchemaTools {
public static final String PATH_API = "api";
@@ -119,9 +118,9 @@ public class SchemaTools {
}
String key = String.format("Field %s", field.getName());
boolean ignore = false;
- for (Class<?> tmpClass: ignoredFields.keySet()) {
+ for (Class<?> tmpClass: IGNORED_FIELDS.keySet()) {
if (tmpClass.isAssignableFrom(apiClass)
- && ignoredFields.get(tmpClass).contains(field.getName())) {
+ && IGNORED_FIELDS.get(tmpClass).contains(field.getName()))
{
ignore = true;
//System.out.printf("Ignore AAA:%s %s %s\n",
apiClass.getName(), field.getName(), field.getType().getName());
break;
@@ -129,7 +128,7 @@ public class SchemaTools {
}
if (!field.getType().isEnum()
&& !field.getType().isPrimitive()
- && !fieldClassNames.contains(field.getType().getName())) {
+ && !FIELD_CLASS_NAMES.contains(field.getType().getName())) {
//System.out.printf("Ignore BBB:%s %s %s\n",
apiClass.getName(), field.getName(), field.getType().getName());
ignore = true;
}
diff --git a/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
b/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
index 49f986beb..038572814 100644
--- a/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
+++ b/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
@@ -19,7 +19,6 @@ package org.apache.rocketmq.test.util;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
diff --git a/test/src/test/java/org/apache/rocketmq/test/schema/SchemaTest.java
b/test/src/test/java/org/apache/rocketmq/test/schema/SchemaTest.java
index 397f2c3fe..538f8f0b8 100644
--- a/test/src/test/java/org/apache/rocketmq/test/schema/SchemaTest.java
+++ b/test/src/test/java/org/apache/rocketmq/test/schema/SchemaTest.java
@@ -35,8 +35,8 @@ public class SchemaTest {
public void generate() throws Exception {
SchemaDefiner.doLoad();
- SchemaTools.write(SchemaTools.generate(SchemaDefiner.apiClassList),
BASE_SCHEMA_PATH, "api");
-
SchemaTools.write(SchemaTools.generate(SchemaDefiner.protocolClassList),
BASE_SCHEMA_PATH, "protocol");
+ SchemaTools.write(SchemaTools.generate(SchemaDefiner.API_CLASS_LIST),
BASE_SCHEMA_PATH, "api");
+
SchemaTools.write(SchemaTools.generate(SchemaDefiner.PROTOCOL_CLASS_LIST),
BASE_SCHEMA_PATH, "protocol");
}
@Test
@@ -50,8 +50,8 @@ public class SchemaTest {
}
Map<String, Map<String, String>> schemaFromCode = new HashMap<>();
{
-
schemaFromCode.putAll(SchemaTools.generate(SchemaDefiner.apiClassList));
-
schemaFromCode.putAll(SchemaTools.generate(SchemaDefiner.protocolClassList));
+
schemaFromCode.putAll(SchemaTools.generate(SchemaDefiner.API_CLASS_LIST));
+
schemaFromCode.putAll(SchemaTools.generate(SchemaDefiner.PROTOCOL_CLASS_LIST));
}
Map<String, String> fileChanges = new TreeMap<>();
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
index 005004dee..ae49ae35e 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
@@ -105,9 +105,9 @@ import
org.apache.rocketmq.tools.command.topic.UpdateTopicSubCommand;
import org.slf4j.LoggerFactory;
public class MQAdminStartup {
- protected static final List<SubCommand> subCommandList = new
ArrayList<SubCommand>();
+ protected static final List<SubCommand> SUB_COMMANDS = new
ArrayList<SubCommand>();
- private static final String rocketmqHome =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
+ private static final String ROCKETMQ_HOME =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
System.getenv(MixAll.ROCKETMQ_HOME_ENV));
public static void main(String[] args) {
@@ -162,7 +162,7 @@ public class MQAdminStartup {
if (rpcHook != null) {
cmd.execute(commandLine, options, rpcHook);
} else {
- cmd.execute(commandLine, options,
AclUtils.getAclRPCHook(rocketmqHome + MixAll.ACL_CONF_TOOLS_FILE));
+ cmd.execute(commandLine, options,
AclUtils.getAclRPCHook(ROCKETMQ_HOME + MixAll.ACL_CONF_TOOLS_FILE));
}
} else {
System.out.printf("The sub command %s not exist.%n",
args[0]);
@@ -276,16 +276,16 @@ public class MQAdminStartup {
lc.reset();
//avoid the exception
- if (rocketmqHome != null
- && Files.exists(Paths.get(rocketmqHome +
"/conf/logback_tools.xml"))) {
- configurator.doConfigure(rocketmqHome + "/conf/logback_tools.xml");
+ if (ROCKETMQ_HOME != null
+ && Files.exists(Paths.get(ROCKETMQ_HOME +
"/conf/logback_tools.xml"))) {
+ configurator.doConfigure(ROCKETMQ_HOME +
"/conf/logback_tools.xml");
}
}
private static void printHelp() {
System.out.printf("The most commonly used mqadmin commands are:%n");
- for (SubCommand cmd : subCommandList) {
+ for (SubCommand cmd : SUB_COMMANDS) {
System.out.printf(" %-25s %s%n", cmd.commandName(),
cmd.commandDesc());
}
@@ -293,7 +293,7 @@ public class MQAdminStartup {
}
private static SubCommand findSubCommand(final String name) {
- for (SubCommand cmd : subCommandList) {
+ for (SubCommand cmd : SUB_COMMANDS) {
if (cmd.commandName().equalsIgnoreCase(name) ||
(cmd.commandAlias() != null && cmd.commandAlias().equalsIgnoreCase(name))) {
return cmd;
}
@@ -314,6 +314,6 @@ public class MQAdminStartup {
}
public static void initCommand(SubCommand command) {
- subCommandList.add(command);
+ SUB_COMMANDS.add(command);
}
}
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/command/topic/RemappingStaticTopicSubCommand.java
b/tools/src/main/java/org/apache/rocketmq/tools/command/topic/RemappingStaticTopicSubCommand.java
index a5b82f07b..484428e68 100644
---
a/tools/src/main/java/org/apache/rocketmq/tools/command/topic/RemappingStaticTopicSubCommand.java
+++
b/tools/src/main/java/org/apache/rocketmq/tools/command/topic/RemappingStaticTopicSubCommand.java
@@ -25,7 +25,6 @@ import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
import org.apache.rocketmq.common.rpc.ClientMetadata;
import org.apache.rocketmq.common.statictopic.TopicConfigAndQueueMapping;
-import org.apache.rocketmq.common.statictopic.TopicQueueMappingOne;
import org.apache.rocketmq.common.statictopic.TopicQueueMappingUtils;
import org.apache.rocketmq.common.statictopic.TopicRemappingDetailWrapper;
import org.apache.rocketmq.remoting.RPCHook;
@@ -36,7 +35,6 @@ import org.apache.rocketmq.tools.command.SubCommand;
import org.apache.rocketmq.tools.command.SubCommandException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/monitor/MonitorService.java
b/tools/src/main/java/org/apache/rocketmq/tools/monitor/MonitorService.java
index 150745d17..b2970d977 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/monitor/MonitorService.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/monitor/MonitorService.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
-import java.util.Random;
import java.util.TreeMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
