From 55b2cfb49fd4b18732018d2fd100757f0fcd0ac3 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 17 Feb 2016 12:50:35 -0500 Subject: [PATCH] GH-161: Use `TopicUtils` to `ensureTopicCreated` Fixes GH-161 (https://github.com/spring-projects/spring-integration-samples/issues/161) --- .../integration/samples/kafka/Application.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index 3ed73df1..e5f1e226 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.Map; import java.util.Properties; -import org.I0Itec.zkclient.ZkClient; import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.beans.factory.annotation.Value; @@ -48,16 +47,13 @@ import org.springframework.integration.kafka.support.ProducerConfiguration; import org.springframework.integration.kafka.support.ProducerFactoryBean; import org.springframework.integration.kafka.support.ProducerMetadata; import org.springframework.integration.kafka.support.ZookeeperConnect; +import org.springframework.integration.kafka.util.TopicUtils; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; -import kafka.admin.AdminUtils; -import kafka.common.TopicExistsException; -import kafka.utils.ZKStringSerializer$; - /** * @author Gary Russell * @since 4.2 @@ -186,12 +182,7 @@ public class Application { @Override public void start() { - ZkClient client = new ZkClient(this.zkConnect, 10000, 10000, ZKStringSerializer$.MODULE$); - try { - AdminUtils.createTopic(client, this.topic, 1, 1, new Properties()); - } - catch (TopicExistsException e) { - } + TopicUtils.ensureTopicCreated(this.zkConnect, this.topic, 1, 1); this.running = true; }