From 4f6ad591ace5655d62fdaed943bf2a6eb73463c7 Mon Sep 17 00:00:00 2001 From: Rajini Sivaram Date: Sat, 16 Mar 2019 20:35:27 +0000 Subject: [PATCH] MINOR: Retain public constructors of classes from public API --- .../clients/admin/ConsumerGroupDescription.java | 9 +++++++++ .../kafka/clients/admin/TopicDescription.java | 15 ++++++++++++++- .../internals/InternalTopicManagerTest.java | 6 +++--- .../kafka/trogdor/common/WorkerUtilsTest.java | 9 +++------ 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupDescription.java b/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupDescription.java index 7320f6568150b..52f23ed116ba9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupDescription.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupDescription.java @@ -41,6 +41,15 @@ public class ConsumerGroupDescription { private final Set authorizedOperations; public ConsumerGroupDescription(String groupId, + boolean isSimpleConsumerGroup, + Collection members, + String partitionAssignor, + ConsumerGroupState state, + Node coordinator) { + this(groupId, isSimpleConsumerGroup, members, partitionAssignor, state, coordinator, Collections.emptySet()); + } + + ConsumerGroupDescription(String groupId, boolean isSimpleConsumerGroup, Collection members, String partitionAssignor, diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/TopicDescription.java b/clients/src/main/java/org/apache/kafka/clients/admin/TopicDescription.java index daadac00940e0..c6d44e88cabc0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/TopicDescription.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/TopicDescription.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.acl.AclOperation; import org.apache.kafka.common.utils.Utils; +import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Set; @@ -50,6 +51,18 @@ public int hashCode() { return Objects.hash(name, internal, partitions, authorizedOperations); } + /** + * Create an instance with the specified parameters. + * + * @param name The topic name + * @param internal Whether the topic is internal to Kafka + * @param partitions A list of partitions where the index represents the partition id and the element contains + * leadership and replica information for that partition. + */ + public TopicDescription(String name, boolean internal, List partitions) { + this(name, internal, partitions, Collections.emptySet()); + } + /** * Create an instance with the specified parameters. * @@ -59,7 +72,7 @@ public int hashCode() { * leadership and replica information for that partition. * @param authorizedOperations authorized operations for this topic */ - public TopicDescription(String name, boolean internal, List partitions, + TopicDescription(String name, boolean internal, List partitions, Set authorizedOperations) { this.name = name; this.internal = internal; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/InternalTopicManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/InternalTopicManagerTest.java index e2dc376d83aed..074228a6c147b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/InternalTopicManagerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/InternalTopicManagerTest.java @@ -113,17 +113,17 @@ public void shouldCreateRequiredTopics() throws Exception { { add(new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList())); } - }, Collections.emptySet()), mockAdminClient.describeTopics(Collections.singleton(topic)).values().get(topic).get()); + }), mockAdminClient.describeTopics(Collections.singleton(topic)).values().get(topic).get()); assertEquals(new TopicDescription(topic2, false, new ArrayList() { { add(new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList())); } - }, Collections.emptySet()), mockAdminClient.describeTopics(Collections.singleton(topic2)).values().get(topic2).get()); + }), mockAdminClient.describeTopics(Collections.singleton(topic2)).values().get(topic2).get()); assertEquals(new TopicDescription(topic3, false, new ArrayList() { { add(new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList())); } - }, Collections.emptySet()), mockAdminClient.describeTopics(Collections.singleton(topic3)).values().get(topic3).get()); + }), mockAdminClient.describeTopics(Collections.singleton(topic3)).values().get(topic3).get()); final ConfigResource resource = new ConfigResource(ConfigResource.Type.TOPIC, topic); final ConfigResource resource2 = new ConfigResource(ConfigResource.Type.TOPIC, topic2); diff --git a/tools/src/test/java/org/apache/kafka/trogdor/common/WorkerUtilsTest.java b/tools/src/test/java/org/apache/kafka/trogdor/common/WorkerUtilsTest.java index 29e966cb377aa..a35efe199aa8f 100644 --- a/tools/src/test/java/org/apache/kafka/trogdor/common/WorkerUtilsTest.java +++ b/tools/src/test/java/org/apache/kafka/trogdor/common/WorkerUtilsTest.java @@ -81,8 +81,7 @@ public void testCreateOneTopic() throws Throwable { new TopicDescription( TEST_TOPIC, false, Collections.singletonList( - new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList())), - Collections.emptySet()), + new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList()))), adminClient.describeTopics( Collections.singleton(TEST_TOPIC)).values().get(TEST_TOPIC).get() ); @@ -99,8 +98,7 @@ public void testCreateRetriesOnTimeout() throws Throwable { new TopicDescription( TEST_TOPIC, false, Collections.singletonList( - new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList())), - Collections.emptySet()), + new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList()))), adminClient.describeTopics( Collections.singleton(TEST_TOPIC)).values().get(TEST_TOPIC).get() ); @@ -180,8 +178,7 @@ public void testCreatesNotExistingTopics() throws Throwable { new TopicDescription( TEST_TOPIC, false, Collections.singletonList( - new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList())), - Collections.emptySet()), + new TopicPartitionInfo(0, broker1, singleReplica, Collections.emptyList()))), adminClient.describeTopics(Collections.singleton(TEST_TOPIC)).values().get(TEST_TOPIC).get() ); }