From 6eec6e9fb4b6c168b0d3de30c453e74e8089fbdb Mon Sep 17 00:00:00 2001 From: frankvicky Date: Thu, 16 Jan 2025 08:58:19 +0800 Subject: [PATCH] KAFKA-18553: Update javadoc and comments of ConfigType JIRA: KAFKA-18553 The description of this class is outdated. --- core/src/main/scala/kafka/admin/ConfigCommand.scala | 2 +- .../java/org/apache/kafka/server/config/ConfigType.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/kafka/admin/ConfigCommand.scala b/core/src/main/scala/kafka/admin/ConfigCommand.scala index aa38a6c85c4f9..1cf2a800de989 100644 --- a/core/src/main/scala/kafka/admin/ConfigCommand.scala +++ b/core/src/main/scala/kafka/admin/ConfigCommand.scala @@ -63,7 +63,7 @@ object ConfigCommand extends Logging { private val BrokerDefaultEntityName = "" val BrokerLoggerConfigType = "broker-loggers" - private val BrokerSupportedConfigTypes = ConfigType.ALL.asScala :+ BrokerLoggerConfigType :+ ConfigType.CLIENT_METRICS :+ ConfigType.GROUP + private val BrokerSupportedConfigTypes = ConfigType.ALL.asScala :+ BrokerLoggerConfigType private val DefaultScramIterations = 4096 def main(args: Array[String]): Unit = { diff --git a/server-common/src/main/java/org/apache/kafka/server/config/ConfigType.java b/server-common/src/main/java/org/apache/kafka/server/config/ConfigType.java index 0e76c586fb427..ce280ac2ab621 100644 --- a/server-common/src/main/java/org/apache/kafka/server/config/ConfigType.java +++ b/server-common/src/main/java/org/apache/kafka/server/config/ConfigType.java @@ -16,11 +16,10 @@ */ package org.apache.kafka.server.config; -import java.util.Arrays; import java.util.List; /** - * Represents all the entities that can be configured via ZK + * Represents all the entities that can be configured. */ public class ConfigType { public static final String TOPIC = "topics"; @@ -31,6 +30,5 @@ public class ConfigType { public static final String CLIENT_METRICS = "client-metrics"; public static final String GROUP = "groups"; - // Do not include ClientMetrics and Groups in `all` as they are not supported on ZK. - public static final List ALL = Arrays.asList(TOPIC, CLIENT, USER, BROKER, IP); + public static final List ALL = List.of(TOPIC, CLIENT, USER, BROKER, IP, CLIENT_METRICS, GROUP); }