From c6b8de4e6806d8f9f4af57e15f2a7f4170265c42 Mon Sep 17 00:00:00 2001 From: Ewen Cheslack-Postava Date: Wed, 11 Nov 2015 15:55:12 -0800 Subject: [PATCH] KAFKA-2807: Move ThroughputThrottler back to tools jar to fix upgrade tests. Author: Ewen Cheslack-Postava Reviewers: Gwen Shapira Closes #499 from ewencp/kafka-2807-relocate-throughput-throttler --- build.gradle | 45 ++++++++++--------- .../connect/tools/VerifiableSourceTask.java | 2 +- settings.gradle | 2 +- .../kafka/tools/ProducerPerformance.java | 1 - .../kafka/tools}/ThroughputThrottler.java | 4 +- .../kafka/tools/VerifiableProducer.java | 1 - 6 files changed, 27 insertions(+), 28 deletions(-) rename {clients/src/main/java/org/apache/kafka/common/utils => tools/src/main/java/org/apache/kafka/tools}/ThroughputThrottler.java (99%) diff --git a/build.gradle b/build.gradle index 70fdbcd8d089..0ee6c41a2920 100644 --- a/build.gradle +++ b/build.gradle @@ -230,7 +230,7 @@ for ( sv in ['2_10_5', '2_11_7'] ) { } } -def connectPkgs = ['connect:api', 'connect:runtime', 'connect:json', 'connect:file', 'connect:tools'] +def connectPkgs = ['connect-api', 'connect-runtime', 'connect-json', 'connect-file', 'connect-tools'] def pkgs = ['clients', 'examples', 'log4j-appender', 'tools', 'streams'] + connectPkgs tasks.create(name: "jarConnect", dependsOn: connectPkgs.collect { it + ":jar" }) {} @@ -321,7 +321,7 @@ project(':core') { standardOutput = new File('docs/kafka_config.html').newOutputStream() } - task siteDocsTar(dependsOn: ['genProducerConfigDocs', 'genConsumerConfigDocs', 'genKafkaConfigDocs', ':connect:runtime:genConnectConfigDocs'], type: Tar) { + task siteDocsTar(dependsOn: ['genProducerConfigDocs', 'genConsumerConfigDocs', 'genKafkaConfigDocs', ':connect-runtime:genConnectConfigDocs'], type: Tar) { classifier = 'site-docs' compression = Compression.GZIP from project.file("../docs") @@ -342,16 +342,16 @@ project(':core') { from(project.siteDocsTar) { into("site-docs/") } from(project(':tools').jar) { into("libs/") } from(project(':tools').configurations.runtime) { into("libs/") } - from(project(':connect:api').jar) { into("libs/") } - from(project(':connect:api').configurations.runtime) { into("libs/") } - from(project(':connect:runtime').jar) { into("libs/") } - from(project(':connect:runtime').configurations.runtime) { into("libs/") } - from(project(':connect:json').jar) { into("libs/") } - from(project(':connect:json').configurations.runtime) { into("libs/") } - from(project(':connect:file').jar) { into("libs/") } - from(project(':connect:file').configurations.runtime) { into("libs/") } - from(project(':connect:tools').jar) { into("libs/") } - from(project(':connect:tools').configurations.runtime) { into("libs/") } + from(project(':connect-api').jar) { into("libs/") } + from(project(':connect-api').configurations.runtime) { into("libs/") } + from(project(':connect-runtime').jar) { into("libs/") } + from(project(':connect-runtime').configurations.runtime) { into("libs/") } + from(project(':connect-json').jar) { into("libs/") } + from(project(':connect-json').configurations.runtime) { into("libs/") } + from(project(':connect-file').jar) { into("libs/") } + from(project(':connect-file').configurations.runtime) { into("libs/") } + from(project(':connect-tools').jar) { into("libs/") } + from(project(':connect-tools').configurations.runtime) { into("libs/") } } jar { @@ -638,7 +638,7 @@ project(':log4j-appender') { test.dependsOn('checkstyleMain', 'checkstyleTest') } -project(':connect:api') { +project(':connect-api') { apply plugin: 'checkstyle' archivesBaseName = "connect-api" @@ -695,12 +695,12 @@ project(':connect:api') { test.dependsOn('checkstyleMain', 'checkstyleTest') } -project(':connect:json') { +project(':connect-json') { apply plugin: 'checkstyle' archivesBaseName = "connect-json" dependencies { - compile project(':connect:api') + compile project(':connect-api') compile "$slf4japi" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" @@ -756,12 +756,12 @@ project(':connect:json') { test.dependsOn('checkstyleMain', 'checkstyleTest') } -project(':connect:runtime') { +project(':connect-runtime') { apply plugin: 'checkstyle' archivesBaseName = "connect-runtime" dependencies { - compile project(':connect:api') + compile project(':connect-api') compile project(':clients') compile "$slf4japi" @@ -776,7 +776,7 @@ project(':connect:runtime') { testCompile "$powermock_easymock" testCompile project(':clients').sourceSets.test.output testRuntime "$slf4jlog4j" - testRuntime project(":connect:json") + testRuntime project(":connect-json") } task testJar(type: Jar) { @@ -830,12 +830,12 @@ project(':connect:runtime') { } } -project(':connect:file') { +project(':connect-file') { apply plugin: 'checkstyle' archivesBaseName = "connect-file" dependencies { - compile project(':connect:api') + compile project(':connect-api') compile "$slf4japi" testCompile "$junit" @@ -890,12 +890,13 @@ project(':connect:file') { test.dependsOn('checkstyleMain', 'checkstyleTest') } -project(':connect:tools') { +project(':connect-tools') { apply plugin: 'checkstyle' archivesBaseName = "connect-tools" dependencies { - compile project(':connect:api') + compile project(':connect-api') + compile project(':tools') compile "$slf4japi" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" diff --git a/connect/tools/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceTask.java b/connect/tools/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceTask.java index 6fee2c4068c9..a85a0e982cb8 100644 --- a/connect/tools/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceTask.java +++ b/connect/tools/src/main/java/org/apache/kafka/connect/tools/VerifiableSourceTask.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.kafka.common.utils.ThroughputThrottler; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.source.SourceRecord; import org.apache.kafka.connect.source.SourceTask; +import org.apache.kafka.tools.ThroughputThrottler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/settings.gradle b/settings.gradle index 2728b5b44099..d1543c34737f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,4 +15,4 @@ apply from: file('scala.gradle') include 'core', 'examples', 'clients', 'tools', 'streams', 'log4j-appender', - 'connect:api', 'connect:runtime', 'connect:json', 'connect:file', 'connect:tools' + 'connect-api', 'connect-runtime', 'connect-json', 'connect-file', 'connect-tools' 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 2a7f7b18e128..3a068626c5c6 100644 --- a/tools/src/main/java/org/apache/kafka/tools/ProducerPerformance.java +++ b/tools/src/main/java/org/apache/kafka/tools/ProducerPerformance.java @@ -24,7 +24,6 @@ import net.sourceforge.argparse4j.inf.Namespace; import org.apache.kafka.clients.producer.*; -import org.apache.kafka.common.utils.ThroughputThrottler; public class ProducerPerformance { diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ThroughputThrottler.java b/tools/src/main/java/org/apache/kafka/tools/ThroughputThrottler.java similarity index 99% rename from clients/src/main/java/org/apache/kafka/common/utils/ThroughputThrottler.java rename to tools/src/main/java/org/apache/kafka/tools/ThroughputThrottler.java index 1c63ffb08c58..a3bcd2fccf61 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ThroughputThrottler.java +++ b/tools/src/main/java/org/apache/kafka/tools/ThroughputThrottler.java @@ -13,9 +13,9 @@ * 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.common.utils; +package org.apache.kafka.tools; /** diff --git a/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java b/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java index e8bd33025e1a..0cd90c0bbf57 100644 --- a/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java +++ b/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java @@ -41,7 +41,6 @@ import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.ArgumentParserException; import net.sourceforge.argparse4j.inf.Namespace; -import org.apache.kafka.common.utils.ThroughputThrottler; /** * Primarily intended for use with system testing, this producer prints metadata