This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pulsar-java-contrib.git
The following commit(s) were added to refs/heads/main by this push:
new d5ef0c5 [fix] Maintain consistency with Pulsar's coding style (#21)
d5ef0c5 is described below
commit d5ef0c55288440b023d1c5d3f833cb599d8d3070
Author: StevenLuMT <[email protected]>
AuthorDate: Mon Nov 3 15:57:44 2025 +0800
[fix] Maintain consistency with Pulsar's coding style (#21)
---
pom.xml | 6 ++++++
.../org/apache/pulsar/admin/mcp/transport/TransportManagerTest.java | 1 -
.../org/apache/pulsar/rpc/contrib/client/PulsarRpcClientImpl.java | 1 -
.../java/org/apache/pulsar/rpc/contrib/client/ReplyListener.java | 1 -
.../java/org/apache/pulsar/rpc/contrib/client/RequestSender.java | 1 -
.../apache/pulsar/rpc/contrib/common/MessageDispatcherFactory.java | 1 -
.../org/apache/pulsar/rpc/contrib/server/PulsarRpcServerImpl.java | 1 -
.../main/java/org/apache/pulsar/rpc/contrib/server/ReplySender.java | 1 -
.../java/org/apache/pulsar/rpc/contrib/server/RequestListener.java | 1 -
.../test/java/org/apache/pulsar/rpc/contrib/base/PulsarRpcBase.java | 1 -
.../src/test/java/org/apache/pulsar/txn/TransactionImplTest.java | 1 -
src/main/resources/checkstyle.xml | 1 -
12 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2367ab1..266dc9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,12 @@
<version>${google-java-format.version}</version>
<style>GOOGLE</style>
</googleJavaFormat>
+ <!-- \# refers to the static imports -->
+ <replaceRegex>
+
<name>no-blank-between-static-and-normal-imports</name>
+ <searchRegex>(?m)(^import static[^\n]*;\n(?:import
static[^\n]*;\n)*)(?:\s*\n)(?=import )</searchRegex>
+ <replacement>$1</replacement>
+ </replaceRegex>
</java>
<pom>
<includes>
diff --git
a/pulsar-admin-mcp-contrib/src/test/java/org/apache/pulsar/admin/mcp/transport/TransportManagerTest.java
b/pulsar-admin-mcp-contrib/src/test/java/org/apache/pulsar/admin/mcp/transport/TransportManagerTest.java
index b45f1b0..0ed6fa9 100644
---
a/pulsar-admin-mcp-contrib/src/test/java/org/apache/pulsar/admin/mcp/transport/TransportManagerTest.java
+++
b/pulsar-admin-mcp-contrib/src/test/java/org/apache/pulsar/admin/mcp/transport/TransportManagerTest.java
@@ -20,7 +20,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-
import org.apache.pulsar.admin.mcp.config.PulsarMCPCliOptions;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/PulsarRpcClientImpl.java
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/PulsarRpcClientImpl.java
index b0e9b30..4c100f9 100644
---
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/PulsarRpcClientImpl.java
+++
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/PulsarRpcClientImpl.java
@@ -15,7 +15,6 @@ package org.apache.pulsar.rpc.contrib.client;
import static lombok.AccessLevel.PACKAGE;
import static
org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
-
import java.io.IOException;
import java.time.Duration;
import java.util.Map;
diff --git
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/ReplyListener.java
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/ReplyListener.java
index f348c26..db6a35a 100644
---
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/ReplyListener.java
+++
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/ReplyListener.java
@@ -16,7 +16,6 @@ package org.apache.pulsar.rpc.contrib.client;
import static org.apache.pulsar.rpc.contrib.common.Constants.ERROR_MESSAGE;
import static
org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
import static org.apache.pulsar.rpc.contrib.common.Constants.SERVER_SUB;
-
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import lombok.AccessLevel;
diff --git
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/RequestSender.java
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/RequestSender.java
index 71de825..7ab9b3f 100644
---
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/RequestSender.java
+++
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/RequestSender.java
@@ -15,7 +15,6 @@ package org.apache.pulsar.rpc.contrib.client;
import static org.apache.pulsar.rpc.contrib.common.Constants.REPLY_TOPIC;
import static
org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_TIMEOUT_MILLIS;
-
import java.util.concurrent.CompletableFuture;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
diff --git
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/common/MessageDispatcherFactory.java
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/common/MessageDispatcherFactory.java
index 2cf3b97..8d1d74b 100644
---
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/common/MessageDispatcherFactory.java
+++
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/common/MessageDispatcherFactory.java
@@ -14,7 +14,6 @@
package org.apache.pulsar.rpc.contrib.common;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
import java.io.IOException;
import java.time.Duration;
import java.util.Map;
diff --git
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/PulsarRpcServerImpl.java
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/PulsarRpcServerImpl.java
index 9533096..79f2cea 100644
---
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/PulsarRpcServerImpl.java
+++
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/PulsarRpcServerImpl.java
@@ -14,7 +14,6 @@
package org.apache.pulsar.rpc.contrib.server;
import static lombok.AccessLevel.PACKAGE;
-
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;
diff --git
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/ReplySender.java
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/ReplySender.java
index 90fe0a1..614c42c 100644
---
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/ReplySender.java
+++
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/ReplySender.java
@@ -16,7 +16,6 @@ package org.apache.pulsar.rpc.contrib.server;
import static org.apache.pulsar.rpc.contrib.common.Constants.ERROR_MESSAGE;
import static
org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
import static org.apache.pulsar.rpc.contrib.common.Constants.SERVER_SUB;
-
import java.util.function.BiConsumer;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
diff --git
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/RequestListener.java
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/RequestListener.java
index 844b9d3..11c71ca 100644
---
a/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/RequestListener.java
+++
b/pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/RequestListener.java
@@ -16,7 +16,6 @@ package org.apache.pulsar.rpc.contrib.server;
import static org.apache.pulsar.rpc.contrib.common.Constants.REPLY_TOPIC;
import static
org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
import static
org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_TIMEOUT_MILLIS;
-
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
diff --git
a/pulsar-rpc-contrib/src/test/java/org/apache/pulsar/rpc/contrib/base/PulsarRpcBase.java
b/pulsar-rpc-contrib/src/test/java/org/apache/pulsar/rpc/contrib/base/PulsarRpcBase.java
index 3e30be9..f2caeb8 100644
---
a/pulsar-rpc-contrib/src/test/java/org/apache/pulsar/rpc/contrib/base/PulsarRpcBase.java
+++
b/pulsar-rpc-contrib/src/test/java/org/apache/pulsar/rpc/contrib/base/PulsarRpcBase.java
@@ -14,7 +14,6 @@
package org.apache.pulsar.rpc.contrib.base;
import static java.util.UUID.randomUUID;
-
import java.time.Duration;
import java.util.function.Supplier;
import java.util.regex.Pattern;
diff --git
a/pulsar-transaction-contrib/src/test/java/org/apache/pulsar/txn/TransactionImplTest.java
b/pulsar-transaction-contrib/src/test/java/org/apache/pulsar/txn/TransactionImplTest.java
index 6871f38..a7b4709 100644
---
a/pulsar-transaction-contrib/src/test/java/org/apache/pulsar/txn/TransactionImplTest.java
+++
b/pulsar-transaction-contrib/src/test/java/org/apache/pulsar/txn/TransactionImplTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/resources/checkstyle.xml
b/src/main/resources/checkstyle.xml
index 1baa7fe..c56dfb2 100644
--- a/src/main/resources/checkstyle.xml
+++ b/src/main/resources/checkstyle.xml
@@ -122,7 +122,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
<property name="option" value="top"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
<property name="tokens" value="STATIC_IMPORT, IMPORT"/>
- <property name="separated" value="true"/>
<message key="import.ordering"
value="Import {0} appears after other imports that it
should precede"/>
</module>
