Polish remoting module's UT

NeoTalk · Jan 20, 2017 · b997c97 · b997c97
1 parent 63de56c
commit b997c97
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 360 deletions.
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
@@ -131,8 +131,8 @@ public Thread newThread(Runnable r) {
 
     @Override
     public void start() {
-        this.defaultEventExecutorGroup = new DefaultEventExecutorGroup(//
-            nettyServerConfig.getServerWorkerThreads(), //
+        this.defaultEventExecutorGroup = new DefaultEventExecutorGroup(
+            nettyServerConfig.getServerWorkerThreads(),
             new ThreadFactory() {
 
                 private AtomicInteger threadIndex = new AtomicInteger(0);

diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
@@ -69,9 +69,6 @@ public class RemotingCommand {
         }
     }
 
-    /**
-
-     */
     private int code;
     private LanguageCode language = LanguageCode.JAVA;
     private int version = 0;
@@ -80,13 +77,9 @@ public class RemotingCommand {
     private String remark;
     private HashMap<String, String> extFields;
     private transient CommandCustomHeader customHeader;
-    /**
 
-     */
     private SerializeType serializeTypeCurrentRPC = serializeTypeConfigInThisServer;
-    /**
 
-     */
     private transient byte[] body;
 
     protected RemotingCommand() {
@@ -117,9 +110,6 @@ public static RemotingCommand createResponseCommand(Class<? extends CommandCusto
         return createResponseCommand(RemotingSysResponseCode.SYSTEM_ERROR, "not set any response code", classHeader);
     }
 
-    /**
-
-     */
     public static RemotingCommand createResponseCommand(int code, String remark, Class<? extends CommandCustomHeader> classHeader) {
         RemotingCommand cmd = new RemotingCommand();
         cmd.markResponseType();
@@ -411,9 +401,7 @@ public ByteBuffer encodeHeader() {
         return encodeHeader(this.body != null ? this.body.length : 0);
     }
 
-    /**
 
-     */
     public ByteBuffer encodeHeader(final int bodyLength) {
         // 1> header length size
         int length = 4;

diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java
@@ -42,10 +42,8 @@ public static byte[] rocketMQProtocolEncode(RemotingCommand cmd) {
             extLen = extFieldsBytes.length;
         }
 
-        // ################### cal total length
         int totalLen = calTotalLen(remarkLen, extLen);
 
-        // ################### content
         ByteBuffer headerBuffer = ByteBuffer.allocate(totalLen);
         // int code(~32767)
         headerBuffer.putShort((short) cmd.getCode());
@@ -76,7 +74,6 @@ public static byte[] rocketMQProtocolEncode(RemotingCommand cmd) {
     }
 
     public static byte[] mapSerialize(HashMap<String, String> map) {
-        // keySize+key+valSize+val
         // keySize+key+valSize+val
         if (null == map || map.isEmpty())
             return null;
@@ -174,10 +171,10 @@ public static HashMap<String, String> mapDeserialize(byte[] bytes) {
         HashMap<String, String> map = new HashMap<String, String>();
         ByteBuffer byteBuffer = ByteBuffer.wrap(bytes);
 
-        short keySize = 0;
-        byte[] keyContent = null;
-        int valSize = 0;
-        byte[] valContent = null;
+        short keySize;
+        byte[] keyContent;
+        int valSize;
+        byte[] valContent;
         while (byteBuffer.hasRemaining()) {
             keySize = byteBuffer.getShort();
             keyContent = new byte[keySize];

diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/protocol.sevialize.txt b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/protocol.sevialize.txt
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/protocol.txt b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/protocol.txt
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/MixTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/MixTest.java
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/NettyRPCTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/NettyRPCTest.java