Skip to content

Commit eb19bd3

Browse files
committed
[fix] Maintain consistency with Pulsar's coding style
1 parent d25930e commit eb19bd3

File tree

12 files changed

+7
-12
lines changed

12 files changed

+7
-12
lines changed

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<license-maven-plugin.version>4.5</license-maven-plugin.version>
5757
<org.testing.version>7.10.2</org.testing.version>
5858
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
59-
<google-java-format.version>1.10.0</google-java-format.version>
59+
<google-java-format.version>1.28.0</google-java-format.version>
6060
<commons-pool.version>2.12.0</commons-pool.version>
6161
<awaitility.version>4.2.2</awaitility.version>
6262
<testcontainers.version>1.20.1</testcontainers.version>
@@ -140,6 +140,12 @@
140140
<version>${google-java-format.version}</version>
141141
<style>GOOGLE</style>
142142
</googleJavaFormat>
143+
<!-- \# refers to the static imports -->
144+
<replaceRegex>
145+
<name>no-blank-between-static-and-normal-imports</name>
146+
<searchRegex>(?m)(^import static[^\n]*;\n(?:import static[^\n]*;\n)*)(?:\s*\n)(?=import )</searchRegex>
147+
<replacement>$1</replacement>
148+
</replaceRegex>
143149
</java>
144150
<pom>
145151
<includes>

pulsar-admin-mcp-contrib/src/test/java/org/apache/pulsar/admin/mcp/transport/TransportManagerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.mockito.Mockito.verify;
2121
import static org.mockito.Mockito.verifyNoMoreInteractions;
2222
import static org.mockito.Mockito.when;
23-
2423
import org.apache.pulsar.admin.mcp.config.PulsarMCPCliOptions;
2524
import org.testng.annotations.BeforeMethod;
2625
import org.testng.annotations.Test;

pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/PulsarRpcClientImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import static lombok.AccessLevel.PACKAGE;
1717
import static org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
18-
1918
import java.io.IOException;
2019
import java.time.Duration;
2120
import java.util.Map;

pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/ReplyListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.apache.pulsar.rpc.contrib.common.Constants.ERROR_MESSAGE;
1717
import static org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
1818
import static org.apache.pulsar.rpc.contrib.common.Constants.SERVER_SUB;
19-
2019
import java.util.concurrent.CompletableFuture;
2120
import java.util.concurrent.ConcurrentHashMap;
2221
import lombok.AccessLevel;

pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/client/RequestSender.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import static org.apache.pulsar.rpc.contrib.common.Constants.REPLY_TOPIC;
1717
import static org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_TIMEOUT_MILLIS;
18-
1918
import java.util.concurrent.CompletableFuture;
2019
import lombok.AccessLevel;
2120
import lombok.RequiredArgsConstructor;

pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/common/MessageDispatcherFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package org.apache.pulsar.rpc.contrib.common;
1515

1616
import static java.util.concurrent.TimeUnit.MILLISECONDS;
17-
1817
import java.io.IOException;
1918
import java.time.Duration;
2019
import java.util.Map;

pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/PulsarRpcServerImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package org.apache.pulsar.rpc.contrib.server;
1515

1616
import static lombok.AccessLevel.PACKAGE;
17-
1817
import java.io.IOException;
1918
import java.util.concurrent.CompletableFuture;
2019
import java.util.function.BiConsumer;

pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/ReplySender.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.apache.pulsar.rpc.contrib.common.Constants.ERROR_MESSAGE;
1717
import static org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
1818
import static org.apache.pulsar.rpc.contrib.common.Constants.SERVER_SUB;
19-
2019
import java.util.function.BiConsumer;
2120
import lombok.AccessLevel;
2221
import lombok.RequiredArgsConstructor;

pulsar-rpc-contrib/src/main/java/org/apache/pulsar/rpc/contrib/server/RequestListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.apache.pulsar.rpc.contrib.common.Constants.REPLY_TOPIC;
1717
import static org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_DELIVER_AT_TIME;
1818
import static org.apache.pulsar.rpc.contrib.common.Constants.REQUEST_TIMEOUT_MILLIS;
19-
2019
import java.util.concurrent.CompletableFuture;
2120
import java.util.concurrent.ExecutionException;
2221
import java.util.concurrent.TimeUnit;

pulsar-rpc-contrib/src/test/java/org/apache/pulsar/rpc/contrib/base/PulsarRpcBase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package org.apache.pulsar.rpc.contrib.base;
1515

1616
import static java.util.UUID.randomUUID;
17-
1817
import java.time.Duration;
1918
import java.util.function.Supplier;
2019
import java.util.regex.Pattern;

0 commit comments

Comments
 (0)