From 30bbee67d030c3d0910be773beb3eb1578ac4644 Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 11 Jan 2017 16:04:06 +0800 Subject: [PATCH] =?UTF-8?q?ROCKETMQ-43:=20remove=20NoWhitespaceBefore=20mo?= =?UTF-8?q?dule=20in=20=E2=80=9Crmq=5Fcheckstyle.xml=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/apache/rocketmq/broker/BrokerStartup.java | 14 +++++++++----- .../rocketmq/filtersrv/FiltersrvStartup.java | 8 +++++--- style/rmq_checkstyle.xml | 1 - .../rocketmq/tools/command/MQAdminStartup.java | 11 +++++++---- 4 files changed, 21 insertions(+), 13 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 5b15d7953c8..5ea97d71967 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -64,7 +64,8 @@ public static BrokerController start(BrokerController controller) { log.info(tip); return controller; - } catch (Throwable e) { + } + catch (Throwable e) { e.printStackTrace(); System.exit(-1); } @@ -109,7 +110,8 @@ public static BrokerController createBrokerController(String[] args) { MixAll.printObjectProperties(null, nettyClientConfig); MixAll.printObjectProperties(null, messageStoreConfig); System.exit(0); - } else if (commandLine.hasOption('m')) { + } + else if (commandLine.hasOption('m')) { MixAll.printObjectProperties(null, brokerConfig, true); MixAll.printObjectProperties(null, nettyServerConfig, true); MixAll.printObjectProperties(null, nettyClientConfig, true); @@ -151,7 +153,8 @@ public static BrokerController createBrokerController(String[] args) { for (String addr : addrArray) { RemotingUtil.string2SocketAddress(addr); } - } catch (Exception e) { + } + catch (Exception e) { System.out.printf( "The Name Server Address[%s] illegal, please set it as follows, \"127.0.0.1:9876;192.168.0.1:9876\"%n", namesrvAddr); @@ -176,7 +179,7 @@ public static BrokerController createBrokerController(String[] args) { } messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); @@ -222,7 +225,8 @@ public void run() { }, "ShutdownHook")); return controller; - } catch (Throwable e) { + } + catch (Throwable e) { e.printStackTrace(); System.exit(-1); } 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 5dd15dd5320..e735b1dbe1e 100644 --- a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java +++ b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java @@ -48,7 +48,8 @@ public static FiltersrvController start(FiltersrvController controller) { try { controller.start(); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); System.exit(-1); } @@ -120,7 +121,7 @@ public static FiltersrvController createController(String[] args) { System.exit(-2); } - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); @@ -155,7 +156,8 @@ public void run() { }, "ShutdownHook")); return controller; - } catch (Throwable e) { + } + catch (Throwable e) { e.printStackTrace(); System.exit(-1); } diff --git a/style/rmq_checkstyle.xml b/style/rmq_checkstyle.xml index 776b3054852..2872eb72024 100644 --- a/style/rmq_checkstyle.xml +++ b/style/rmq_checkstyle.xml @@ -121,7 +121,6 @@ - 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 fdf8e219d6d..5014176cfa6 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 @@ -100,7 +100,8 @@ public static void main0(String[] args, RPCHook rpcHook) { if (options != null) { ServerUtil.printCommandLineHelp("mqadmin " + cmd.commandName(), options); } - } else { + } + else { System.out.printf("The sub command \'" + args[1] + "\' not exist.%n"); } break; @@ -126,12 +127,14 @@ public static void main0(String[] args, RPCHook rpcHook) { } cmd.execute(commandLine, options, rpcHook); - } else { + } + else { System.out.printf("The sub command \'" + args[0] + "\' not exist.%n"); } break; } - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); } } @@ -194,7 +197,7 @@ public static void initCommand() { private static void initLogback() throws JoranException { String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset();