fix: drop TopicDescriptionFactory class (#3528)

With the upstream change to make `TopicDescription`'s constructor public, (apache/kafka#7405), we no longer need `TopicDescriptionFactory`.
confluentinc · Oct 16, 2019 · 5281c74 · 5281c74
1 parent 8380264
commit 5281c74
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 48 deletions.
diff --git a/ksql-engine/src/main/java/io/confluent/ksql/services/SandboxedKafkaTopicClient.java b/ksql-engine/src/main/java/io/confluent/ksql/services/SandboxedKafkaTopicClient.java
@@ -32,7 +32,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.clients.admin.TopicDescriptionFactory;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartitionInfo;
 import org.apache.kafka.common.acl.AclOperation;
@@ -103,7 +102,7 @@ private void createTopic(
     // This is useful to validate permissions to create the topic
     delegate.validateCreateTopic(topic, numPartitions, replicationFactor, configs);
 
-    createdTopics.put(topic, TopicDescriptionFactory.create(
+    createdTopics.put(topic, new TopicDescription(
         topic,
         false,
         partitions,

diff --git a/ksql-engine/src/main/java/org/apache/kafka/clients/admin/TopicDescriptionFactory.java b/ksql-engine/src/main/java/org/apache/kafka/clients/admin/TopicDescriptionFactory.java
diff --git a/ksql-engine/src/test/java/io/confluent/ksql/services/FakeKafkaTopicClient.java b/ksql-engine/src/test/java/io/confluent/ksql/services/FakeKafkaTopicClient.java
@@ -33,7 +33,6 @@
 import java.util.stream.IntStream;
 import org.apache.kafka.clients.admin.CreateTopicsOptions;
 import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.clients.admin.TopicDescriptionFactory;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartitionInfo;
 import org.apache.kafka.common.acl.AclOperation;
@@ -73,7 +72,7 @@ private TopicDescription getDescription() {
               .mapToObj(
                   p -> new TopicPartitionInfo(p, node, replicas, Collections.emptyList()))
               .collect(Collectors.toList());
-      return TopicDescriptionFactory.create(
+      return new TopicDescription(
           topicName,
           false,
           partitionInfoList,

diff --git a/ksql-engine/src/test/java/io/confluent/ksql/services/SandboxedKafkaTopicClientTest.java b/ksql-engine/src/test/java/io/confluent/ksql/services/SandboxedKafkaTopicClientTest.java
@@ -45,7 +45,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.clients.admin.TopicDescriptionFactory;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartitionInfo;
 import org.apache.kafka.common.acl.AclOperation;
@@ -168,7 +167,7 @@ public void shouldTrackCreatedTopicDetails() {
           .describeTopic("some topic");
 
       // Then:
-      assertThat(result, is(TopicDescriptionFactory.create(
+      assertThat(result, is(new TopicDescription(
           "some topic",
           false,
           topicPartitions(2, 3),
@@ -186,7 +185,7 @@ public void shouldTrackCreatedTopicsDetails() {
 
       // Then:
       assertThat(result.keySet(), contains("some topic"));
-      assertThat(result.get("some topic"), is(TopicDescriptionFactory.create(
+      assertThat(result.get("some topic"), is(new TopicDescription(
           "some topic",
           false,
           topicPartitions(2, 3),

diff --git a/...nctional-tests/src/main/java/io/confluent/ksql/test/tools/stubs/StubKafkaTopicClient.java b/...nctional-tests/src/main/java/io/confluent/ksql/test/tools/stubs/StubKafkaTopicClient.java
@@ -35,7 +35,6 @@
 import java.util.stream.IntStream;
 import org.apache.kafka.clients.admin.CreateTopicsOptions;
 import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.clients.admin.TopicDescriptionFactory;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartitionInfo;
 import org.apache.kafka.common.acl.AclOperation;
@@ -75,7 +74,7 @@ private TopicDescription getDescription() {
               .mapToObj(
                   p -> new TopicPartitionInfo(p, node, replicas, Collections.emptyList()))
               .collect(Collectors.toList());
-      return TopicDescriptionFactory.create(
+      return new TopicDescription(
           topicName,
           false,
           partitionInfoList,