From 1bbd4cd62b3528ef8b8f6bab4cf8a0af8dfffcff Mon Sep 17 00:00:00 2001 From: lindzh Date: Thu, 12 Oct 2017 14:56:00 +0800 Subject: [PATCH] [ROCKETMQ-291] Fix System.out.printf throws UnknownFormatConversionException Author: lindzh Closes #168 from lindzh/fix_print. --- .../org/apache/rocketmq/example/broadcast/PushConsumer.java | 2 +- .../java/org/apache/rocketmq/example/filter/Consumer.java | 2 +- .../org/apache/rocketmq/example/filter/SqlConsumer.java | 2 +- .../org/apache/rocketmq/example/ordermessage/Consumer.java | 2 +- .../org/apache/rocketmq/example/quickstart/Consumer.java | 2 +- .../org/apache/rocketmq/example/simple/PullConsumer.java | 2 +- .../org/apache/rocketmq/example/simple/PushConsumer.java | 2 +- .../example/transaction/TransactionCheckListenerImpl.java | 2 +- .../org/apache/rocketmq/filtersrv/FiltersrvStartup.java | 5 ++--- .../java/org/apache/rocketmq/namesrv/NamesrvStartup.java | 2 +- .../org/apache/rocketmq/tools/command/MQAdminStartup.java | 6 ++++-- .../rocketmq/tools/command/broker/SendMsgStatusCommand.java | 2 +- .../tools/command/consumer/ConsumerStatusSubCommand.java | 2 +- .../rocketmq/tools/command/consumer/ConsumerSubCommand.java | 2 +- .../tools/command/message/DecodeMessageIdCommond.java | 4 ++-- .../tools/command/message/PrintMessageSubCommand.java | 6 +++--- .../tools/command/message/QueryMsgByIdSubCommand.java | 4 ++-- .../rocketmq/tools/command/topic/UpdateTopicSubCommand.java | 3 +-- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/example/src/main/java/org/apache/rocketmq/example/broadcast/PushConsumer.java b/example/src/main/java/org/apache/rocketmq/example/broadcast/PushConsumer.java index f3f2cf634c..fb1f9bbde7 100644 --- a/example/src/main/java/org/apache/rocketmq/example/broadcast/PushConsumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/broadcast/PushConsumer.java @@ -42,7 +42,7 @@ public class PushConsumer { @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { - System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); + System.out.printf("%s Receive New Messages: %s %n", Thread.currentThread().getName(), msgs); return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; } }); diff --git a/example/src/main/java/org/apache/rocketmq/example/filter/Consumer.java b/example/src/main/java/org/apache/rocketmq/example/filter/Consumer.java index 0be8e1d388..bb491ac40a 100644 --- a/example/src/main/java/org/apache/rocketmq/example/filter/Consumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/filter/Consumer.java @@ -44,7 +44,7 @@ public class Consumer { @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { - System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); + System.out.printf("%s Receive New Messages: %s %n", Thread.currentThread().getName(), msgs); return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; } }); diff --git a/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java b/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java index 8421675ced..c41c9c14c3 100644 --- a/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java @@ -45,7 +45,7 @@ public class SqlConsumer { @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { - System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); + System.out.printf("%s Receive New Messages: %s %n", Thread.currentThread().getName(), msgs); return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; } }); diff --git a/example/src/main/java/org/apache/rocketmq/example/ordermessage/Consumer.java b/example/src/main/java/org/apache/rocketmq/example/ordermessage/Consumer.java index 44814bdeb4..abb274d612 100644 --- a/example/src/main/java/org/apache/rocketmq/example/ordermessage/Consumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/ordermessage/Consumer.java @@ -41,7 +41,7 @@ public class Consumer { @Override public ConsumeOrderlyStatus consumeMessage(List msgs, ConsumeOrderlyContext context) { context.setAutoCommit(false); - System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); + System.out.printf("%s Receive New Messages: %s %n", Thread.currentThread().getName(), msgs); this.consumeTimes.incrementAndGet(); if ((this.consumeTimes.get() % 2) == 0) { return ConsumeOrderlyStatus.SUCCESS; diff --git a/example/src/main/java/org/apache/rocketmq/example/quickstart/Consumer.java b/example/src/main/java/org/apache/rocketmq/example/quickstart/Consumer.java index 871edc2885..6d3b936507 100644 --- a/example/src/main/java/org/apache/rocketmq/example/quickstart/Consumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/quickstart/Consumer.java @@ -67,7 +67,7 @@ public class Consumer { @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { - System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); + System.out.printf("%s Receive New Messages: %s %n", Thread.currentThread().getName(), msgs); return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; } }); diff --git a/example/src/main/java/org/apache/rocketmq/example/simple/PullConsumer.java b/example/src/main/java/org/apache/rocketmq/example/simple/PullConsumer.java index eb1cb759d8..efffa36d59 100644 --- a/example/src/main/java/org/apache/rocketmq/example/simple/PullConsumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/simple/PullConsumer.java @@ -34,7 +34,7 @@ public class PullConsumer { Set mqs = consumer.fetchSubscribeMessageQueues("TopicTest1"); for (MessageQueue mq : mqs) { - System.out.printf("Consume from the queue: " + mq + "%n"); + System.out.printf("Consume from the queue: %s%n", mq); SINGLE_MQ: while (true) { try { diff --git a/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java b/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java index 43bbf6c36b..c6c7e39d17 100644 --- a/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java @@ -37,7 +37,7 @@ public class PushConsumer { @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { - System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); + System.out.printf("%s Receive New Messages: %s %n", Thread.currentThread().getName(), msgs); return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; } }); diff --git a/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionCheckListenerImpl.java b/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionCheckListenerImpl.java index 7b750969b6..acb755ecfd 100644 --- a/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionCheckListenerImpl.java +++ b/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionCheckListenerImpl.java @@ -26,7 +26,7 @@ public class TransactionCheckListenerImpl implements TransactionCheckListener { @Override public LocalTransactionState checkLocalTransactionState(MessageExt msg) { - System.out.printf("server checking TrMsg " + msg.toString() + "%n"); + System.out.printf("server checking TrMsg %s%n", msg); int value = transactionIndex.getAndIncrement(); if ((value % 6) == 0) { diff --git a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java index 41169c9a50..585024d4a7 100644 --- a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java +++ b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java @@ -92,7 +92,7 @@ public class FiltersrvStartup { Properties properties = new Properties(); properties.load(in); MixAll.properties2Object(properties, filtersrvConfig); - System.out.printf("load config properties file OK, " + file + "%n"); + System.out.printf("load config properties file OK, %s%n", file); in.close(); String port = properties.getProperty("listenPort"); @@ -116,8 +116,7 @@ public class FiltersrvStartup { MixAll.properties2Object(ServerUtil.commandLine2Properties(commandLine), filtersrvConfig); if (null == filtersrvConfig.getRocketmqHome()) { - System.out.printf("Please set the " + MixAll.ROCKETMQ_HOME_ENV - + " variable in your environment to match the location of the RocketMQ installation%n"); + System.out.printf("Please set the %s variable in your environment to match the location of the RocketMQ installation%n", MixAll.ROCKETMQ_HOME_ENV); System.exit(-2); } diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java index f49d2b31ff..760a61be02 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -96,7 +96,7 @@ public class NamesrvStartup { MixAll.properties2Object(ServerUtil.commandLine2Properties(commandLine), namesrvConfig); if (null == namesrvConfig.getRocketmqHome()) { - System.out.printf("Please set the " + MixAll.ROCKETMQ_HOME_ENV + " variable in your environment to match the location of the RocketMQ installation%n"); + System.out.printf("Please set the %s variable in your environment to match the location of the RocketMQ installation%n", MixAll.ROCKETMQ_HOME_ENV); System.exit(-2); } 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 6398291a06..517be4ebb7 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 @@ -19,8 +19,10 @@ package org.apache.rocketmq.tools.command; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.joran.spi.JoranException; + import java.util.ArrayList; import java.util.List; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.apache.commons.cli.PosixParser; @@ -102,7 +104,7 @@ public class MQAdminStartup { ServerUtil.printCommandLineHelp("mqadmin " + cmd.commandName(), options); } } else { - System.out.printf("The sub command \'" + args[1] + "\' not exist.%n"); + System.out.printf("The sub command %s not exist.%n", args[1]); } break; } @@ -128,7 +130,7 @@ public class MQAdminStartup { cmd.execute(commandLine, options, rpcHook); } else { - System.out.printf("The sub command \'" + args[0] + "\' not exist.%n"); + System.out.printf("The sub command %s not exist.%n", args[0]); } break; } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/SendMsgStatusCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/SendMsgStatusCommand.java index e0a628aa4a..69d3b24ca7 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/SendMsgStatusCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/SendMsgStatusCommand.java @@ -85,7 +85,7 @@ public class SendMsgStatusCommand implements SubCommand { for (int i = 0; i < count; i++) { long begin = System.currentTimeMillis(); SendResult result = producer.send(buildMessage(brokerName, messageSize)); - System.out.printf("rt:" + (System.currentTimeMillis() - begin) + "ms, SendResult=" + result); + System.out.printf("rt:" + (System.currentTimeMillis() - begin) + "ms, SendResult=%s", result); } } catch (Exception e) { throw new SubCommandException(this.getClass().getSimpleName() + " command failed", e); diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java index 0e49c725fd..c212f0ee7f 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java @@ -115,7 +115,7 @@ public class ConsumerStatusSubCommand implements SubCommand { String result = ConsumerRunningInfo.analyzeProcessQueue(next.getKey(), next.getValue()); if (result.length() > 0) { - System.out.printf(result); + System.out.printf("%s", result); } } } else { diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerSubCommand.java index 0eea98de9d..a6df8ea8ec 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerSubCommand.java @@ -114,7 +114,7 @@ public class ConsumerSubCommand implements SubCommand { String result = ConsumerRunningInfo.analyzeProcessQueue(next.getKey(), next.getValue()); if (result.length() > 0) { - System.out.printf(result); + System.out.printf("%s", result); } } } else { diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/message/DecodeMessageIdCommond.java b/tools/src/main/java/org/apache/rocketmq/tools/command/message/DecodeMessageIdCommond.java index d233b65aa9..532508c0b2 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/message/DecodeMessageIdCommond.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/message/DecodeMessageIdCommond.java @@ -50,14 +50,14 @@ public class DecodeMessageIdCommond implements SubCommand { String messageId = commandLine.getOptionValue('i').trim(); try { - System.out.printf("ip=" + MessageClientIDSetter.getIPStrFromID(messageId)); + System.out.printf("ip=%s", MessageClientIDSetter.getIPStrFromID(messageId)); } catch (Exception e) { e.printStackTrace(); } try { String date = UtilAll.formatDate(MessageClientIDSetter.getNearlyTimeFromID(messageId), UtilAll.YYYY_MM_DD_HH_MM_SS_SSS); - System.out.printf("date=" + date); + System.out.printf("date=%s", date); } catch (Exception e) { throw new SubCommandException(this.getClass().getSimpleName() + " command failed", e); } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java index d46d6fb629..c8fced3b16 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java @@ -134,7 +134,7 @@ public class PrintMessageSubCommand implements SubCommand { maxOffset = consumer.searchOffset(mq, timeValue); } - System.out.printf("minOffset=" + minOffset + ", maxOffset=" + maxOffset + ", " + mq); + System.out.printf("minOffset=%s, maxOffset=%s, %s", minOffset, maxOffset, mq); READQ: for (long offset = minOffset; offset < maxOffset; ) { @@ -146,11 +146,11 @@ public class PrintMessageSubCommand implements SubCommand { printMessage(pullResult.getMsgFoundList(), charsetName, printBody); break; case NO_MATCHED_MSG: - System.out.printf(mq + " no matched msg. status=" + pullResult.getPullStatus() + ", offset=" + offset); + System.out.printf(mq + " no matched msg. status=%s, offset=%s", pullResult.getPullStatus(), offset); break; case NO_NEW_MSG: case OFFSET_ILLEGAL: - System.out.printf(mq + " print msg finished. status=" + pullResult.getPullStatus() + ", offset=" + offset); + System.out.printf(mq + " print msg finished. status=%s, offset=%s", pullResult.getPullStatus(), offset); break READQ; } } catch (Exception e) { diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java index 39abbc9c4c..6bb8caad40 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java @@ -279,11 +279,11 @@ public class QueryMsgByIdSubCommand implements SubCommand { MessageExt msg = defaultMQAdminExt.viewMessage(msgId); if (msg != null) { // resend msg by id - System.out.printf("prepare resend msg. originalMsgId=" + msgId); + System.out.printf("prepare resend msg. originalMsgId=%s", msgId); SendResult result = defaultMQProducer.send(msg); System.out.printf("%s", result); } else { - System.out.printf("no message. msgId=" + msgId); + System.out.printf("no message. msgId=%s", msgId); } } catch (Exception e) { e.printStackTrace(); diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateTopicSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateTopicSubCommand.java index 9fdfcb38b2..8fdb9d3dbf 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateTopicSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateTopicSubCommand.java @@ -169,8 +169,7 @@ public class UpdateTopicSubCommand implements SubCommand { } defaultMQAdminExt.createOrUpdateOrderConf(topicConfig.getTopicName(), orderConf.toString(), true); - System.out.printf(String.format("set cluster orderConf. isOrder=%s, orderConf=[%s]", - isOrder, orderConf.toString())); + System.out.printf("set cluster orderConf. isOrder=%s, orderConf=[%s]", isOrder, orderConf); } System.out.printf("%s", topicConfig);