KAFKA-14576: Move ConsoleConsumer to tools (apache#15274)

Reviewers: Josep Prat <[email protected]>, Omnia Ibrahim <[email protected]>
tarunsankhla · Feb 13, 2024 · 0bf830f · 0bf830f
1 parent 8c0488b
commit 0bf830f
Show file tree

Hide file tree

Showing 22 changed files with 1,996 additions and 1,641 deletions.
diff --git a/bin/kafka-console-consumer.sh b/bin/kafka-console-consumer.sh
@@ -18,4 +18,4 @@ if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
     export KAFKA_HEAP_OPTS="-Xmx512M"
 fi
 
-exec $(dirname $0)/kafka-run-class.sh kafka.tools.ConsoleConsumer "$@"
+exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.consumer.ConsoleConsumer "$@"
diff --git a/bin/windows/kafka-console-consumer.bat b/bin/windows/kafka-console-consumer.bat
@@ -16,5 +16,5 @@ rem limitations under the License.
 
 SetLocal
 set KAFKA_HEAP_OPTS=-Xmx512M
-"%~dp0kafka-run-class.bat" kafka.tools.ConsoleConsumer %*
+"%~dp0kafka-run-class.bat" org.apache.kafka.tools.consumer.ConsoleConsumer %*
 EndLocal
diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml
@@ -321,6 +321,17 @@
     <allow pkg="kafka.utils" />
     <allow pkg="scala.collection" />
 
+    <subpackage name="consumer">
+      <allow pkg="org.apache.kafka.tools"/>
+
+      <subpackage name="group">
+        <allow pkg="kafka.api"/>
+        <allow pkg="org.apache.kafka.tools"/>
+        <allow pkg="org.apache.kafka.server.config" />
+        <allow pkg="scala"/>
+      </subpackage>
+    </subpackage>
+
     <subpackage name="reassign">
       <allow pkg="org.apache.kafka.admin"/>
       <allow pkg="org.apache.kafka.tools"/>
@@ -331,13 +342,6 @@
       <allow pkg="scala" />
     </subpackage>
 
-    <subpackage name="consumer.group">
-      <allow pkg="kafka.api"/>
-      <allow pkg="org.apache.kafka.tools"/>
-      <allow pkg="org.apache.kafka.server.config" />
-      <allow pkg="scala"/>
-    </subpackage>
-
     <subpackage name="other">
       <allow pkg="org.apache.kafka.tools.reassign"/>
       <allow pkg="kafka.log" />

diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
@@ -273,11 +273,11 @@
     <suppress checks="ClassDataAbstractionCoupling"
               files="VerifiableConsumer.java"/>
     <suppress checks="CyclomaticComplexity"
-              files="(StreamsResetter|ProducerPerformance|Agent).java"/>
+              files="(ConsoleConsumer|DefaultMessageFormatter|StreamsResetter|ProducerPerformance|Agent).java"/>
     <suppress checks="BooleanExpressionComplexity"
               files="StreamsResetter.java"/>
     <suppress checks="NPathComplexity"
-              files="(ProducerPerformance|StreamsResetter|Agent|TransactionalMessageCopier|ReplicaVerificationTool).java"/>
+              files="(DefaultMessageFormatter|ProducerPerformance|StreamsResetter|Agent|TransactionalMessageCopier|ReplicaVerificationTool).java"/>
     <suppress checks="ImportControl"
               files="SignalLogger.java"/>
     <suppress checks="IllegalImport"