You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by aa...@apache.org on 2022/09/29 03:46:12 UTC
[rocketmq] branch develop updated: [ISSUE #5216] Enable checkstyle for test code （rocketmq-controller, rocketmq-remoting and rocketmq-proxy） (#5218)
This is an automated email from the ASF dual-hosted git repository.
aaronai 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 0ad7db695 [ISSUE #5216] Enable checkstyle for test code （rocketmq-controller, rocketmq-remoting and rocketmq-proxy） (#5218)
0ad7db695 is described below
commit 0ad7db69562fbb9d6abdf2d8efb021fb1446e950
Author: Nowinkey <no...@tom.com>
AuthorDate: Thu Sep 29 11:46:00 2022 +0800
[ISSUE #5216] Enable checkstyle for test code （rocketmq-controller, rocketmq-remoting and rocketmq-proxy） (#5218)
* style(remoting):Enable checkstyle for test code
* style(controller):Enable checkstyle for test code
* style(proxy):Enable checkstyle for test code
---
controller/pom.xml | 24 +++++++++
.../impl/controller/ControllerManagerTest.java | 3 --
.../controller/impl/DLedgerControllerTest.java | 5 --
.../impl/DefaultBrokerHeartbeatManagerTest.java | 1 -
.../impl/manager/ReplicasInfoManagerTest.java | 4 --
proxy/pom.xml | 25 ++++++++-
.../grpc/v2/GrpcMessagingApplicationTest.java | 8 +--
.../transaction/ClusterTransactionServiceTest.java | 28 +++++-----
remoting/pom.xml | 24 +++++++++
.../rocketmq/remoting/RemotingServerTest.java | 7 ++-
.../rocketmq/remoting/SubRemotingServerTest.java | 8 +--
.../remoting/netty/NettyClientConfigTest.java | 62 +++++++++++-----------
.../remoting/netty/NettyServerConfigTest.java | 16 +++---
.../remoting/protocol/RemotingCommandTest.java | 4 +-
.../protocol/RemotingSerializableTest.java | 36 ++++++-------
15 files changed, 159 insertions(+), 96 deletions(-)
diff --git a/controller/pom.xml b/controller/pom.xml
index 1f7698add..2eaa30516 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -59,4 +59,28 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
+ <inputEncoding>UTF-8</inputEncoding>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java
index 8da5347d0..b137e0e3b 100644
--- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java
+++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java
@@ -104,7 +104,6 @@ public class ControllerManagerTest {
for (ControllerManager controllerManager : controllers) {
final DLedgerController controller = (DLedgerController) controllerManager.getController();
if (controller.getMemberState().getSelfId().equals(leaderId) && controller.isLeaderState()) {
- System.out.println("New leader " + leaderId);
return controllerManager;
}
}
@@ -169,7 +168,6 @@ public class ControllerManagerTest {
heartbeatRequestHeader.setBrokerName("broker1");
heartbeatRequestHeader.setBrokerAddr("127.0.0.1:8001");
final RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.BROKER_HEARTBEAT, heartbeatRequestHeader);
- System.out.println("send heartbeat success");
try {
final RemotingCommand remotingCommand = this.remotingClient1.invokeSync(leaderAddr, request, 3000);
} catch (Exception e) {
@@ -196,7 +194,6 @@ public class ControllerManagerTest {
controller.shutdown();
}
for (String dir : this.baseDirs) {
- System.out.println("Delete file " + dir);
new File(dir).delete();
}
this.remotingClient.shutdown();
diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java
index 00809aacc..add597310 100644
--- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java
+++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java
@@ -25,9 +25,7 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.common.ControllerConfig;
import org.apache.rocketmq.common.protocol.ResponseCode;
@@ -92,7 +90,6 @@ public class DLedgerControllerTest {
controller.shutdown();
}
for (String dir : this.baseDirs) {
- System.out.println("Delete file " + dir);
new File(dir).delete();
}
}
@@ -115,7 +112,6 @@ public class DLedgerControllerTest {
}, item -> item != null);
final RegisterBrokerToControllerResponseHeader registerResult = (RegisterBrokerToControllerResponseHeader) response.readCustomHeader();
- System.out.println("------------- Register broker done, the result is :" + registerResult);
if (!isFirstRegisteredBroker) {
assertTrue(registerResult.getBrokerId() > 0);
@@ -151,7 +147,6 @@ public class DLedgerControllerTest {
}
for (DLedgerController controller : controllers) {
if (controller.getMemberState().getSelfId().equals(leaderId) && controller.isLeaderState()) {
- System.out.println("New leader " + leaderId);
return controller;
}
}
diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DefaultBrokerHeartbeatManagerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DefaultBrokerHeartbeatManagerTest.java
index 0f106cd71..b8a151ea0 100644
--- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DefaultBrokerHeartbeatManagerTest.java
+++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DefaultBrokerHeartbeatManagerTest.java
@@ -41,7 +41,6 @@ public class DefaultBrokerHeartbeatManagerTest {
public void testDetectBrokerAlive() throws InterruptedException {
final CountDownLatch latch = new CountDownLatch(1);
this.heartbeatManager.addBrokerLifecycleListener((clusterName, brokerName, brokerAddress, brokerId) -> {
- System.out.println("Broker shutdown:" + brokerAddress);
latch.countDown();
});
this.heartbeatManager.registerBroker("cluster1", "broker1", "127.0.0.1:7000", 1L, 3000L, null, 1, 1L);
diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java
index b51c36368..7f20c88b1 100644
--- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java
+++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java
@@ -171,9 +171,7 @@ public class ReplicasInfoManagerTest {
mockHeartbeatDataHigherEpoch();
final ControllerResult<ElectMasterResponseHeader> cResult = this.replicasInfoManager.electMaster(request,
electPolicy);
- System.out.println(cResult.getResponseCode());
final ElectMasterResponseHeader response = cResult.getResponse();
- System.out.println(response);
assertEquals(response.getMasterEpoch(), 2);
assertFalse(response.getNewMasterAddress().isEmpty());
assertEquals("127.0.0.1:9001", response.getNewMasterAddress());
@@ -187,9 +185,7 @@ public class ReplicasInfoManagerTest {
mockHeartbeatDataHigherOffset();
final ControllerResult<ElectMasterResponseHeader> cResult = this.replicasInfoManager.electMaster(request,
electPolicy);
- System.out.println(cResult.getResponseCode());
final ElectMasterResponseHeader response = cResult.getResponse();
- System.out.println(response);
assertEquals(response.getMasterEpoch(), 2);
assertFalse(response.getNewMasterAddress().isEmpty());
assertEquals("127.0.0.1:9002", response.getNewMasterAddress());
diff --git a/proxy/pom.xml b/proxy/pom.xml
index a078d4306..09973d154 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -99,5 +99,28 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
+ <inputEncoding>UTF-8</inputEncoding>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplicationTest.java b/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplicationTest.java
index 64b558600..4d521ad8c 100644
--- a/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplicationTest.java
+++ b/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/GrpcMessagingApplicationTest.java
@@ -80,8 +80,8 @@ public class GrpcMessagingApplicationTest extends InitConfigAndLoggerTest {
metadata.put(InterceptorConstants.LOCAL_ADDRESS, LOCAL_ADDR);
Assert.assertNotNull(Context.current()
- .withValue(InterceptorConstants.METADATA, metadata)
- .attach());
+ .withValue(InterceptorConstants.METADATA, metadata)
+ .attach());
CompletableFuture<QueryRouteResponse> future = new CompletableFuture<>();
QueryRouteRequest request = QueryRouteRequest.newBuilder()
@@ -109,8 +109,8 @@ public class GrpcMessagingApplicationTest extends InitConfigAndLoggerTest {
metadata.put(InterceptorConstants.LOCAL_ADDRESS, LOCAL_ADDR);
Assert.assertNotNull(Context.current()
- .withValue(InterceptorConstants.METADATA, metadata)
- .attach());
+ .withValue(InterceptorConstants.METADATA, metadata)
+ .attach());
QueryRouteRequest request = QueryRouteRequest.newBuilder()
.setEndpoints(grpcEndpoints)
diff --git a/proxy/src/test/java/org/apache/rocketmq/proxy/service/transaction/ClusterTransactionServiceTest.java b/proxy/src/test/java/org/apache/rocketmq/proxy/service/transaction/ClusterTransactionServiceTest.java
index f18f1eef3..07735f96a 100644
--- a/proxy/src/test/java/org/apache/rocketmq/proxy/service/transaction/ClusterTransactionServiceTest.java
+++ b/proxy/src/test/java/org/apache/rocketmq/proxy/service/transaction/ClusterTransactionServiceTest.java
@@ -109,17 +109,17 @@ public class ClusterTransactionServiceTest extends BaseServiceTest {
@Test
public void testScanProducerHeartBeat() throws Exception {
Mockito.reset(this.topicRouteService);
- String BROKER_NAME2 = "broker-2-01";
- String CLUSTER_NAME2 = "broker-2";
- String BROKER_ADDR2 = "127.0.0.2:10911";
+ String brokerName2 = "broker-2-01";
+ String clusterName2 = "broker-2";
+ String brokerAddr2 = "127.0.0.2:10911";
BrokerData brokerData = new BrokerData();
QueueData queueData = new QueueData();
- queueData.setBrokerName(BROKER_NAME2);
- brokerData.setCluster(CLUSTER_NAME2);
- brokerData.setBrokerName(BROKER_NAME2);
+ queueData.setBrokerName(brokerName2);
+ brokerData.setCluster(clusterName2);
+ brokerData.setBrokerName(brokerName2);
HashMap<Long, String> brokerAddrs = new HashMap<>();
- brokerAddrs.put(MixAll.MASTER_ID, BROKER_ADDR2);
+ brokerAddrs.put(MixAll.MASTER_ID, brokerName2);
brokerData.setBrokerAddrs(brokerAddrs);
topicRouteData.getQueueDatas().add(queueData);
topicRouteData.getBrokerDatas().add(brokerData);
@@ -143,15 +143,15 @@ public class ClusterTransactionServiceTest extends BaseServiceTest {
QueueData clusterQueueData2 = new QueueData();
BrokerData clusterBrokerData2 = new BrokerData();
- clusterQueueData2.setBrokerName(BROKER_NAME2);
+ clusterQueueData2.setBrokerName(brokerName2);
clusterTopicRouteData2.setQueueDatas(Lists.newArrayList(clusterQueueData2));
- clusterBrokerData2.setCluster(CLUSTER_NAME2);
- clusterBrokerData2.setBrokerName(BROKER_NAME2);
+ clusterBrokerData2.setCluster(clusterName2);
+ clusterBrokerData2.setBrokerName(brokerName2);
brokerAddrs = new HashMap<>();
- brokerAddrs.put(MixAll.MASTER_ID, BROKER_ADDR2);
+ brokerAddrs.put(MixAll.MASTER_ID, brokerAddr2);
clusterBrokerData2.setBrokerAddrs(brokerAddrs);
clusterTopicRouteData2.setBrokerDatas(Lists.newArrayList(clusterBrokerData2));
- when(this.topicRouteService.getAllMessageQueueView(eq(CLUSTER_NAME2))).thenReturn(new MessageQueueView(CLUSTER_NAME2, clusterTopicRouteData2));
+ when(this.topicRouteService.getAllMessageQueueView(eq(clusterName2))).thenReturn(new MessageQueueView(clusterName2, clusterTopicRouteData2));
ConfigurationManager.getProxyConfig().setTransactionHeartbeatBatchNum(2);
this.clusterTransactionService.start();
@@ -174,7 +174,7 @@ public class ClusterTransactionServiceTest extends BaseServiceTest {
await().atMost(Duration.ofSeconds(1)).until(() -> brokerAddrArgumentCaptor.getAllValues().size() == 4);
- assertEquals(Lists.newArrayList(BROKER_ADDR, BROKER_ADDR, BROKER_ADDR2, BROKER_ADDR2),
+ assertEquals(Lists.newArrayList(BROKER_ADDR, BROKER_ADDR, brokerAddr2, brokerAddr2),
brokerAddrArgumentCaptor.getAllValues().stream().sorted().collect(Collectors.toList()));
List<HeartbeatData> heartbeatDataList = heartbeatDataArgumentCaptor.getAllValues();
@@ -186,7 +186,7 @@ public class ClusterTransactionServiceTest extends BaseServiceTest {
}
assertTrue(groupSet.isEmpty());
- assertEquals(BROKER_NAME2, this.clusterTransactionService.getBrokerNameByAddr(BROKER_ADDR2));
+ assertEquals(brokerName2, this.clusterTransactionService.getBrokerNameByAddr(brokerAddr2));
assertEquals(BROKER_NAME, this.clusterTransactionService.getBrokerNameByAddr(BROKER_ADDR));
}
}
\ No newline at end of file
diff --git a/remoting/pom.xml b/remoting/pom.xml
index a61764319..04bd6ea9c 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -55,4 +55,28 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
+ <inputEncoding>UTF-8</inputEncoding>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/RemotingServerTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/RemotingServerTest.java
index 6fa230adb..90072960b 100644
--- a/remoting/src/test/java/org/apache/rocketmq/remoting/RemotingServerTest.java
+++ b/remoting/src/test/java/org/apache/rocketmq/remoting/RemotingServerTest.java
@@ -26,7 +26,12 @@ import org.apache.rocketmq.remoting.exception.RemotingConnectException;
import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
import org.apache.rocketmq.remoting.exception.RemotingTooMuchRequestException;
-import org.apache.rocketmq.remoting.netty.*;
+import org.apache.rocketmq.remoting.netty.ResponseFuture;
+import org.apache.rocketmq.remoting.netty.NettyServerConfig;
+import org.apache.rocketmq.remoting.netty.NettyClientConfig;
+import org.apache.rocketmq.remoting.netty.NettyRemotingServer;
+import org.apache.rocketmq.remoting.netty.NettyRemotingClient;
+import org.apache.rocketmq.remoting.netty.NettyRequestProcessor;
import org.apache.rocketmq.remoting.protocol.LanguageCode;
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.junit.AfterClass;
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/SubRemotingServerTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/SubRemotingServerTest.java
index b1594d0c1..90fa8451f 100644
--- a/remoting/src/test/java/org/apache/rocketmq/remoting/SubRemotingServerTest.java
+++ b/remoting/src/test/java/org/apache/rocketmq/remoting/SubRemotingServerTest.java
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown;
public class SubRemotingServerTest {
- private static final int subServerPort = 1234;
+ private static final int SUB_SERVER_PORT = 1234;
private static RemotingServer remotingServer;
private static RemotingClient remotingClient;
@@ -53,7 +53,7 @@ public class SubRemotingServerTest {
}
public static RemotingServer createSubRemotingServer(RemotingServer parentServer) {
- RemotingServer subServer = parentServer.newRemotingServer(subServerPort);
+ RemotingServer subServer = parentServer.newRemotingServer(SUB_SERVER_PORT);
subServer.registerProcessor(1, new NettyRequestProcessor() {
@Override
public RemotingCommand processRequest(final ChannelHandlerContext ctx,
@@ -89,7 +89,7 @@ public class SubRemotingServerTest {
response = remotingClient.invokeSync("localhost:1234", request, 1000 * 3);
assertThat(response).isNotNull();
assertThat(response.getExtFields()).hasSize(2);
- assertThat(response.getRemark()).isEqualTo(String.valueOf(subServerPort));
+ assertThat(response.getRemark()).isEqualTo(String.valueOf(SUB_SERVER_PORT));
// Issue unsupported request to SubRemotingServer
request.setCode(0);
@@ -99,7 +99,7 @@ public class SubRemotingServerTest {
// Issue request to a closed SubRemotingServer
request.setCode(1);
- remotingServer.removeRemotingServer(subServerPort);
+ remotingServer.removeRemotingServer(SUB_SERVER_PORT);
subServer.shutdown();
try {
remotingClient.invokeSync("localhost:1234", request, 1000 * 3);
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyClientConfigTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyClientConfigTest.java
index 15cf03386..c28323eef 100644
--- a/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyClientConfigTest.java
+++ b/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyClientConfigTest.java
@@ -26,39 +26,39 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(MockitoJUnitRunner.class)
public class NettyClientConfigTest {
- @Test
- public void testChangeConfigBySystemProperty() throws NoSuchFieldException, IllegalAccessException {
-
+ @Test
+ public void testChangeConfigBySystemProperty() throws NoSuchFieldException, IllegalAccessException {
- System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_WORKER_SIZE, "1");
- System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CONNECT_TIMEOUT, "2000");
- System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CHANNEL_MAX_IDLE_SECONDS, "60");
- System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_SNDBUF_SIZE, "16383");
- System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_RCVBUF_SIZE, "16384");
- System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CLOSE_SOCKET_IF_TIMEOUT, "false");
+ System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_WORKER_SIZE, "1");
+ System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CONNECT_TIMEOUT, "2000");
+ System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CHANNEL_MAX_IDLE_SECONDS, "60");
+ System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_SNDBUF_SIZE, "16383");
+ System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_RCVBUF_SIZE, "16384");
+ System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CLOSE_SOCKET_IF_TIMEOUT, "false");
- NettySystemConfig.socketSndbufSize =
- Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_SNDBUF_SIZE, "65535"));
- NettySystemConfig.socketRcvbufSize =
- Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_RCVBUF_SIZE, "65535"));
- NettySystemConfig.clientWorkerSize =
- Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_WORKER_SIZE, "4"));
- NettySystemConfig.connectTimeoutMillis =
- Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CONNECT_TIMEOUT, "3000"));
- NettySystemConfig.clientChannelMaxIdleTimeSeconds =
- Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CHANNEL_MAX_IDLE_SECONDS, "120"));
- NettySystemConfig.clientCloseSocketIfTimeout =
- Boolean.parseBoolean(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CLOSE_SOCKET_IF_TIMEOUT, "true"));
- NettyClientConfig changedConfig = new NettyClientConfig();
- assertThat(changedConfig.getClientWorkerThreads()).isEqualTo(1);
- assertThat(changedConfig.getClientOnewaySemaphoreValue()).isEqualTo(65535);
- assertThat(changedConfig.getClientAsyncSemaphoreValue()).isEqualTo(65535);
- assertThat(changedConfig.getConnectTimeoutMillis()).isEqualTo(2000);
- assertThat(changedConfig.getClientChannelMaxIdleTimeSeconds()).isEqualTo(60);
- assertThat(changedConfig.getClientSocketSndBufSize()).isEqualTo(16383);
- assertThat(changedConfig.getClientSocketRcvBufSize()).isEqualTo(16384);
- assertThat(changedConfig.isClientCloseSocketIfTimeout()).isEqualTo(false);
- }
+ NettySystemConfig.socketSndbufSize =
+ Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_SNDBUF_SIZE, "65535"));
+ NettySystemConfig.socketRcvbufSize =
+ Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_RCVBUF_SIZE, "65535"));
+ NettySystemConfig.clientWorkerSize =
+ Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_WORKER_SIZE, "4"));
+ NettySystemConfig.connectTimeoutMillis =
+ Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CONNECT_TIMEOUT, "3000"));
+ NettySystemConfig.clientChannelMaxIdleTimeSeconds =
+ Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CHANNEL_MAX_IDLE_SECONDS, "120"));
+ NettySystemConfig.clientCloseSocketIfTimeout =
+ Boolean.parseBoolean(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_CLIENT_CLOSE_SOCKET_IF_TIMEOUT, "true"));
+
+ NettyClientConfig changedConfig = new NettyClientConfig();
+ assertThat(changedConfig.getClientWorkerThreads()).isEqualTo(1);
+ assertThat(changedConfig.getClientOnewaySemaphoreValue()).isEqualTo(65535);
+ assertThat(changedConfig.getClientAsyncSemaphoreValue()).isEqualTo(65535);
+ assertThat(changedConfig.getConnectTimeoutMillis()).isEqualTo(2000);
+ assertThat(changedConfig.getClientChannelMaxIdleTimeSeconds()).isEqualTo(60);
+ assertThat(changedConfig.getClientSocketSndBufSize()).isEqualTo(16383);
+ assertThat(changedConfig.getClientSocketRcvBufSize()).isEqualTo(16384);
+ assertThat(changedConfig.isClientCloseSocketIfTimeout()).isEqualTo(false);
+ }
}
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyServerConfigTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyServerConfigTest.java
index c07025d63..0ab0d193e 100644
--- a/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyServerConfigTest.java
+++ b/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyServerConfigTest.java
@@ -26,12 +26,12 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(MockitoJUnitRunner.class)
public class NettyServerConfigTest {
- @Test
- public void testChangeConfigBySystemProperty() {
- System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_BACKLOG, "65535");
- NettySystemConfig.socketBacklog =
- Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_BACKLOG, "1024"));
- NettyServerConfig changedConfig = new NettyServerConfig();
- assertThat(changedConfig.getServerSocketBacklog()).isEqualTo(65535);
- }
+ @Test
+ public void testChangeConfigBySystemProperty() {
+ System.setProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_BACKLOG, "65535");
+ NettySystemConfig.socketBacklog =
+ Integer.parseInt(System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_BACKLOG, "1024"));
+ NettyServerConfig changedConfig = new NettyServerConfig();
+ assertThat(changedConfig.getServerSocketBacklog()).isEqualTo(65535);
+ }
}
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 5617b2246..eeefccb4b 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
@@ -208,7 +208,7 @@ public class RemotingCommandTest {
CommandCustomHeader decodedHeader = decodedCommand.decodeCommandCustomHeader(ExtFieldsHeader.class);
assertThat(((ExtFieldsHeader) decodedHeader).getStringValue()).isEqualTo("bilibili");
assertThat(((ExtFieldsHeader) decodedHeader).getIntValue()).isEqualTo(2333);
- assertThat(((ExtFieldsHeader) decodedHeader).getLongValue()).isEqualTo(23333333l);
+ assertThat(((ExtFieldsHeader) decodedHeader).getLongValue()).isEqualTo(23333333L);
assertThat(((ExtFieldsHeader) decodedHeader).isBooleanValue()).isEqualTo(true);
assertThat(((ExtFieldsHeader) decodedHeader).getDoubleValue()).isBetween(0.617, 0.619);
} catch (RemotingCommandException e) {
@@ -281,7 +281,7 @@ class SampleCommandCustomHeader implements CommandCustomHeader {
class ExtFieldsHeader implements CommandCustomHeader {
private String stringValue = "bilibili";
private int intValue = 2333;
- private long longValue = 23333333l;
+ private long longValue = 23333333L;
private boolean booleanValue = true;
private double doubleValue = 0.618;
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingSerializableTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingSerializableTest.java
index b70e23ace..6bd80217d 100644
--- a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingSerializableTest.java
+++ b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/RemotingSerializableTest.java
@@ -92,29 +92,29 @@ public class RemotingSerializableTest {
@Test
public void testEncode() {
- class Foo extends RemotingSerializable {
+ class Foo extends RemotingSerializable {
Map<Long, String> map = new HashMap<>();
Foo() {
- map.put(0L, "Test");
+ map.put(0L, "Test");
}
- public Map<Long, String> getMap() {
- return map;
- }
- }
- Foo foo = new Foo();
- String invalid = new String(foo.encode(), Charset.defaultCharset());
- String valid = new String(foo.encode(SerializerFeature.BrowserCompatible, SerializerFeature.QuoteFieldNames,
- SerializerFeature.MapSortField), Charset.defaultCharset());
-
- Gson gson = new Gson();
- final TypeAdapter<JsonElement> strictAdapter = gson.getAdapter(JsonElement.class);
- try {
- strictAdapter.fromJson(invalid);
- Assert.fail("Should have thrown");
- } catch (IOException ignore) {
- }
+ public Map<Long, String> getMap() {
+ return map;
+ }
+ }
+ Foo foo = new Foo();
+ String invalid = new String(foo.encode(), Charset.defaultCharset());
+ String valid = new String(foo.encode(SerializerFeature.BrowserCompatible, SerializerFeature.QuoteFieldNames,
+ SerializerFeature.MapSortField), Charset.defaultCharset());
+
+ Gson gson = new Gson();
+ final TypeAdapter<JsonElement> strictAdapter = gson.getAdapter(JsonElement.class);
+ try {
+ strictAdapter.fromJson(invalid);
+ Assert.fail("Should have thrown");
+ } catch (IOException ignore) {
+ }
try {
strictAdapter.fromJson(valid);