Address review comments
diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsResponse.java
index 8cc3c84..ac91a04 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsResponse.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsResponse.java
@@ -106,7 +106,7 @@
data.setApiKeys(Objects.requireNonNull(apiVersions));
data.setThrottleTimeMs(throttleTimeMs);
data.setSupportedFeatures(
- createSupportedFeatureKeys(Objects.requireNonNull(supportedFeatures), suppressFeatureLevel0));
+ maybeFilterSupportedFeatureKeys(Objects.requireNonNull(supportedFeatures), suppressFeatureLevel0));
data.setFinalizedFeatures(
createFinalizedFeatureKeys(Objects.requireNonNull(finalizedFeatures)));
data.setFinalizedFeaturesEpoch(finalizedFeaturesEpoch);
@@ -282,7 +282,7 @@
return apiKeys;
}
- private static SupportedFeatureKeyCollection createSupportedFeatureKeys(
+ private static SupportedFeatureKeyCollection maybeFilterSupportedFeatureKeys(
Features<SupportedVersionRange> latestSupportedFeatures,
boolean suppressV0
) {
diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java
index f8be83e..61dc3ba 100644
--- a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java
@@ -147,7 +147,7 @@
setSupportedFeatures(Features.supportedFeatures(
Utils.mkMap(Utils.mkEntry("feature", new SupportedVersionRange((short) 1, (short) 4))))).
setFinalizedFeatures(Utils.mkMap(Utils.mkEntry("feature", (short) 3))).
- setFinalizedFeaturesEpoch(10).
+ setFinalizedFeaturesEpoch(10L).
build();
verifyApiKeysForMagic(response, RecordBatch.MAGIC_VALUE_V1);
diff --git a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala
index b153db6..d5ab087 100644
--- a/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala
+++ b/core/src/test/scala/integration/kafka/server/GssapiAuthenticationTest.scala
@@ -264,7 +264,7 @@
val jaasContexts = Collections.singletonMap("GSSAPI", JaasContext.loadClientContext(config.values()))
val channelBuilder = new SaslChannelBuilder(Mode.CLIENT, jaasContexts, securityProtocol,
null, false, kafkaClientSaslMechanism, true, null, null, null, time, new LogContext(),
- version => org.apache.kafka.test.TestUtils.defaultApiVersionsResponse(ListenerType.ZK_BROKER)) {
+ _ => org.apache.kafka.test.TestUtils.defaultApiVersionsResponse(ListenerType.ZK_BROKER)) {
override protected def defaultLoginClass(): Class[_ <: Login] = classOf[TestableKerberosLogin]
}
channelBuilder.configure(config.values())
diff --git a/core/src/test/scala/unit/kafka/server/ApiVersionsResponseIntegrationTest.scala b/core/src/test/scala/unit/kafka/server/ApiVersionsResponseIntegrationTest.scala
index 7c25e6d..560d3df 100644
--- a/core/src/test/scala/unit/kafka/server/ApiVersionsResponseIntegrationTest.scala
+++ b/core/src/test/scala/unit/kafka/server/ApiVersionsResponseIntegrationTest.scala
@@ -46,7 +46,7 @@
if (quorum.equals("kraft")) {
assertFeatureHasMinVersion("metadata.version", response.data().supportedFeatures(), 1)
} else {
- assertFeatureDoesNotExist("metadata.version", response.data().supportedFeatures())
+ assertEquals(0, response.data().supportedFeatures().size())
}
}
@@ -58,20 +58,19 @@
assertFeatureHasMinVersion("group.version", response.data().supportedFeatures(), 0)
assertFeatureHasMinVersion("metadata.version", response.data().supportedFeatures(), 1)
} else {
- assertFeatureDoesNotExist("group.version", response.data().supportedFeatures())
- assertFeatureDoesNotExist("metadata.version", response.data().supportedFeatures())
+ assertEquals(0, response.data().supportedFeatures().size())
}
}
def assertFeatureHasMinVersion(
name: String,
coll: SupportedFeatureKeyCollection,
- expectedVersion: Short
+ expectedMinVersion: Short
): Unit = {
val key = coll.find(name)
assertNotNull(key)
assertEquals(name, key.name())
- assertEquals(expectedVersion, key.minVersion())
+ assertEquals(expectedMinVersion, key.minVersion())
}
def assertFeatureDoesNotExist(
