This is an automated email from the ASF dual-hosted git repository.
duhengforever 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 ecb061a fix code style of PR #3475 (#3650)
ecb061a is described below
commit ecb061ae425f76ad28a597293b98f374ceba14ec
Author: Chengyang He <21126659+aaron...@users.noreply.github.com>
AuthorDate: Wed Dec 15 20:47:55 2021 +0800
fix code style of PR #3475 (#3650)
---
.../acl/plain/PlainAccessValidatorTest.java | 19 ++++++------
.../rocketmq/remoting/common/RemotingHelper.java | 2 +-
.../remoting/protocol/RemotingCommand.java | 23 +++++++-------
.../remoting/protocol/RocketMQSerializable.java | 35 +++++++++++-----------
.../remoting/protocol/RemotingCommandTest.java | 1 -
.../protocol/RocketMQSerializableTest.java | 1 -
6 files changed, 39 insertions(+), 42 deletions(-)
diff --git
a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
index e6954c2..fb8eba1 100644
---
a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
+++
b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessValidatorTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.rocketmq.acl.plain;
-
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,7 +23,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.rocketmq.acl.common.AclClientRPCHook;
import org.apache.rocketmq.acl.common.AclConstants;
import org.apache.rocketmq.acl.common.AclException;
@@ -34,7 +32,14 @@ import org.apache.rocketmq.common.AclConfig;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.PlainAccessConfig;
import org.apache.rocketmq.common.protocol.RequestCode;
-import org.apache.rocketmq.common.protocol.header.*;
+import
org.apache.rocketmq.common.protocol.header.ConsumerSendMsgBackRequestHeader;
+import
org.apache.rocketmq.common.protocol.header.GetConsumerListByGroupRequestHeader;
+import org.apache.rocketmq.common.protocol.header.PullMessageRequestHeader;
+import org.apache.rocketmq.common.protocol.header.QueryMessageRequestHeader;
+import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeader;
+import org.apache.rocketmq.common.protocol.header.SendMessageRequestHeaderV2;
+import
org.apache.rocketmq.common.protocol.header.UnregisterClientRequestHeader;
+import
org.apache.rocketmq.common.protocol.header.UpdateConsumerOffsetRequestHeader;
import org.apache.rocketmq.common.protocol.heartbeat.ConsumerData;
import org.apache.rocketmq.common.protocol.heartbeat.HeartbeatData;
import org.apache.rocketmq.common.protocol.heartbeat.ProducerData;
@@ -497,7 +502,6 @@ public class PlainAccessValidatorTest {
AclUtils.writeDataObject(targetFileName, backUpAclConfigMap);
}
-
@Test
public void createAndUpdateAccessAclYamlConfigNormalTest() {
System.setProperty("rocketmq.home.dir", "src/test/resources");
@@ -570,7 +574,6 @@ public class PlainAccessValidatorTest {
Assert.assertEquals(2,
dataVersions2.get(0).get(AclConstants.CONFIG_COUNTER));
Assert.assertEquals(verifyMap2.get(AclConstants.CONFIG_SECRET_KEY),
"1234567890123");
-
// Restore the backup file and flush to yaml file
AclUtils.writeDataObject(targetFileName, backUpAclConfigMap);
}
@@ -597,7 +600,6 @@ public class PlainAccessValidatorTest {
String targetFileName = "src/test/resources/conf/plain_acl_delete.yml";
Map<String, Object> backUpAclConfigMap =
AclUtils.getYamlDataObject(targetFileName, Map.class);
-
String accessKey = "rocketmq2";
PlainAccessValidator plainAccessValidator = new PlainAccessValidator();
plainAccessValidator.deleteAccessConfig(accessKey);
@@ -709,7 +711,6 @@ public class PlainAccessValidatorTest {
Assert.assertEquals(aclConfig.getPlainAccessConfigs().size(), 2);
}
-
@Test
public void updateAccessConfigEmptyPermListTest() {
PlainAccessValidator plainAccessValidator = new PlainAccessValidator();
@@ -724,7 +725,7 @@ public class PlainAccessValidatorTest {
plainAccessValidator.updateAccessConfig(plainAccessConfig);
PlainAccessConfig result =
plainAccessValidator.getAllAclConfig().getPlainAccessConfigs()
- .stream().filter(c ->
c.getAccessKey().equals(accessKey)).findFirst().orElse(null);
+ .stream().filter(c ->
c.getAccessKey().equals(accessKey)).findFirst().orElse(null);
Assert.assertEquals(0, result.getTopicPerms().size());
plainAccessValidator.deleteAccessConfig(accessKey);
@@ -744,7 +745,7 @@ public class PlainAccessValidatorTest {
plainAccessValidator.updateAccessConfig(plainAccessConfig);
PlainAccessConfig result =
plainAccessValidator.getAllAclConfig().getPlainAccessConfigs()
- .stream().filter(c ->
c.getAccessKey().equals(accessKey)).findFirst().orElse(null);
+ .stream().filter(c ->
c.getAccessKey().equals(accessKey)).findFirst().orElse(null);
Assert.assertEquals("", result.getWhiteRemoteAddress());
plainAccessValidator.deleteAccessConfig(accessKey);
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
index 1a36666..b738e17 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java
@@ -62,7 +62,7 @@ public class RemotingHelper {
public static RemotingCommand invokeSync(final String addr, final
RemotingCommand request,
final long timeoutMillis) throws InterruptedException,
RemotingConnectException,
- RemotingSendRequestException, RemotingTimeoutException,
RemotingCommandException {
+ RemotingSendRequestException, RemotingTimeoutException,
RemotingCommandException {
long beginTime = System.currentTimeMillis();
SocketAddress socketAddress = RemotingUtil.string2SocketAddress(addr);
SocketChannel socketChannel = RemotingUtil.connect(socketAddress);
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
index 0eb01c9..d43fe8d 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
@@ -17,13 +17,6 @@
package org.apache.rocketmq.remoting.protocol;
import com.alibaba.fastjson.annotation.JSONField;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
-import org.apache.rocketmq.remoting.CommandCustomHeader;
-import org.apache.rocketmq.remoting.annotation.CFNotNull;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
-import org.apache.rocketmq.remoting.exception.RemotingCommandException;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -31,6 +24,12 @@ import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.rocketmq.logging.InternalLogger;
+import org.apache.rocketmq.logging.InternalLoggerFactory;
+import org.apache.rocketmq.remoting.CommandCustomHeader;
+import org.apache.rocketmq.remoting.annotation.CFNotNull;
+import org.apache.rocketmq.remoting.common.RemotingHelper;
+import org.apache.rocketmq.remoting.exception.RemotingCommandException;
public class RemotingCommand {
public static final String SERIALIZE_TYPE_PROPERTY =
"rocketmq.serialize.type";
@@ -40,7 +39,7 @@ public class RemotingCommand {
private static final int RPC_TYPE = 0; // 0, REQUEST_COMMAND
private static final int RPC_ONEWAY = 1; // 0, RPC
private static final Map<Class<? extends CommandCustomHeader>, Field[]>
CLASS_HASH_MAP =
- new HashMap<Class<? extends CommandCustomHeader>, Field[]>();
+ new HashMap<Class<? extends CommandCustomHeader>, Field[]>();
private static final Map<Class, String> CANONICAL_NAME_CACHE = new
HashMap<Class, String>();
// 1, Oneway
// 1, RESPONSE_COMMAND
@@ -112,7 +111,7 @@ public class RemotingCommand {
}
public static RemotingCommand createResponseCommand(int code, String
remark,
- Class<? extends
CommandCustomHeader> classHeader) {
+ Class<? extends CommandCustomHeader> classHeader) {
RemotingCommand cmd = new RemotingCommand();
cmd.markResponseType();
cmd.setCode(code);
@@ -233,7 +232,7 @@ public class RemotingCommand {
}
public CommandCustomHeader decodeCommandCustomHeader(
- Class<? extends CommandCustomHeader> classHeader) throws
RemotingCommandException {
+ Class<? extends CommandCustomHeader> classHeader) throws
RemotingCommandException {
CommandCustomHeader objectHeader;
try {
objectHeader = classHeader.newInstance();
@@ -530,8 +529,8 @@ public class RemotingCommand {
@Override
public String toString() {
return "RemotingCommand [code=" + code + ", language=" + language + ",
version=" + version + ", opaque=" + opaque + ", flag(B)="
- + Integer.toBinaryString(flag) + ", remark=" + remark + ",
extFields=" + extFields + ", serializeTypeCurrentRPC="
- + serializeTypeCurrentRPC + "]";
+ + Integer.toBinaryString(flag) + ", remark=" + remark + ",
extFields=" + extFields + ", serializeTypeCurrentRPC="
+ + serializeTypeCurrentRPC + "]";
}
public SerializeType getSerializeTypeCurrentRPC() {
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
index 6075d7a..7c222bf 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializable.java
@@ -16,13 +16,12 @@
*/
package org.apache.rocketmq.remoting.protocol;
-import org.apache.rocketmq.remoting.exception.RemotingCommandException;
-
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.rocketmq.remoting.exception.RemotingCommandException;
public class RocketMQSerializable {
private static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
@@ -87,10 +86,10 @@ public class RocketMQSerializable {
Map.Entry<String, String> entry = it.next();
if (entry.getKey() != null && entry.getValue() != null) {
kvLength =
- // keySize + Key
- 2 + entry.getKey().getBytes(CHARSET_UTF8).length
- // valSize + val
- + 4 +
entry.getValue().getBytes(CHARSET_UTF8).length;
+ // keySize + Key
+ 2 + entry.getKey().getBytes(CHARSET_UTF8).length
+ // valSize + val
+ + 4 + entry.getValue().getBytes(CHARSET_UTF8).length;
totalLength += kvLength;
}
}
@@ -119,18 +118,18 @@ public class RocketMQSerializable {
private static int calTotalLen(int remark, int ext) {
// int code(~32767)
int length = 2
- // LanguageCode language
- + 1
- // int version(~32767)
- + 2
- // int opaque
- + 4
- // int flag
- + 4
- // String remark
- + 4 + remark
- // HashMap<String, String> extFields
- + 4 + ext;
+ // LanguageCode language
+ + 1
+ // int version(~32767)
+ + 2
+ // int opaque
+ + 4
+ // int flag
+ + 4
+ // String remark
+ + 4 + remark
+ // HashMap<String, String> extFields
+ + 4 + ext;
return length;
}
diff --git
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingCommandTest.java
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingCommandTest.java
index 0b19d44..dd77c32 100644
---
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingCommandTest.java
+++
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingCommandTest.java
@@ -130,7 +130,6 @@ public class RemotingCommandTest {
Assert.fail("Should not throw IOException");
}
-
}
@Test
diff --git
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
index 149ec72..5732b95 100644
---
a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
+++
b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RocketMQSerializableTest.java
@@ -17,7 +17,6 @@
package org.apache.rocketmq.remoting.protocol;
import java.util.HashMap;
-
import org.apache.rocketmq.remoting.exception.RemotingCommandException;
import org.junit.Assert;
import org.junit.Test;
