fix checkstyle

apache · Jan 10, 2024 · 4c091e7 · 4c091e7
1 parent 92c0ac2
commit 4c091e7
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 22 deletions.
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/Settings.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/Settings.java
@@ -32,8 +32,8 @@ public abstract class Settings {
     protected volatile RetryPolicy retryPolicy;
     protected final Duration requestTimeout;
 
-    public Settings(String namespace, ClientId clientId, ClientType clientType, Endpoints accessPoint, RetryPolicy retryPolicy,
-        Duration requestTimeout) {
+    public Settings(String namespace, ClientId clientId, ClientType clientType, Endpoints accessPoint,
+        RetryPolicy retryPolicy, Duration requestTimeout) {
         this.namespace = namespace;
         this.clientId = clientId;
         this.clientType = clientType;
@@ -42,7 +42,8 @@ public Settings(String namespace, ClientId clientId, ClientType clientType, Endp
         this.requestTimeout = requestTimeout;
     }
 
-    public Settings(String namespace, ClientId clientId, ClientType clientType, Endpoints accessPoint, Duration requestTimeout) {
+    public Settings(String namespace, ClientId clientId, ClientType clientType, Endpoints accessPoint,
+        Duration requestTimeout) {
         this(namespace, clientId, clientType, accessPoint, null, requestTimeout);
     }
 

diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java
@@ -224,7 +224,10 @@ public void onFailure(Throwable t) {
     }
 
     protected Resource getProtobufGroup() {
-        return Resource.newBuilder().setResourceNamespace(clientConfiguration.getNamespace()).setName(consumerGroup).build();
+        return Resource.newBuilder()
+            .setResourceNamespace(clientConfiguration.getNamespace())
+            .setName(consumerGroup)
+            .build();
     }
 
     @Override

diff --git a/...lient/src/main/java/org/apache/rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java b/...lient/src/main/java/org/apache/rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java
@@ -75,8 +75,8 @@ public SimpleConsumerImpl(ClientConfiguration clientConfiguration, String consum
         Map<String, FilterExpression> subscriptionExpressions) {
         super(clientConfiguration, consumerGroup, subscriptionExpressions.keySet());
         Resource groupResource = new Resource(clientConfiguration.getNamespace(), consumerGroup);
-        this.simpleSubscriptionSettings = new SimpleSubscriptionSettings(clientConfiguration.getNamespace(), clientId, endpoints,
-            groupResource, clientConfiguration.getRequestTimeout(), awaitDuration, subscriptionExpressions);
+        this.simpleSubscriptionSettings = new SimpleSubscriptionSettings(clientConfiguration.getNamespace(), clientId,
+            endpoints, groupResource, clientConfiguration.getRequestTimeout(), awaitDuration, subscriptionExpressions);
         this.consumerGroup = consumerGroup;
         this.awaitDuration = awaitDuration;
 

diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/ProducerImpl.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/ProducerImpl.java
@@ -418,7 +418,8 @@ private ListenableFuture<List<SendReceiptImpl>> send(List<Message> messages, boo
      */
     private SendMessageRequest wrapSendMessageRequest(List<PublishingMessageImpl> pubMessages, MessageQueueImpl mq) {
         final List<apache.rocketmq.v2.Message> messages = pubMessages.stream()
-            .map(publishingMessage -> publishingMessage.toProtobuf(clientConfiguration.getNamespace(), mq)).collect(Collectors.toList());
+            .map(publishingMessage -> publishingMessage.toProtobuf(clientConfiguration.getNamespace(), mq))
+            .collect(Collectors.toList());
         return SendMessageRequest.newBuilder().addAllMessages(messages).build();
     }
 

diff --git a/...lient/src/main/java/org/apache/rocketmq/client/java/impl/producer/PublishingSettings.java b/...lient/src/main/java/org/apache/rocketmq/client/java/impl/producer/PublishingSettings.java
@@ -45,8 +45,8 @@ public class PublishingSettings extends Settings {
     private volatile int maxBodySizeBytes = 4 * 1024 * 1024;
     private volatile boolean validateMessageType = true;
 
-    public PublishingSettings(String namespace, ClientId clientId, Endpoints accessPoint, ExponentialBackoffRetryPolicy retryPolicy,
-        Duration requestTimeout, Set<String> topics) {
+    public PublishingSettings(String namespace, ClientId clientId, Endpoints accessPoint,
+        ExponentialBackoffRetryPolicy retryPolicy, Duration requestTimeout, Set<String> topics) {
         super(namespace, clientId, ClientType.PRODUCER, accessPoint, retryPolicy, requestTimeout);
         this.topics = topics;
     }
@@ -62,8 +62,13 @@ public boolean isValidateMessageType() {
     @Override
     public apache.rocketmq.v2.Settings toProtobuf() {
         final Publishing publishing = Publishing.newBuilder()
-            .addAllTopics(topics.stream().map(name -> Resource.newBuilder().setResourceNamespace(namespace).setName(name).build())
-                .collect(Collectors.toList())).setValidateMessageType(validateMessageType).build();
+            .addAllTopics(topics.stream().map(name -> Resource.newBuilder()
+                    .setResourceNamespace(namespace)
+                    .setName(name)
+                    .build())
+                .collect(Collectors.toList()))
+            .setValidateMessageType(validateMessageType)
+            .build();
         final apache.rocketmq.v2.Settings.Builder builder = apache.rocketmq.v2.Settings.newBuilder()
             .setAccessPoint(accessPoint.toProtobuf()).setClientType(clientType.toProtobuf())
             .setRequestTimeout(Durations.fromNanos(requestTimeout.toNanos())).setPublishing(publishing);

diff --git a/...test/java/org/apache/rocketmq/client/java/impl/consumer/PushSubscriptionSettingsTest.java b/...test/java/org/apache/rocketmq/client/java/impl/consumer/PushSubscriptionSettingsTest.java
@@ -54,14 +54,20 @@ public void testToProtobuf() {
         Assert.assertTrue(settings.hasSubscription());
         final Subscription subscription = settings.getSubscription();
         Assert.assertEquals(subscription.getGroup(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_CONSUMER_GROUP_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_CONSUMER_GROUP_0)
+                .build());
         Assert.assertFalse(subscription.getFifo());
         final List<SubscriptionEntry> subscriptionsList = subscription.getSubscriptionsList();
         Assert.assertEquals(subscriptionsList.size(), 1);
         final SubscriptionEntry subscriptionEntry = subscriptionsList.get(0);
         Assert.assertEquals(subscriptionEntry.getExpression().getType(), FilterType.TAG);
         Assert.assertEquals(subscriptionEntry.getTopic(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_TOPIC_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_TOPIC_0)
+                .build());
     }
 
     @Test
@@ -81,14 +87,20 @@ public void testToProtobufWithSqlExpression() {
         Assert.assertTrue(settings.hasSubscription());
         final Subscription subscription = settings.getSubscription();
         Assert.assertEquals(subscription.getGroup(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_CONSUMER_GROUP_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_CONSUMER_GROUP_0)
+                .build());
         Assert.assertFalse(subscription.getFifo());
         final List<SubscriptionEntry> subscriptionsList = subscription.getSubscriptionsList();
         Assert.assertEquals(subscriptionsList.size(), 1);
         final SubscriptionEntry subscriptionEntry = subscriptionsList.get(0);
         Assert.assertEquals(subscriptionEntry.getExpression().getType(), FilterType.SQL);
         Assert.assertEquals(subscriptionEntry.getTopic(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_TOPIC_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_TOPIC_0)
+                .build());
     }
 
     @Test

diff --git a/...st/java/org/apache/rocketmq/client/java/impl/consumer/SimpleSubscriptionSettingsTest.java b/...st/java/org/apache/rocketmq/client/java/impl/consumer/SimpleSubscriptionSettingsTest.java
@@ -53,15 +53,21 @@ public void testToProtobuf() {
         Assert.assertTrue(settings.hasSubscription());
         final Subscription subscription = settings.getSubscription();
         Assert.assertEquals(subscription.getGroup(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_CONSUMER_GROUP_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_CONSUMER_GROUP_0)
+                .build());
         Assert.assertFalse(subscription.getFifo());
         Assert.assertEquals(subscription.getLongPollingTimeout(), Durations.fromNanos(longPollingTimeout.toNanos()));
         final List<SubscriptionEntry> subscriptionsList = subscription.getSubscriptionsList();
         Assert.assertEquals(subscriptionsList.size(), 1);
         final SubscriptionEntry subscriptionEntry = subscriptionsList.get(0);
         Assert.assertEquals(subscriptionEntry.getExpression().getType(), FilterType.TAG);
         Assert.assertEquals(subscriptionEntry.getTopic(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_TOPIC_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_TOPIC_0)
+                .build());
     }
 
     @Test
@@ -81,15 +87,21 @@ public void testToProtobufWithSqlExpression() {
         Assert.assertTrue(settings.hasSubscription());
         final Subscription subscription = settings.getSubscription();
         Assert.assertEquals(subscription.getGroup(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_CONSUMER_GROUP_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_CONSUMER_GROUP_0)
+                .build());
         Assert.assertFalse(subscription.getFifo());
         Assert.assertEquals(subscription.getLongPollingTimeout(), Durations.fromNanos(longPollingTimeout.toNanos()));
         final List<SubscriptionEntry> subscriptionsList = subscription.getSubscriptionsList();
         Assert.assertEquals(subscriptionsList.size(), 1);
         final SubscriptionEntry subscriptionEntry = subscriptionsList.get(0);
         Assert.assertEquals(subscriptionEntry.getExpression().getType(), FilterType.SQL);
         Assert.assertEquals(subscriptionEntry.getTopic(),
-            apache.rocketmq.v2.Resource.newBuilder().setResourceNamespace(FAKE_NAMESPACE).setName(FAKE_TOPIC_0).build());
+            apache.rocketmq.v2.Resource.newBuilder()
+                .setResourceNamespace(FAKE_NAMESPACE)
+                .setName(FAKE_TOPIC_0)
+                .build());
     }
 
 }
diff --git a/java/client/src/test/java/org/apache/rocketmq/client/java/tool/TestBase.java b/java/client/src/test/java/org/apache/rocketmq/client/java/tool/TestBase.java
@@ -193,7 +193,11 @@ protected MessageQueueImpl fakeMessageQueueImpl(String topic) {
     }
 
     protected MessageQueueImpl fakeMessageQueueImpl(String namespace, String topic) {
-        return new MessageQueueImpl(fakePbMessageQueue0(Resource.newBuilder().setResourceNamespace(namespace).setName(topic).build()));
+        return new MessageQueueImpl(fakePbMessageQueue0(
+            Resource.newBuilder()
+                .setResourceNamespace(namespace)
+                .setName(topic)
+                .build()));
     }
 
     protected MessageQueueImpl fakeMessageQueueImpl0() {
@@ -384,8 +388,8 @@ protected ExponentialBackoffRetryPolicy fakeExponentialBackoffRetryPolicy() {
     }
 
     protected PublishingSettings fakeProducerSettings() {
-        return new PublishingSettings(FAKE_NAMESPACE, FAKE_CLIENT_ID, fakeEndpoints(), fakeExponentialBackoffRetryPolicy(),
-            Duration.ofSeconds(1), new HashSet<>());
+        return new PublishingSettings(FAKE_NAMESPACE, FAKE_CLIENT_ID, fakeEndpoints(),
+            fakeExponentialBackoffRetryPolicy(), Duration.ofSeconds(1), new HashSet<>());
     }
 
     protected SendReceiptImpl fakeSendReceiptImpl(