[GitHub] [kafka] cmccabe commented on a diff in pull request #12214: MINOR: Consolidate FinalizedFeatureCache into MetadataCache

[GitBox <gi...@apache.org>]

cmccabe commented on code in PR #12214:
URL: https://github.com/apache/kafka/pull/12214#discussion_r882890450


##########
core/src/main/scala/kafka/server/ApiVersionManager.scala:
##########
@@ -70,35 +67,24 @@ class SimpleApiVersionManager(
 
 class DefaultApiVersionManager(
   val listenerType: ListenerType,
-  interBrokerProtocolVersion: MetadataVersion,
   forwardingManager: Option[ForwardingManager],
   features: BrokerFeatures,
-  featureCache: FinalizedFeatureCache
+  metadataCache: MetadataCache
 ) extends ApiVersionManager {
 
   override def apiVersionResponse(throttleTimeMs: Int): ApiVersionsResponse = {
     val supportedFeatures = features.supportedFeatures
-    val finalizedFeaturesOpt = featureCache.get
+    val finalizedFeatures = metadataCache.features()
     val controllerApiVersions = forwardingManager.flatMap(_.controllerApiVersions)
 
-    finalizedFeaturesOpt match {
-      case Some(finalizedFeatures) => ApiVersionsResponse.createApiVersionsResponse(
+    ApiVersionsResponse.createApiVersionsResponse(
         throttleTimeMs,
-        interBrokerProtocolVersion.highestSupportedRecordVersion,
+        metadataCache.metadataVersion().highestSupportedRecordVersion,
         supportedFeatures,
         finalizedFeatures.features.map(kv => (kv._1, kv._2.asInstanceOf[java.lang.Short])).asJava,
         finalizedFeatures.epoch,
         controllerApiVersions.orNull,
         listenerType)
-      case None => ApiVersionsResponse.createApiVersionsResponse(
-        throttleTimeMs,
-        interBrokerProtocolVersion.highestSupportedRecordVersion,
-        supportedFeatures,
-        Collections.emptyMap(),
-        ApiVersionsResponse.UNKNOWN_FINALIZED_FEATURES_EPOCH,

Review Comment:
   excellent. nice to not have this weird special case



-- 
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: jira-unsubscribe@kafka.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org