KAFKA-10787 Apply spotless to transaction-coordinator and server-comm…

…on (apache#16172) Reviewers: Chia-Ping Tsai <[email protected]>
gongxuanzhang · Jun 12, 2024 · a454f2a · a454f2a
1 parent cc1202d
commit a454f2a
Show file tree

Hide file tree

Showing 56 changed files with 186 additions and 128 deletions.
diff --git a/build.gradle b/build.gradle
@@ -221,7 +221,6 @@ def excludedSpotlessModules = [':clients',
                                ':metadata',
                                ':raft',
                                ':server',
-                               ':server-common',
                                ':shell',
                                ':storage',
                                ':storage:storage-api', //  rename in settings.gradle
@@ -254,7 +253,6 @@ def excludedSpotlessModules = [':clients',
                                ':streams:upgrade-system-tests-37',
                                ':tools',
                                ':tools:tools-api',
-                               ':transaction-coordinator',
                                ':trogdor']
 
 
@@ -842,8 +840,10 @@ subprojects {
     skipProjects = [ ":jmh-benchmarks", ":trogdor" ]
     skipConfigurations = [ "zinc" ]
   }
-
-  if(JavaVersion.current().isJava11Compatible() && project.path !in excludedSpotlessModules) {
+  //  the task `removeUnusedImports` is implemented by google-java-format, 
+  //  and unfortunately the google-java-format version used by spotless 6.14.0 can't work with JDK 21. 
+  //  Hence, we apply spotless tasks only if the env is either JDK11 or JDK17
+  if ((JavaVersion.current().isJava11() || (JavaVersion.current() == JavaVersion.VERSION_17)) && project.path !in excludedSpotlessModules) {
     apply plugin: 'com.diffplug.spotless'
     spotless {
       java {

diff --git a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java
@@ -18,6 +18,7 @@
 package org.apache.kafka.deferred;
 
 import org.apache.kafka.common.utils.LogContext;
+
 import org.slf4j.Logger;
 
 import java.util.ArrayList;

diff --git a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java
@@ -17,6 +17,13 @@
 
 package org.apache.kafka.queue;
 
+import org.apache.kafka.common.errors.TimeoutException;
+import org.apache.kafka.common.utils.KafkaThread;
+import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.Time;
+
+import org.slf4j.Logger;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -28,12 +35,6 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 
-import org.apache.kafka.common.errors.TimeoutException;
-import org.apache.kafka.common.utils.KafkaThread;
-import org.apache.kafka.common.utils.LogContext;
-import org.apache.kafka.common.utils.Time;
-import org.slf4j.Logger;
-
 
 public final class KafkaEventQueue implements EventQueue {
 

diff --git a/server-common/src/main/java/org/apache/kafka/security/EncryptingPasswordEncoder.java b/server-common/src/main/java/org/apache/kafka/security/EncryptingPasswordEncoder.java
@@ -20,10 +20,6 @@
 import org.apache.kafka.common.config.types.Password;
 import org.apache.kafka.server.util.Csv;
 
-import javax.crypto.Cipher;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
@@ -33,6 +29,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.crypto.Cipher;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
 /**
  * Password encoder and decoder implementation. Encoded passwords are persisted as a CSV map
  * containing the encoded password in base64 and along with the properties used for encryption.

diff --git a/server-common/src/main/java/org/apache/kafka/security/GcmParamsEncoder.java b/server-common/src/main/java/org/apache/kafka/security/GcmParamsEncoder.java
@@ -16,13 +16,14 @@
  */
 package org.apache.kafka.security;
 
-import javax.crypto.spec.GCMParameterSpec;
 import java.security.AlgorithmParameters;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.crypto.spec.GCMParameterSpec;
+
 public class GcmParamsEncoder implements CipherParamsEncoder {
 
     private static final String AUTHENTICATION_TAG_LENGTH = "authenticationTagLength";

diff --git a/server-common/src/main/java/org/apache/kafka/security/IvParamsEncoder.java b/server-common/src/main/java/org/apache/kafka/security/IvParamsEncoder.java
@@ -16,13 +16,14 @@
  */
 package org.apache.kafka.security;
 
-import javax.crypto.spec.IvParameterSpec;
 import java.security.AlgorithmParameters;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.util.Collections;
 import java.util.Map;
 
+import javax.crypto.spec.IvParameterSpec;
+
 public class IvParamsEncoder implements CipherParamsEncoder {
 
     @Override

diff --git a/server-common/src/main/java/org/apache/kafka/server/common/MetadataVersion.java b/server-common/src/main/java/org/apache/kafka/server/common/MetadataVersion.java
@@ -16,12 +16,13 @@
  */
 package org.apache.kafka.server.common;
 
+import org.apache.kafka.common.record.RecordVersion;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
-import org.apache.kafka.common.record.RecordVersion;
 
 /**
  * This class contains the different Kafka versions.

diff --git a/server-common/src/main/java/org/apache/kafka/server/common/MetadataVersionValidator.java b/server-common/src/main/java/org/apache/kafka/server/common/MetadataVersionValidator.java
@@ -16,11 +16,12 @@
  */
 package org.apache.kafka.server.common;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
 import org.apache.kafka.common.config.ConfigDef.Validator;
 import org.apache.kafka.common.config.ConfigException;
 
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 public class MetadataVersionValidator implements Validator {
 
     @Override

diff --git a/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfigs.java b/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfigs.java
@@ -18,6 +18,7 @@
 
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.common.security.scram.internals.ScramMechanism;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;

diff --git a/server-common/src/main/java/org/apache/kafka/server/config/ServerTopicConfigSynonyms.java b/server-common/src/main/java/org/apache/kafka/server/config/ServerTopicConfigSynonyms.java
@@ -16,7 +16,8 @@
  */
 package org.apache.kafka.server.config;
 
-import static java.util.Arrays.asList;
+import org.apache.kafka.common.config.TopicConfig;
+import org.apache.kafka.common.utils.Utils;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -25,8 +26,8 @@
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
-import org.apache.kafka.common.config.TopicConfig;
-import org.apache.kafka.common.utils.Utils;
+
+import static java.util.Arrays.asList;
 
 public final class ServerTopicConfigSynonyms {
     public static final String LOG_PREFIX = "log.";

diff --git a/...er-common/src/main/java/org/apache/kafka/server/fault/ProcessTerminatingFaultHandler.java b/...er-common/src/main/java/org/apache/kafka/server/fault/ProcessTerminatingFaultHandler.java
@@ -17,11 +17,13 @@
 
 package org.apache.kafka.server.fault;
 
-import java.util.Objects;
 import org.apache.kafka.common.utils.Exit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+
 /**
  * This is a fault handler which terminates the JVM process.
  */

diff --git a/...rc/main/java/org/apache/kafka/server/immutable/pcollections/PCollectionsImmutableMap.java b/...rc/main/java/org/apache/kafka/server/immutable/pcollections/PCollectionsImmutableMap.java
@@ -18,6 +18,7 @@
 package org.apache.kafka.server.immutable.pcollections;
 
 import org.apache.kafka.server.immutable.ImmutableMap;
+
 import org.pcollections.HashPMap;
 import org.pcollections.HashTreePMap;
 

diff --git a/...ava/org/apache/kafka/server/immutable/pcollections/PCollectionsImmutableNavigableSet.java b/...ava/org/apache/kafka/server/immutable/pcollections/PCollectionsImmutableNavigableSet.java
@@ -18,6 +18,7 @@
 package org.apache.kafka.server.immutable.pcollections;
 
 import org.apache.kafka.server.immutable.ImmutableNavigableSet;
+
 import org.pcollections.TreePSet;
 
 import java.util.Collection;

diff --git a/...rc/main/java/org/apache/kafka/server/immutable/pcollections/PCollectionsImmutableSet.java b/...rc/main/java/org/apache/kafka/server/immutable/pcollections/PCollectionsImmutableSet.java
@@ -18,6 +18,7 @@
 package org.apache.kafka.server.immutable.pcollections;
 
 import org.apache.kafka.server.immutable.ImmutableSet;
+
 import org.pcollections.HashTreePSet;
 import org.pcollections.MapPSet;
 

diff --git a/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaMetricsGroup.java b/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaMetricsGroup.java
@@ -16,19 +16,20 @@
  */
 package org.apache.kafka.server.metrics;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+import org.apache.kafka.common.utils.Sanitizer;
 
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.Histogram;
 import com.yammer.metrics.core.Meter;
 import com.yammer.metrics.core.MetricName;
 import com.yammer.metrics.core.Timer;
-import org.apache.kafka.common.utils.Sanitizer;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public class KafkaMetricsGroup {
     private final Class<?> klass;

diff --git a/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaYammerMetrics.java b/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaYammerMetrics.java
@@ -17,14 +17,15 @@
 
 package org.apache.kafka.server.metrics;
 
-import com.yammer.metrics.core.MetricName;
-import com.yammer.metrics.core.MetricsRegistry;
 import org.apache.kafka.common.Reconfigurable;
 import org.apache.kafka.common.config.ConfigException;
 import org.apache.kafka.common.metrics.JmxReporter;
 import org.apache.kafka.common.utils.Exit;
 import org.apache.kafka.common.utils.Sanitizer;
 
+import com.yammer.metrics.core.MetricName;
+import com.yammer.metrics.core.MetricsRegistry;
+
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;

diff --git a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java
@@ -21,6 +21,7 @@
 import org.apache.kafka.common.utils.LogContext;
 import org.apache.kafka.server.authorizer.Authorizer;
 import org.apache.kafka.server.authorizer.AuthorizerServerInfo;
+
 import org.slf4j.Logger;
 
 import java.util.ArrayList;

diff --git a/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java b/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java
@@ -16,9 +16,6 @@
  */
 package org.apache.kafka.server.util;
 
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
 import org.apache.kafka.clients.CommonClientConfigs;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.common.utils.AppInfoParser;
@@ -31,6 +28,10 @@
 import java.util.Properties;
 import java.util.Set;
 
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+
 /**
  * Helper functions for dealing with command line utilities.
  */

diff --git a/server-common/src/main/java/org/apache/kafka/server/util/FutureUtils.java b/server-common/src/main/java/org/apache/kafka/server/util/FutureUtils.java
@@ -17,6 +17,7 @@
 package org.apache.kafka.server.util;
 
 import org.apache.kafka.common.utils.Time;
+
 import org.slf4j.Logger;
 
 import java.util.ArrayList;

diff --git a/server-common/src/main/java/org/apache/kafka/server/util/InterBrokerSendThread.java b/server-common/src/main/java/org/apache/kafka/server/util/InterBrokerSendThread.java
@@ -16,16 +16,6 @@
  */
 package org.apache.kafka.server.util;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import org.apache.kafka.clients.ClientRequest;
 import org.apache.kafka.clients.ClientResponse;
 import org.apache.kafka.clients.KafkaClient;
@@ -37,6 +27,17 @@
 import org.apache.kafka.common.utils.Time;
 import org.apache.kafka.common.utils.Utils;
 
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * An inter-broker send thread that utilizes a non-blocking network client.
  */

diff --git a/server-common/src/main/java/org/apache/kafka/server/util/Json.java b/server-common/src/main/java/org/apache/kafka/server/util/Json.java
@@ -17,11 +17,12 @@
 
 package org.apache.kafka.server.util;
 
+import org.apache.kafka.server.util.json.JsonValue;
+
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.MissingNode;
-import org.apache.kafka.server.util.json.JsonValue;
 
 import java.io.IOException;
 import java.util.Optional;

diff --git a/server-common/src/main/java/org/apache/kafka/server/util/KafkaScheduler.java b/server-common/src/main/java/org/apache/kafka/server/util/KafkaScheduler.java
@@ -17,6 +17,7 @@
 package org.apache.kafka.server.util;
 
 import org.apache.kafka.common.utils.KafkaThread;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/server-common/src/main/java/org/apache/kafka/server/util/ShutdownableThread.java b/server-common/src/main/java/org/apache/kafka/server/util/ShutdownableThread.java
@@ -20,6 +20,7 @@
 import org.apache.kafka.common.internals.FatalExitError;
 import org.apache.kafka.common.utils.Exit;
 import org.apache.kafka.common.utils.LogContext;
+
 import org.slf4j.Logger;
 
 import java.util.concurrent.CountDownLatch;

diff --git a/server-common/src/main/java/org/apache/kafka/server/util/ThroughputThrottler.java b/server-common/src/main/java/org/apache/kafka/server/util/ThroughputThrottler.java
@@ -136,4 +136,3 @@ public void wakeup() {
         }
     }
 }
-
diff --git a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java
@@ -17,6 +17,7 @@
 package org.apache.kafka.server.util;
 
 import org.apache.kafka.common.internals.Topic;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java
@@ -17,15 +17,16 @@
 
 package org.apache.kafka.timeline;
 
+import org.apache.kafka.common.utils.LogContext;
+
+import org.slf4j.Logger;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.kafka.common.utils.LogContext;
-import org.slf4j.Logger;
-
 
 /**
  * A registry containing snapshots of timeline data structures.