Skip to content

KAFKA-15232: Move ToolsUtils to tools #14066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mimaison merged 1 commit into from
Jul 21, 2023
Merged

KAFKA-15232: Move ToolsUtils to tools #14066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tools/src/main/java/org/apache/kafka/tools/ConsumerPerformance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion tools/src/main/java/org/apache/kafka/tools/MetadataQuorumCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion tools/src/main/java/org/apache/kafka/tools/ProducerPerformance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 1 addition & 2 deletions .../apache/kafka/server/util/ToolsUtils.java → ...va/org/apache/kafka/tools/ToolsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions tools/src/main/java/org/apache/kafka/tools/TransactionsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -469,7 +468,7 @@ public void execute(Admin admin, Namespace ns, PrintStream out) throws Exception
}
}

prettyPrintTable(HEADERS, rows, out);
ToolsUtils.prettyPrintTable(HEADERS, rows, out);
}
}

Expand Down Expand Up @@ -671,7 +670,7 @@ private void printHangingTransactions(
));
}

prettyPrintTable(HEADERS, rows, out);
ToolsUtils.prettyPrintTable(HEADERS, rows, out);
}

private Map<String, TransactionDescription> describeTransactions(
Expand Down