diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java
index 0c3548eeb55d6e6f6520c62b94788c1d9fdeba1f..6ec90ee3fad619f36517f1f96b5c40cf020d324b 100644
--- a/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java
+++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java
@@ -193,7 +193,7 @@ public class RemoteAddressStrategyFactory {
                     throw new AclException(String.format("RangeRemoteAddressStrategy netaddress examine scope Exception start is %s , end is %s", start, end));
                 }
             }
-            return this.end > 0 ? true : false;
+            return this.end > 0;
         }
 
         private boolean ipv6Analysis(String[] strArray, int index) {
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/mqtrace/SendMessageHook.java b/broker/src/main/java/org/apache/rocketmq/broker/mqtrace/SendMessageHook.java
index a74b6d66ce8517c08c608744ce489575da1e12cc..a89bace193e6fb64c60796172998a835bde4333e 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/mqtrace/SendMessageHook.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/mqtrace/SendMessageHook.java
@@ -17,9 +17,9 @@
 package org.apache.rocketmq.broker.mqtrace;
 
 public interface SendMessageHook {
-    public String hookName();
+    String hookName();
 
-    public void sendMessageBefore(final SendMessageContext context);
+    void sendMessageBefore(final SendMessageContext context);
 
-    public void sendMessageAfter(final SendMessageContext context);
+    void sendMessageAfter(final SendMessageContext context);
 }
diff --git a/broker/src/test/java/org/apache/rocketmq/broker/BrokerOuterAPITest.java b/broker/src/test/java/org/apache/rocketmq/broker/BrokerOuterAPITest.java
index 68d58ef4400ffb5028d8c1b667dcf8ddfc236d22..9ea1eeee31b9995f35890a8b06e8ff765690b8ef 100644
--- a/broker/src/test/java/org/apache/rocketmq/broker/BrokerOuterAPITest.java
+++ b/broker/src/test/java/org/apache/rocketmq/broker/BrokerOuterAPITest.java
@@ -124,7 +124,7 @@ public class BrokerOuterAPITest {
         boolean success = Iterables.any(booleanList,
             new Predicate<Boolean>() {
                 public boolean apply(Boolean input) {
-                    return input ? true : false;
+                    return input;
                 }
             });
 
diff --git a/common/src/main/java/org/apache/rocketmq/common/hook/FilterCheckHook.java b/common/src/main/java/org/apache/rocketmq/common/hook/FilterCheckHook.java
index e72fb826013606e0ec9f636f06f06d038a2cb098..f57df26d6fe4794da0f2da75d62dc559ce37e901 100644
--- a/common/src/main/java/org/apache/rocketmq/common/hook/FilterCheckHook.java
+++ b/common/src/main/java/org/apache/rocketmq/common/hook/FilterCheckHook.java
@@ -20,7 +20,7 @@ package org.apache.rocketmq.common.hook;
 import java.nio.ByteBuffer;
 
 public interface FilterCheckHook {
-    public String hookName();
+    String hookName();
 
-    public boolean isFilterMatched(final boolean isUnitMode, final ByteBuffer byteBuffer);
+    boolean isFilterMatched(final boolean isUnitMode, final ByteBuffer byteBuffer);
 }
diff --git a/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java b/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java
index 53f7e1c297e3acea100512b068c1a852e4e09c26..c10250e3bbb896071b3ef08a9247b707930eba88 100644
--- a/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java
+++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java
@@ -36,8 +36,8 @@ public class SimpleCharStream {
      * Position in buffer.
      */
     public int bufpos = -1;
-    protected int bufline[];
-    protected int bufcolumn[];
+    protected int[] bufline;
+    protected int[] bufcolumn;
 
     protected int column = 0;
     protected int line = 1;
@@ -62,8 +62,8 @@ public class SimpleCharStream {
 
     protected void ExpandBuff(boolean wrapAround) {
         char[] newbuffer = new char[bufsize + 2048];
-        int newbufline[] = new int[bufsize + 2048];
-        int newbufcolumn[] = new int[bufsize + 2048];
+        int[] newbufline = new int[bufsize + 2048];
+        int[] newbufcolumn = new int[bufsize + 2048];
 
         try {
             if (wrapAround) {
diff --git a/logging/src/main/java/org/apache/rocketmq/logging/inner/Level.java b/logging/src/main/java/org/apache/rocketmq/logging/inner/Level.java
index 487682cd44b171e8d3fff8d41d790d1d2383cb50..0dc81d74e6749bcbcdcfc37b2e80e065faf10f2b 100755
--- a/logging/src/main/java/org/apache/rocketmq/logging/inner/Level.java
+++ b/logging/src/main/java/org/apache/rocketmq/logging/inner/Level.java
@@ -116,7 +116,6 @@ public class Level implements Serializable {
         if (s.equals(OFF_NAME)) {
             return Level.OFF;
         }
-
         if (s.equals(INFO_NAME)) {
             return Level.INFO;
         }
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 44db782b5c53b82ece5db8fba626071f6f8407fb..e08967eb91de53826980b94f530c3e2ff299ae6c 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
@@ -33,7 +33,7 @@ public class FileUtil {
         this.fileName = fileName;
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         String filePath = FileUtil.class.getResource("/").getPath();
         String fileName = "test.txt";
         FileUtil fileUtil = new FileUtil(filePath, fileName);
diff --git a/test/src/main/java/org/apache/rocketmq/test/util/MQWait.java b/test/src/main/java/org/apache/rocketmq/test/util/MQWait.java
index 6edeecadb2a2d2ec19b55a14801f49bf0321409b..0c24427d9248788a4db636a14d114d6ff1f66196 100644
--- a/test/src/main/java/org/apache/rocketmq/test/util/MQWait.java
+++ b/test/src/main/java/org/apache/rocketmq/test/util/MQWait.java
@@ -76,7 +76,7 @@ public class MQWait {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
 
         long start = System.currentTimeMillis();
         MQWait.setCondition(new Condition() {
diff --git a/test/src/main/java/org/apache/rocketmq/test/util/RandomUtil.java b/test/src/main/java/org/apache/rocketmq/test/util/RandomUtil.java
index 1c2bdac305781e3923bdb3bc334f03548f26639c..41cacb684c3c175fa8316a3e2ce10dc2dd546389 100644
--- a/test/src/main/java/org/apache/rocketmq/test/util/RandomUtil.java
+++ b/test/src/main/java/org/apache/rocketmq/test/util/RandomUtil.java
@@ -100,14 +100,14 @@ public final class RandomUtil {
         return n + res % (m - n);
     }
 
-    private static char getChar(int arg[]) {
+    private static char getChar(int[] arg) {
         int size = arg.length;
         int c = rd.nextInt(size / 2);
         c = c * 2;
         return (char) (getIntegerBetween(arg[c], arg[c + 1]));
     }
 
-    private static String getString(int n, int arg[]) {
+    private static String getString(int n, int[] arg) {
         StringBuilder res = new StringBuilder();
         for (int i = 0; i < n; i++) {
             res.append(getChar(arg));
@@ -116,17 +116,17 @@ public final class RandomUtil {
     }
 
     public static String getStringWithCharacter(int n) {
-        int arg[] = new int[] {'a', 'z' + 1, 'A', 'Z' + 1};
+        int[] arg = new int[] {'a', 'z' + 1, 'A', 'Z' + 1};
         return getString(n, arg);
     }
 
     public static String getStringWithNumber(int n) {
-        int arg[] = new int[] {'0', '9' + 1};
+        int[] arg = new int[] {'0', '9' + 1};
         return getString(n, arg);
     }
 
     public static String getStringWithNumAndCha(int n) {
-        int arg[] = new int[] {'a', 'z' + 1, 'A', 'Z' + 1, '0', '9' + 1};
+        int[] arg = new int[] {'a', 'z' + 1, 'A', 'Z' + 1, '0', '9' + 1};
         return getString(n, arg);
     }
 
diff --git a/test/src/main/java/org/apache/rocketmq/test/util/RandomUtils.java b/test/src/main/java/org/apache/rocketmq/test/util/RandomUtils.java
index 9eca28bbe7d90c8e0bf5f9e15525ce943735c9b8..3f71176d6f01db16000a49cf6fc47e5c6e57ce9c 100644
--- a/test/src/main/java/org/apache/rocketmq/test/util/RandomUtils.java
+++ b/test/src/main/java/org/apache/rocketmq/test/util/RandomUtils.java
@@ -45,16 +45,16 @@ public class RandomUtils {
     }
 
     public static String getStringWithNumber(int n) {
-        int arg[] = new int[] {'0', '9' + 1};
+        int[] arg = new int[] {'0', '9' + 1};
         return getString(n, arg);
     }
 
     public static String getStringWithCharacter(int n) {
-        int arg[] = new int[] {'a', 'z' + 1, 'A', 'Z' + 1};
+        int[] arg = new int[] {'a', 'z' + 1, 'A', 'Z' + 1};
         return getString(n, arg);
     }
 
-    private static String getString(int n, int arg[]) {
+    private static String getString(int n, int[] arg) {
         StringBuilder res = new StringBuilder();
         for (int i = 0; i < n; i++) {
             res.append(getChar(arg));
@@ -62,7 +62,7 @@ public class RandomUtils {
         return res.toString();
     }
 
-    private static char getChar(int arg[]) {
+    private static char getChar(int[] arg) {
         int size = arg.length;
         int c = rd.nextInt(size / 2);
         c = c * 2;
diff --git a/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java b/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java
index 965d2ee6705c467d7cde0bdcd77c06a57c814fff..69bfd8f7d10ed5a07b24621cab801819f3805697 100644
--- a/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java
+++ b/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java
@@ -140,7 +140,7 @@ public class VerifyUtils {
         return rtExpect;
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         verifyBalance(400, 0.1f, 230, 190);
     }
 }
diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java
index 564da5ceaf1cf701ea91639f6fb780de126bc76b..0edbdbe2e386c2bea5029ce571387ec794a22315 100644
--- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java
@@ -92,7 +92,7 @@ public class MulTagSubIT extends BaseConf {
 
     @Test
     public void testSubTwoTabAndMatchTwo() {
-        String tags[] = {"jueyin1", "jueyin2"};
+        String[] tags = {"jueyin1", "jueyin2"};
         String subExpress = String.format("%s||%s", tags[0], tags[1]);
         int msgSize = 10;
 
@@ -113,7 +113,7 @@ public class MulTagSubIT extends BaseConf {
 
     @Test
     public void testSubThreeTabAndMatchTwo() {
-        String tags[] = {"jueyin1", "jueyin2", "jueyin3"};
+        String[] tags = {"jueyin1", "jueyin2", "jueyin3"};
         String subExpress = String.format("%s||%s", tags[0], tags[1]);
         int msgSize = 10;
 
@@ -135,7 +135,7 @@ public class MulTagSubIT extends BaseConf {
 
     @Test
     public void testNoMatch() {
-        String tags[] = {"jueyin1", "jueyin2", "jueyin3"};
+        String[] tags = {"jueyin1", "jueyin2", "jueyin3"};
         String subExpress = "no_match";
         int msgSize = 10;
 
diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java
index 31321975b57b9c2c0e52096a9d0a6bd113b4ed0f..8de1b7d4e0110919151ae7d0d567aeb430fad5ff 100644
--- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java
@@ -84,7 +84,7 @@ public class TagMessageWithMulConsumerIT extends BaseConf {
 
     @Test
     public void testSendMessagesWithTwoTag() {
-        String tags[] = {"jueyin1", "jueyin2"};
+        String[] tags = {"jueyin1", "jueyin2"};
         int msgSize = 10;
 
         TagMessage tagMessage = new TagMessage(tags, topic, msgSize);
@@ -113,7 +113,7 @@ public class TagMessageWithMulConsumerIT extends BaseConf {
 
     @Test
     public void testTwoConsumerOneMatchOneOtherMatchAll() {
-        String tags[] = {"jueyin1", "jueyin2"};
+        String[] tags = {"jueyin1", "jueyin2"};
         String sub1 = String.format("%s||%s", tags[0], tags[1]);
         String sub2 = String.format("%s|| noExist", tags[0]);
         int msgSize = 10;
@@ -144,7 +144,7 @@ public class TagMessageWithMulConsumerIT extends BaseConf {
 
     @Test
     public void testSubKindsOf() {
-        String tags[] = {"jueyin1", "jueyin2"};
+        String[] tags = {"jueyin1", "jueyin2"};
         String sub1 = String.format("%s||%s", tags[0], tags[1]);
         String sub2 = String.format("%s|| noExist", tags[0]);
         String sub3 = tags[0];
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java
index 5038123561bf0aafb880ee0100d3e3323c2c49ae..872a130d9f52ccafd240b49c3b32850e2b56f505 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java
@@ -38,7 +38,7 @@ import org.apache.rocketmq.tools.command.SubCommandException;
 
 public class CLusterSendMsgRTCommand implements SubCommand {
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
     }
 
     @Override