Yunyung commented on code in PR #19867:
URL: https://github.com/apache/kafka/pull/19867#discussion_r2119665968
##########
core/src/main/scala/kafka/server/ConfigHelper.scala:
##########
@@ -39,14 +39,30 @@ import org.apache.kafka.server.logger.LoggingController
import org.apache.kafka.server.metrics.ClientMetricsConfigs
import org.apache.kafka.storage.internals.log.LogConfig
+import java.util.stream.Collectors
import scala.collection.{Map, mutable}
import scala.jdk.CollectionConverters._
import scala.jdk.OptionConverters.RichOptional
+import java.util.{HashMap, HashSet, List => JList, Map => JMap}
class ConfigHelper(metadataCache: MetadataCache, config: KafkaConfig,
configRepository: ConfigRepository) extends Logging {
- def allConfigs(config: AbstractConfig): mutable.Map[String, Any] = {
- config.originals.asScala.filter(_._2 != null) ++
config.nonInternalValues.asScala
+ def allConfigs(config: AbstractConfig): JMap[String, Object] = {
Review Comment:
I prefer this way, and the same goes for `java.util.List`, instead of JList
and JMap
```suggestion
def allConfigs(config: AbstractConfig): java.util.Map[String, Object] = {
```
##########
core/src/main/scala/kafka/server/ConfigHelper.scala:
##########
@@ -87,18 +103,26 @@ class ConfigHelper(metadataCache: MetadataCache, config:
KafkaConfig, configRepo
includeDocumentation: Boolean):
List[DescribeConfigsResponseData.DescribeConfigsResult] = {
resourceToConfigNames.map { resource =>
- def createResponseConfig(configs: Map[String, Any],
- createConfigEntry: (String, Any) =>
DescribeConfigsResponseData.DescribeConfigsResourceResult):
DescribeConfigsResponseData.DescribeConfigsResult = {
- val filteredConfigPairs = if (resource.configurationKeys == null ||
resource.configurationKeys.isEmpty)
- configs.toBuffer
- else
- configs.filter { case (configName, _) =>
- resource.configurationKeys.asScala.contains(configName)
- }.toBuffer
-
- val configEntries = filteredConfigPairs.map { case (name, value) =>
createConfigEntry(name, value) }
- new
DescribeConfigsResponseData.DescribeConfigsResult().setErrorCode(Errors.NONE.code)
- .setConfigs(configEntries.asJava)
+ def createResponseConfig(configs: JMap[String, _ <: Object],
+ createConfigEntry: (String, Object) =>
DescribeConfigsResponseData.DescribeConfigsResourceResult):
DescribeConfigsResponseData.DescribeConfigsResult = {
+ val keySet: HashSet[String] =
Review Comment:
This creates a new object, I think we should avoid this.
##########
core/src/main/scala/kafka/server/ConfigHelper.scala:
##########
@@ -87,18 +103,26 @@ class ConfigHelper(metadataCache: MetadataCache, config:
KafkaConfig, configRepo
includeDocumentation: Boolean):
List[DescribeConfigsResponseData.DescribeConfigsResult] = {
resourceToConfigNames.map { resource =>
- def createResponseConfig(configs: Map[String, Any],
- createConfigEntry: (String, Any) =>
DescribeConfigsResponseData.DescribeConfigsResourceResult):
DescribeConfigsResponseData.DescribeConfigsResult = {
- val filteredConfigPairs = if (resource.configurationKeys == null ||
resource.configurationKeys.isEmpty)
- configs.toBuffer
- else
- configs.filter { case (configName, _) =>
- resource.configurationKeys.asScala.contains(configName)
- }.toBuffer
-
- val configEntries = filteredConfigPairs.map { case (name, value) =>
createConfigEntry(name, value) }
- new
DescribeConfigsResponseData.DescribeConfigsResult().setErrorCode(Errors.NONE.code)
- .setConfigs(configEntries.asJava)
+ def createResponseConfig(configs: JMap[String, _ <: Object],
+ createConfigEntry: (String, Object) =>
DescribeConfigsResponseData.DescribeConfigsResourceResult):
DescribeConfigsResponseData.DescribeConfigsResult = {
+ val keySet: HashSet[String] =
+ if (resource.configurationKeys == null ||
resource.configurationKeys.isEmpty) null
+ else new HashSet[String](resource.configurationKeys)
+
+ val configEntries:
JList[DescribeConfigsResponseData.DescribeConfigsResourceResult] = {
+ val baseStream = configs.entrySet().stream()
+ val filtered = if (keySet == null) baseStream
+ else baseStream.filter(entry => keySet.contains(entry.getKey))
+ filtered
+
.map[DescribeConfigsResponseData.DescribeConfigsResourceResult](entry =>
+ createConfigEntry(entry.getKey, entry.getValue)
+ )
+ .collect(Collectors.toList())
Review Comment:
```suggestion
.toList
```
--
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-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
