This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 014d0186cc4 MINOR: Move AdminCommandFailedException and
AdminOperationException to tools module (#19614)
014d0186cc4 is described below
commit 014d0186cc4b27a71fb4726028b597a489c93f77
Author: Jhen-Yung Hsu <[email protected]>
AuthorDate: Fri May 2 11:25:12 2025 +0800
MINOR: Move AdminCommandFailedException and AdminOperationException to
tools module (#19614)
AdminCommandFailedException and AdminOperationException are used only in
tools module, so move both into tools module.
Reviewers: Ken Huang <[email protected]>, Chia-Ping Tsai
<[email protected]>
---
.../java/org/apache/kafka/tools}/AdminCommandFailedException.java | 2 +-
.../main/java/org/apache/kafka/tools}/AdminOperationException.java | 2 +-
tools/src/main/java/org/apache/kafka/tools/DeleteRecordsCommand.java | 2 --
tools/src/main/java/org/apache/kafka/tools/LeaderElectionCommand.java | 2 --
tools/src/main/java/org/apache/kafka/tools/TopicCommand.java | 2 --
.../org/apache/kafka/tools/reassign/ReassignPartitionsCommand.java | 4 ++--
.../test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java | 2 --
.../java/org/apache/kafka/tools/LeaderElectionCommandErrorTest.java | 1 -
.../test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java | 1 -
tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java | 2 --
.../org/apache/kafka/tools/reassign/ReassignPartitionsUnitTest.java | 4 ++--
11 files changed, 6 insertions(+), 18 deletions(-)
diff --git
a/server-common/src/main/java/org/apache/kafka/server/common/AdminCommandFailedException.java
b/tools/src/main/java/org/apache/kafka/tools/AdminCommandFailedException.java
similarity index 96%
rename from
server-common/src/main/java/org/apache/kafka/server/common/AdminCommandFailedException.java
rename to
tools/src/main/java/org/apache/kafka/tools/AdminCommandFailedException.java
index 62bb8425546..0af83023f04 100644
---
a/server-common/src/main/java/org/apache/kafka/server/common/AdminCommandFailedException.java
+++
b/tools/src/main/java/org/apache/kafka/tools/AdminCommandFailedException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.common;
+package org.apache.kafka.tools;
public class AdminCommandFailedException extends RuntimeException {
public AdminCommandFailedException(String message) {
diff --git
a/server-common/src/main/java/org/apache/kafka/server/common/AdminOperationException.java
b/tools/src/main/java/org/apache/kafka/tools/AdminOperationException.java
similarity index 96%
rename from
server-common/src/main/java/org/apache/kafka/server/common/AdminOperationException.java
rename to
tools/src/main/java/org/apache/kafka/tools/AdminOperationException.java
index 03826d1ac00..2595610fbbb 100644
---
a/server-common/src/main/java/org/apache/kafka/server/common/AdminOperationException.java
+++ b/tools/src/main/java/org/apache/kafka/tools/AdminOperationException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.common;
+package org.apache.kafka.tools;
public class AdminOperationException extends RuntimeException {
public AdminOperationException(String message) {
diff --git
a/tools/src/main/java/org/apache/kafka/tools/DeleteRecordsCommand.java
b/tools/src/main/java/org/apache/kafka/tools/DeleteRecordsCommand.java
index 8e68b174d83..27566752992 100644
--- a/tools/src/main/java/org/apache/kafka/tools/DeleteRecordsCommand.java
+++ b/tools/src/main/java/org/apache/kafka/tools/DeleteRecordsCommand.java
@@ -23,8 +23,6 @@ import org.apache.kafka.clients.admin.RecordsToDelete;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Utils;
-import org.apache.kafka.server.common.AdminCommandFailedException;
-import org.apache.kafka.server.common.AdminOperationException;
import org.apache.kafka.server.util.CommandDefaultOptions;
import org.apache.kafka.server.util.CommandLineUtils;
import org.apache.kafka.server.util.Json;
diff --git
a/tools/src/main/java/org/apache/kafka/tools/LeaderElectionCommand.java
b/tools/src/main/java/org/apache/kafka/tools/LeaderElectionCommand.java
index 6fd652199e4..2814034e167 100644
--- a/tools/src/main/java/org/apache/kafka/tools/LeaderElectionCommand.java
+++ b/tools/src/main/java/org/apache/kafka/tools/LeaderElectionCommand.java
@@ -25,8 +25,6 @@ import
org.apache.kafka.common.errors.ElectionNotNeededException;
import org.apache.kafka.common.errors.TimeoutException;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Utils;
-import org.apache.kafka.server.common.AdminCommandFailedException;
-import org.apache.kafka.server.common.AdminOperationException;
import org.apache.kafka.server.util.CommandDefaultOptions;
import org.apache.kafka.server.util.CommandLineUtils;
import org.apache.kafka.server.util.Json;
diff --git a/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java
b/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java
index 32272d4e926..9c67917d76a 100644
--- a/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java
+++ b/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java
@@ -46,8 +46,6 @@ import
org.apache.kafka.common.errors.UnsupportedVersionException;
import org.apache.kafka.common.internals.Topic;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Utils;
-import org.apache.kafka.server.common.AdminCommandFailedException;
-import org.apache.kafka.server.common.AdminOperationException;
import org.apache.kafka.server.util.CommandDefaultOptions;
import org.apache.kafka.server.util.CommandLineUtils;
import org.apache.kafka.storage.internals.log.LogConfig;
diff --git
a/tools/src/main/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommand.java
b/tools/src/main/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommand.java
index 46915a40b77..72c49410e13 100644
---
a/tools/src/main/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommand.java
+++
b/tools/src/main/java/org/apache/kafka/tools/reassign/ReassignPartitionsCommand.java
@@ -43,14 +43,14 @@ import org.apache.kafka.metadata.placement.ReplicaPlacer;
import org.apache.kafka.metadata.placement.StripedReplicaPlacer;
import org.apache.kafka.metadata.placement.TopicAssignment;
import org.apache.kafka.metadata.placement.UsableBroker;
-import org.apache.kafka.server.common.AdminCommandFailedException;
-import org.apache.kafka.server.common.AdminOperationException;
import org.apache.kafka.server.config.QuotaConfig;
import org.apache.kafka.server.util.CommandLineUtils;
import org.apache.kafka.server.util.Json;
import org.apache.kafka.server.util.json.DecodeJson;
import org.apache.kafka.server.util.json.JsonObject;
import org.apache.kafka.server.util.json.JsonValue;
+import org.apache.kafka.tools.AdminCommandFailedException;
+import org.apache.kafka.tools.AdminOperationException;
import org.apache.kafka.tools.TerseException;
import org.apache.kafka.tools.ToolsUtils;
diff --git
a/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java
b/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java
index f798ed702a6..f5bab944394 100644
--- a/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java
@@ -26,8 +26,6 @@ import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.serialization.StringSerializer;
import org.apache.kafka.common.test.ClusterInstance;
import org.apache.kafka.common.test.api.ClusterTest;
-import org.apache.kafka.server.common.AdminCommandFailedException;
-import org.apache.kafka.server.common.AdminOperationException;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git
a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandErrorTest.java
b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandErrorTest.java
index ed7f8895b60..46942be75f3 100644
---
a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandErrorTest.java
+++
b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandErrorTest.java
@@ -17,7 +17,6 @@
package org.apache.kafka.tools;
import org.apache.kafka.common.errors.TimeoutException;
-import org.apache.kafka.server.common.AdminCommandFailedException;
import org.junit.jupiter.api.Test;
diff --git
a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
index 23bd9a5c19e..78f6e9ac156 100644
--- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
@@ -28,7 +28,6 @@ import org.apache.kafka.common.test.ClusterInstance;
import org.apache.kafka.common.test.api.ClusterConfigProperty;
import org.apache.kafka.common.test.api.ClusterTest;
import org.apache.kafka.common.test.api.ClusterTestDefaults;
-import org.apache.kafka.server.common.AdminCommandFailedException;
import org.mockito.ArgumentCaptor;
import org.mockito.MockedStatic;
diff --git a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java
b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java
index 0f2e6a91807..deb57ae8cbc 100644
--- a/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/TopicCommandTest.java
@@ -56,8 +56,6 @@ import org.apache.kafka.common.test.api.ClusterTest;
import org.apache.kafka.common.test.api.Type;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.metadata.LeaderAndIsr;
-import org.apache.kafka.server.common.AdminCommandFailedException;
-import org.apache.kafka.server.common.AdminOperationException;
import org.apache.kafka.test.TestUtils;
import org.junit.jupiter.api.Assertions;
diff --git
a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsUnitTest.java
b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsUnitTest.java
index 335e8fba693..6dd087dc50f 100644
---
a/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsUnitTest.java
+++
b/tools/src/test/java/org/apache/kafka/tools/reassign/ReassignPartitionsUnitTest.java
@@ -29,9 +29,9 @@ import
org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.metadata.placement.UsableBroker;
-import org.apache.kafka.server.common.AdminCommandFailedException;
-import org.apache.kafka.server.common.AdminOperationException;
import org.apache.kafka.server.config.QuotaConfig;
+import org.apache.kafka.tools.AdminCommandFailedException;
+import org.apache.kafka.tools.AdminOperationException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
