From 54fb44a1d52a327ab1cf322ba9b66dc476b0954e Mon Sep 17 00:00:00 2001 From: Federico Valeri Date: Fri, 21 Jul 2023 17:17:16 +0200 Subject: [PATCH] KAFKA-15232: Move ToolsUtils to tools Signed-off-by: Federico Valeri --- .../java/org/apache/kafka/tools/ConsumerPerformance.java | 1 - .../org/apache/kafka/tools/MetadataQuorumCommand.java | 1 - .../java/org/apache/kafka/tools/ProducerPerformance.java | 1 - .../main/java/org/apache/kafka/tools}/ToolsUtils.java | 3 +-- .../java/org/apache/kafka/tools/TransactionsCommand.java | 9 ++++----- 5 files changed, 5 insertions(+), 10 deletions(-) rename {server-common/src/main/java/org/apache/kafka/server/util => tools/src/main/java/org/apache/kafka/tools}/ToolsUtils.java (99%) diff --git a/tools/src/main/java/org/apache/kafka/tools/ConsumerPerformance.java b/tools/src/main/java/org/apache/kafka/tools/ConsumerPerformance.java index 56c51f34a8439..a907233057ea8 100644 --- a/tools/src/main/java/org/apache/kafka/tools/ConsumerPerformance.java +++ b/tools/src/main/java/org/apache/kafka/tools/ConsumerPerformance.java @@ -31,7 +31,6 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.util.CommandDefaultOptions; import org.apache.kafka.server.util.CommandLineUtils; -import org.apache.kafka.server.util.ToolsUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tools/src/main/java/org/apache/kafka/tools/MetadataQuorumCommand.java b/tools/src/main/java/org/apache/kafka/tools/MetadataQuorumCommand.java index 552bce2c920fb..4f47eadecda66 100644 --- a/tools/src/main/java/org/apache/kafka/tools/MetadataQuorumCommand.java +++ b/tools/src/main/java/org/apache/kafka/tools/MetadataQuorumCommand.java @@ -29,7 +29,6 @@ import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.utils.Exit; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.server.util.ToolsUtils; import java.io.File; import java.io.IOException; diff --git a/tools/src/main/java/org/apache/kafka/tools/ProducerPerformance.java b/tools/src/main/java/org/apache/kafka/tools/ProducerPerformance.java index 612d2599533fe..891c24141dec2 100644 --- a/tools/src/main/java/org/apache/kafka/tools/ProducerPerformance.java +++ b/tools/src/main/java/org/apache/kafka/tools/ProducerPerformance.java @@ -44,7 +44,6 @@ import org.apache.kafka.common.utils.Exit; import org.apache.kafka.common.utils.ThroughputThrottler; import org.apache.kafka.common.utils.Utils; -import org.apache.kafka.server.util.ToolsUtils; public class ProducerPerformance { diff --git a/server-common/src/main/java/org/apache/kafka/server/util/ToolsUtils.java b/tools/src/main/java/org/apache/kafka/tools/ToolsUtils.java similarity index 99% rename from server-common/src/main/java/org/apache/kafka/server/util/ToolsUtils.java rename to tools/src/main/java/org/apache/kafka/tools/ToolsUtils.java index b14f079b15cda..1a391f33d673a 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/ToolsUtils.java +++ b/tools/src/main/java/org/apache/kafka/tools/ToolsUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.kafka.server.util; +package org.apache.kafka.tools; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; @@ -26,7 +26,6 @@ import java.util.stream.Collectors; public class ToolsUtils { - /** * print out the metrics in alphabetical order * @param metrics the metrics to be printed out diff --git a/tools/src/main/java/org/apache/kafka/tools/TransactionsCommand.java b/tools/src/main/java/org/apache/kafka/tools/TransactionsCommand.java index 4f7fa9c27bffa..243f28035f4fd 100644 --- a/tools/src/main/java/org/apache/kafka/tools/TransactionsCommand.java +++ b/tools/src/main/java/org/apache/kafka/tools/TransactionsCommand.java @@ -66,7 +66,6 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static net.sourceforge.argparse4j.impl.Arguments.store; -import static org.apache.kafka.server.util.ToolsUtils.prettyPrintTable; public abstract class TransactionsCommand { private static final Logger log = LoggerFactory.getLogger(TransactionsCommand.class); @@ -336,7 +335,7 @@ public void execute(Admin admin, Namespace ns, PrintStream out) throws Exception ); }).collect(Collectors.toList()); - prettyPrintTable(HEADERS, rows, out); + ToolsUtils.prettyPrintTable(HEADERS, rows, out); } } @@ -414,7 +413,7 @@ public void execute(Admin admin, Namespace ns, PrintStream out) throws Exception Utils.join(result.topicPartitions(), ",") ); - prettyPrintTable(HEADERS, singletonList(row), out); + ToolsUtils.prettyPrintTable(HEADERS, singletonList(row), out); } } @@ -469,7 +468,7 @@ public void execute(Admin admin, Namespace ns, PrintStream out) throws Exception } } - prettyPrintTable(HEADERS, rows, out); + ToolsUtils.prettyPrintTable(HEADERS, rows, out); } } @@ -671,7 +670,7 @@ private void printHangingTransactions( )); } - prettyPrintTable(HEADERS, rows, out); + ToolsUtils.prettyPrintTable(HEADERS, rows, out); } private Map describeTransactions(