lucasbru commented on code in PR #20757: URL: https://github.com/apache/kafka/pull/20757#discussion_r2463768009
########## core/src/test/scala/unit/kafka/server/StreamsGroupHeartbeatRequestTest.scala: ########## @@ -0,0 +1,569 @@ +/* + * 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 kafka.server + +import kafka.utils.TestUtils +import org.apache.kafka.common.message.{StreamsGroupHeartbeatRequestData, StreamsGroupHeartbeatResponseData} +import org.apache.kafka.common.protocol.Errors +import org.apache.kafka.common.requests.{StreamsGroupHeartbeatRequest, StreamsGroupHeartbeatResponse} +import org.apache.kafka.common.test.ClusterInstance +import org.apache.kafka.common.test.api.{ClusterConfigProperty, ClusterFeature, ClusterTest, ClusterTestDefaults, Type} +import org.apache.kafka.coordinator.group.GroupCoordinatorConfig +import org.apache.kafka.common.errors.UnsupportedVersionException +import org.apache.kafka.server.common.Feature +import org.junit.jupiter.api.Assertions.{assertEquals, assertNotNull, assertThrows, assertTrue} + +import java.util.Collections +import scala.jdk.CollectionConverters._ + +@ClusterTestDefaults( + types = Array(Type.KRAFT), + serverProperties = Array( + new ClusterConfigProperty(key = GroupCoordinatorConfig.OFFSETS_TOPIC_PARTITIONS_CONFIG, value = "1"), + new ClusterConfigProperty(key = GroupCoordinatorConfig.OFFSETS_TOPIC_REPLICATION_FACTOR_CONFIG, value = "1"), + new ClusterConfigProperty(key = "unstable.api.versions.enable", value = "true") + ) +) +class StreamsGroupHeartbeatRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { + + @ClusterTest( + serverProperties = Array( + new ClusterConfigProperty(key = GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, value = "classic,consumer,streams"), + ) + ) + def testStreamsGroupHeartbeatWithInvalidAPIVersion(): Unit = { + // Test that invalid API version throws UnsupportedVersionException + assertThrows(classOf[UnsupportedVersionException], () => { + new StreamsGroupHeartbeatRequest.Builder( + new StreamsGroupHeartbeatRequestData() + ).build(-1) + }) + } + + @ClusterTest( + serverProperties = Array( + new ClusterConfigProperty(key = GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, value = "classic,consumer,streams"), + ), + features = Array( + new ClusterFeature(feature = Feature.STREAMS_VERSION, version = 0) + ) + ) + def testStreamsGroupHeartbeatIsInaccessibleWhenDisabledByFeatureConfig(): Unit = { + // Test with streams.version = 0, the API is disabled at server level + val topology = new StreamsGroupHeartbeatRequestData.Topology() + .setEpoch(1) + .setSubtopologies(java.util.Collections.emptyList()) Review Comment: `java.util.Collections` is already imported, so you do not need to add the FQN here. Also in many other places. You could also consider `List.of()` instead which is more readable. ########## core/src/test/scala/unit/kafka/server/StreamsGroupHeartbeatRequestTest.scala: ########## @@ -0,0 +1,569 @@ +/* + * 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 kafka.server + +import kafka.utils.TestUtils +import org.apache.kafka.common.message.{StreamsGroupHeartbeatRequestData, StreamsGroupHeartbeatResponseData} +import org.apache.kafka.common.protocol.Errors +import org.apache.kafka.common.requests.{StreamsGroupHeartbeatRequest, StreamsGroupHeartbeatResponse} +import org.apache.kafka.common.test.ClusterInstance +import org.apache.kafka.common.test.api.{ClusterConfigProperty, ClusterFeature, ClusterTest, ClusterTestDefaults, Type} +import org.apache.kafka.coordinator.group.GroupCoordinatorConfig +import org.apache.kafka.common.errors.UnsupportedVersionException +import org.apache.kafka.server.common.Feature +import org.junit.jupiter.api.Assertions.{assertEquals, assertNotNull, assertThrows, assertTrue} + +import java.util.Collections +import scala.jdk.CollectionConverters._ + +@ClusterTestDefaults( + types = Array(Type.KRAFT), + serverProperties = Array( + new ClusterConfigProperty(key = GroupCoordinatorConfig.OFFSETS_TOPIC_PARTITIONS_CONFIG, value = "1"), + new ClusterConfigProperty(key = GroupCoordinatorConfig.OFFSETS_TOPIC_REPLICATION_FACTOR_CONFIG, value = "1"), + new ClusterConfigProperty(key = "unstable.api.versions.enable", value = "true") + ) +) +class StreamsGroupHeartbeatRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { + + @ClusterTest( + serverProperties = Array( + new ClusterConfigProperty(key = GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, value = "classic,consumer,streams"), + ) + ) + def testStreamsGroupHeartbeatWithInvalidAPIVersion(): Unit = { + // Test that invalid API version throws UnsupportedVersionException + assertThrows(classOf[UnsupportedVersionException], () => { + new StreamsGroupHeartbeatRequest.Builder( + new StreamsGroupHeartbeatRequestData() + ).build(-1) + }) + } + + @ClusterTest( + serverProperties = Array( + new ClusterConfigProperty(key = GroupCoordinatorConfig.GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG, value = "classic,consumer,streams"), + ), + features = Array( + new ClusterFeature(feature = Feature.STREAMS_VERSION, version = 0) + ) + ) + def testStreamsGroupHeartbeatIsInaccessibleWhenDisabledByFeatureConfig(): Unit = { + // Test with streams.version = 0, the API is disabled at server level + val topology = new StreamsGroupHeartbeatRequestData.Topology() + .setEpoch(1) + .setSubtopologies(java.util.Collections.emptyList()) + + val streamsGroupHeartbeatRequest = new StreamsGroupHeartbeatRequest.Builder( + new StreamsGroupHeartbeatRequestData() + .setGroupId("test-group") + .setMemberId("test-member") + .setMemberEpoch(0) + .setRebalanceTimeoutMs(1000) + .setActiveTasks(java.util.Collections.emptyList()) + .setStandbyTasks(java.util.Collections.emptyList()) + .setWarmupTasks(java.util.Collections.emptyList()) + .setTopology(topology) + ).build(0) Review Comment: We should probably always build the latest version? ``` ).build(ApiKeys.STREAMS_GROUP_HEARTBEAT.latestVersion(isUnstableApiEnabled)) ``` -- 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]
