Fix checkstyle errors

apache · Nov 8, 2024 · ab3b3d6 · ab3b3d6
1 parent 9fced08
commit ab3b3d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
@@ -620,7 +620,7 @@ class PlaintextAdminIntegrationTest extends BaseAdminIntegrationTest {
   def testListNodesWithFencedBroker(quorum: String): Unit = {
     client = createAdminClient
     val fencedBrokerId = brokers.last.config.brokerId
-    killBroker(fencedBrokerId)
+    killBroker(fencedBrokerId, JDuration.ofMillis(0))
     // It takes a few seconds for a broker to get fenced after being killed
     // So we retry until only 2 of 3 brokers returned in the result or the max wait is reached
     TestUtils.retry(20000) {

diff --git a/tools/src/main/java/org/apache/kafka/tools/ClusterTool.java b/tools/src/main/java/org/apache/kafka/tools/ClusterTool.java
@@ -16,7 +16,6 @@
  */
 package org.apache.kafka.tools;
 
-import java.util.Collection;
 import org.apache.kafka.clients.admin.Admin;
 import org.apache.kafka.clients.admin.DescribeClusterOptions;
 import org.apache.kafka.common.Node;
@@ -34,6 +33,7 @@
 
 import java.io.PrintStream;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
@@ -72,7 +72,7 @@ static void execute(String... args) throws Exception {
                 .help("Get information about the ID of a cluster.");
         Subparser unregisterParser = subparsers.addParser("unregister")
                 .help("Unregister a broker.");
-        Subparser listEndpoints= subparsers.addParser("list-endpoints")
+        Subparser listEndpoints = subparsers.addParser("list-endpoints")
                 .help("List endpoints");
         for (Subparser subpparser : Arrays.asList(clusterIdParser, unregisterParser, listEndpoints)) {
             MutuallyExclusiveGroup connectionOptions = subpparser.addMutuallyExclusiveGroup().required(true);
@@ -165,7 +165,7 @@ static void listEndpoints(PrintStream stream, Admin adminClient, boolean listCon
             String maxRackLength = String.valueOf(nodes.stream().filter(node -> node.hasRack()).map(node -> node.rack().length()).max(Integer::compareTo).orElse(10));
 
             if (listControllerEndpoints) {
-                String format = "%-10s %-" + maxHostLength + "s %-10s %-"+ maxRackLength +"s %-15s%n";
+                String format = "%-10s %-" + maxHostLength + "s %-10s %-" + maxRackLength + "s %-15s%n";
                 stream.printf(format, "ID", "HOST", "PORT", "RACK", "ENDPOINT_TYPE");
                 nodes.stream().forEach(node -> stream.printf(format,
                         node.idString(),
@@ -175,7 +175,7 @@ static void listEndpoints(PrintStream stream, Admin adminClient, boolean listCon
                         "controller"
                 ));
             } else {
-                String format = "%-10s %-" + maxHostLength + "s %-10s %-"+ maxRackLength +"s %-10s %-15s%n";
+                String format = "%-10s %-" + maxHostLength + "s %-10s %-" + maxRackLength + "s %-10s %-15s%n";
                 stream.printf(format, "ID", "HOST", "PORT", "RACK", "STATE", "ENDPOINT_TYPE");
                 nodes.stream().forEach(node -> stream.printf(format,
                         node.idString(),
@@ -187,12 +187,12 @@ static void listEndpoints(PrintStream stream, Admin adminClient, boolean listCon
                 ));
             }
         } catch (ExecutionException ee) {
-                Throwable cause = ee.getCause();
-                if (cause instanceof UnsupportedVersionException) {
-                    stream.println(ee.getCause().getMessage());
-                } else {
-                    throw ee;
-                }
+            Throwable cause = ee.getCause();
+            if (cause instanceof UnsupportedVersionException) {
+                stream.println(ee.getCause().getMessage());
+            } else {
+                throw ee;
+            }
         }
     }
 }