KAFKA-4008: Module "tools" should not be dependent on "core"

moved streams application reset tool from tools to core

Author: Matthias J. Sax <[email protected]>

Reviewers: Ismael Juma <[email protected]>, Damian Guy <[email protected]>, Guozhang Wang <[email protected]>, Ewen Cheslack-Postava <[email protected]>

Closes apache#1685 from mjsax/moveResetTool

(cherry picked from commit f2405a7)
Signed-off-by: Ewen Cheslack-Postava <[email protected]>

Author: mjsax

bin/kafka-streams-application-reset.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 org.apache.kafka.tools.StreamsResetter "$@"
+exec $(dirname $0)/kafka-run-class.sh kafka.tools.StreamsResetter "$@"

build.gradle

@@ -641,7 +641,6 @@ project(':tools') {
   archivesBaseName = "kafka-tools"
 
   dependencies {
-    compile project(':core')
     compile project(':clients')
     compile project(':log4j-appender')
     compile libs.argparse4j
@@ -690,7 +689,6 @@ project(':streams') {
     testCompile project(':clients').sourceSets.test.output
     testCompile project(':core')
     testCompile project(':core').sourceSets.test.output
-    testCompile project(':tools')
     testCompile libs.junit
 
     testRuntime libs.slf4jlog4j

checkstyle/import-control-core.xml

@@ -53,10 +53,12 @@
   </subpackage>
 
   <subpackage name="tools">
+    <allow pkg="kafka.admin" />
     <allow pkg="kafka.javaapi" />
     <allow pkg="kafka.producer" />
     <allow pkg="kafka.consumer" />
     <allow pkg="joptsimple" />
+    <allow pkg="org.apache.kafka.clients.consumer" />
   </subpackage>
 
   <subpackage name="examples">

checkstyle/import-control.xml

@@ -123,8 +123,6 @@
     <allow pkg="com.fasterxml.jackson" />
     <allow pkg="net.sourceforge.argparse4j" />
     <allow pkg="org.apache.log4j" />
-    <allow pkg="joptsimple" />
-    <allow pkg="kafka" />
   </subpackage>
 
   <subpackage name="streams">
@@ -144,14 +142,14 @@
     <subpackage name="integration">
       <allow pkg="kafka.admin" />
       <allow pkg="kafka.server" />
+      <allow pkg="kafka.tools" />
       <allow pkg="kafka.utils" />
       <allow pkg="kafka.zk" />
       <allow pkg="kafka.log" />
       <allow pkg="scala" />
       <allow pkg="scala.collection" />
       <allow pkg="org.I0Itec.zkclient" />
       <allow pkg="org.hamcrest" />
-      <allow pkg="org.apache.kafka.tools" />
     </subpackage>
 
     <subpackage name="state">

tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java core/src/main/scala/kafka/tools/StreamsResetter.java

@@ -1,16 +1,20 @@
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
- * file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
- * to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
  * <p>
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package org.apache.kafka.tools;
+package kafka.tools;
 
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
@@ -21,6 +25,7 @@
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.security.JaasUtils;
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 
@@ -34,6 +39,8 @@
 /**
  * {@link StreamsResetter} resets the processing state of a Kafka Streams application so that, for example, you can reprocess its input from scratch.
  * <p>
+ * <strong>This class is not part of public API. For backward compatibility, use the provided script in "bin/" instead of calling this class directly from your code.</strong>
+ * <p>
  * Resetting the processing state of an application includes the following actions:
  * <ol>
  * <li>setting the application's consumer offsets for input and internal topics to zero</li>
@@ -50,6 +57,7 @@
  * User output topics will not be deleted or modified by this tool.
  * If downstream applications consume intermediate or output topics, it is the user's responsibility to adjust those applications manually if required.
  */
+@InterfaceStability.Unstable
 public class StreamsResetter {
     private static final int EXIT_CODE_SUCCESS = 0;
     private static final int EXIT_CODE_ERROR = 1;

streams/src/test/java/org/apache/kafka/streams/integration/ResetIntegrationTest.java

@@ -16,6 +16,7 @@
  */
 package org.apache.kafka.streams.integration;
 
+import kafka.tools.StreamsResetter;
 import kafka.utils.ZkUtils;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.producer.ProducerConfig;
@@ -37,7 +38,6 @@
 import org.apache.kafka.streams.kstream.TimeWindows;
 import org.apache.kafka.streams.kstream.Windowed;
 import org.apache.kafka.test.TestUtils;
-import org.apache.kafka.tools.StreamsResetter;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;