lucasbru commented on code in PR #22511:
URL: https://github.com/apache/kafka/pull/22511#discussion_r3378996422
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java:
##########
@@ -897,6 +906,14 @@ protected List<ShareGroupPartitionAssignor>
shareGroupAssignors(
return assignors;
}
+ protected Optional<StreamsGroupTopologyDescriptionPlugin>
streamsGroupTopologyDescriptionPlugin(
+ AbstractConfig config
+ ) {
Review Comment:
Could we instead make this a public method that takes the additional configs
and returns the plugin on demand — and drop both the `private final
Optional<StreamsGroupTopologyDescriptionPlugin>` field and the constructor-time
instantiation?
```java
public Optional<StreamsGroupTopologyDescriptionPlugin>
streamsGroupTopologyDescriptionPlugin(
Map<String, ?> additionalConfigs
) {
Map<String, Object> merged = new HashMap<>(originals());
merged.putAll(additionalConfigs);
return Optional.ofNullable(
Utils.newConfiguredInstance(
getClass(STREAMS_GROUP_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS_CONFIG),
StreamsGroupTopologyDescriptionPlugin.class,
merged));
}
```
The motivation: some plugin implementations may want to pass custom
configurations that aren't reachable from `AbstractConfig` alone (e.g.
broker-injected references the broker only has after `GroupCoordinatorConfig`
is constructed). With the current shape they'd need a second `configure()` call
to inject those, leaking the first client. Letting callers pass the extra
entries at call time avoids that entirely. The common case is just
`cfg.streamsGroupTopologyDescriptionPlugin(Map.of())`.
##########
group-coordinator/group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/streams/StreamsGroupTopologyDescription.java:
##########
@@ -0,0 +1,286 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.coordinator.group.api.streams;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Broker-side description of a Kafka Streams topology, as pushed by clients
via
+ * {@code StreamsGroupTopologyDescriptionUpdate} and consumed by
+ * {@link StreamsGroupTopologyDescriptionPlugin} implementations.
+ *
+ * <p>This type mirrors {@code org.apache.kafka.streams.TopologyDescription}
in shape
+ * but lives in {@code group-coordinator-api} so plugin implementations do not
need
+ * to depend on {@code kafka-streams}. The wire schema only carries the
successor
+ * relation; plugins that need both directions reconstruct predecessors in a
single
+ * pass over the nodes.
+ */
+public class StreamsGroupTopologyDescription {
+
+ /**
+ * A processing node in the topology. Predecessor nodes can be inferred
from
+ * the {@link #successors()} relation.
+ */
+ public sealed interface Node {
+ String name();
+ Set<String> successors();
+ }
+
+ public static final class Source implements Node {
Review Comment:
Could these value types be records? The compact constructor still does the
requireNonNull + Set.copyOf, and we'd get equals/hashCode/toString for free.
Node stays a sealed interface that the records implement, e.g.
```java
public record Source(String name, Set<String> topics, Set<String>
successors) implements Node {
public Source {
name = Objects.requireNonNull(name, "name");
topics = Set.copyOf(Objects.requireNonNull(topics, "topics"));
successors = Set.copyOf(Objects.requireNonNull(successors,
"successors"));
}
}
```
##########
server/src/test/java/org/apache/kafka/server/streams/InMemoryTopologyDescriptionPluginTest.java:
##########
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.server.streams;
+
+import
org.apache.kafka.coordinator.group.api.streams.StreamsGroupTopologyDescription;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class InMemoryTopologyDescriptionPluginTest {
+
+ @Test
+ public void testSetThenGetRoundTrip() throws Exception {
+ try (InMemoryTopologyDescriptionPlugin plugin = new
InMemoryTopologyDescriptionPlugin()) {
+ StreamsGroupTopologyDescription desc = topology("src", "in");
+ plugin.setTopology("g1", 7, desc).get();
+ StreamsGroupTopologyDescription got = plugin.getTopology("g1",
7).get();
+ assertEquals(desc, got);
+ }
+
Review Comment:
nit: stray blank line
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
