You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by rs...@apache.org on 2019/03/18 08:52:00 UTC
[kafka] branch trunk updated: MINOR: Retain public constructors of
classes from public API (#6455)
This is an automated email from the ASF dual-hosted git repository.
rsivaram pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new ca6ac93 MINOR: Retain public constructors of classes from public API (#6455)
ca6ac93 is described below
commit ca6ac9393bae9161465275cb8f836bc987a5098d
Author: Rajini Sivaram <ra...@googlemail.com>
AuthorDate: Mon Mar 18 08:51:50 2019 +0000
MINOR: Retain public constructors of classes from public API (#6455)
TopicDescription and ConsumerGroupDescription in org.apache.kafka.clients.admin. are part of the public API, so we should retain the existing public constructor. Changed the new constructor with authorized operations to be package-private to avoid maintaining more public constructors since we only expect admin client to use this.
Reviewers: Manikumar Reddy <ma...@gmail.com>
---
.../kafka/clients/admin/ConsumerGroupDescription.java | 9 +++++++++
.../org/apache/kafka/clients/admin/TopicDescription.java | 15 ++++++++++++++-
.../processor/internals/InternalTopicManagerTest.java | 6 +++---
.../org/apache/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 7320f65..52f23ed 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
@@ -45,6 +45,15 @@ public class ConsumerGroupDescription {
Collection<MemberDescription> members,
String partitionAssignor,
ConsumerGroupState state,
+ Node coordinator) {
+ this(groupId, isSimpleConsumerGroup, members, partitionAssignor, state, coordinator, Collections.emptySet());
+ }
+
+ ConsumerGroupDescription(String groupId,
+ boolean isSimpleConsumerGroup,
+ Collection<MemberDescription> members,
+ String partitionAssignor,
+ ConsumerGroupState state,
Node coordinator,
Set<AclOperation> authorizedOperations) {
this.groupId = groupId == null ? "" : groupId;
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 daadac0..c6d44e8 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.TopicPartitionInfo;
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;
@@ -57,9 +58,21 @@ public class TopicDescription {
* @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<TopicPartitionInfo> partitions) {
+ this(name, internal, partitions, Collections.emptySet());
+ }
+
+ /**
+ * 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.
* @param authorizedOperations authorized operations for this topic
*/
- public TopicDescription(String name, boolean internal, List<TopicPartitionInfo> partitions,
+ TopicDescription(String name, boolean internal, List<TopicPartitionInfo> partitions,
Set<AclOperation> 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 e2dc376..074228a 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 class InternalTopicManagerTest {
{
add(new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>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<TopicPartitionInfo>() {
{
add(new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>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<TopicPartitionInfo>() {
{
add(new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>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 29e966c..a35efe1 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 class WorkerUtilsTest {
new TopicDescription(
TEST_TOPIC, false,
Collections.singletonList(
- new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>emptyList())),
- Collections.emptySet()),
+ new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>emptyList()))),
adminClient.describeTopics(
Collections.singleton(TEST_TOPIC)).values().get(TEST_TOPIC).get()
);
@@ -99,8 +98,7 @@ public class WorkerUtilsTest {
new TopicDescription(
TEST_TOPIC, false,
Collections.singletonList(
- new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>emptyList())),
- Collections.emptySet()),
+ new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>emptyList()))),
adminClient.describeTopics(
Collections.singleton(TEST_TOPIC)).values().get(TEST_TOPIC).get()
);
@@ -180,8 +178,7 @@ public class WorkerUtilsTest {
new TopicDescription(
TEST_TOPIC, false,
Collections.singletonList(
- new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>emptyList())),
- Collections.emptySet()),
+ new TopicPartitionInfo(0, broker1, singleReplica, Collections.<Node>emptyList()))),
adminClient.describeTopics(Collections.singleton(TEST_TOPIC)).values().get(TEST_TOPIC).get()
);
}