(kafka) branch 4.0 updated: KAFKA-18685: Cleanup DynamicLogConfig constructor (#18764)

[clolov]

This is an automated email from the ASF dual-hosted git repository.

clolov pushed a commit to branch 4.0
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/4.0 by this push:
     new b49c573d1b1 KAFKA-18685: Cleanup DynamicLogConfig constructor (#18764)
b49c573d1b1 is described below

commit b49c573d1b1f14067d01660032dbbe7f1d7277e4
Author: Ken Huang <s7133...@gmail.com>
AuthorDate: Mon Feb 3 23:38:05 2025 +0800

    KAFKA-18685: Cleanup DynamicLogConfig constructor (#18764)
    
    Reviewers: Chia-Ping Tsai <chia7...@gmail.com>, Christo Lolov 
<lol...@amazon.com>
---
 core/src/main/scala/kafka/server/DynamicBrokerConfig.scala        | 4 ++--
 .../test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala 
b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
index 32febffb546..436ee63f761 100755
--- a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
+++ b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
@@ -250,7 +250,7 @@ class DynamicBrokerConfig(private val kafkaConfig: 
KafkaConfig) extends Logging
     addReconfigurable(new 
DynamicClientQuotaCallback(kafkaServer.quotaManagers, kafkaServer.config))
 
     addBrokerReconfigurable(new BrokerDynamicThreadPool(kafkaServer))
-    addBrokerReconfigurable(new DynamicLogConfig(kafkaServer.logManager, 
kafkaServer))
+    addBrokerReconfigurable(new DynamicLogConfig(kafkaServer.logManager))
     addBrokerReconfigurable(new DynamicListenerConfig(kafkaServer))
     addBrokerReconfigurable(kafkaServer.socketServer)
     addBrokerReconfigurable(new 
DynamicProducerStateManagerConfig(kafkaServer.logManager.producerStateManagerConfig))
@@ -620,7 +620,7 @@ object DynamicLogConfig {
     ServerTopicConfigSynonyms.TOPIC_CONFIG_SYNONYMS.asScala.values.toSet
 }
 
-class DynamicLogConfig(logManager: LogManager, server: KafkaBroker) extends 
BrokerReconfigurable with Logging {
+class DynamicLogConfig(logManager: LogManager) extends BrokerReconfigurable 
with Logging {
 
   override def reconfigurableConfigs: Set[String] = {
     DynamicLogConfig.ReconfigurableConfigs
diff --git 
a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala 
b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
index 61aacbf0f1a..e8702eacfa3 100755
--- a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
+++ b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
@@ -681,7 +681,7 @@ class DynamicBrokerConfigTest {
     val props = TestUtils.createBrokerConfig(0, port = 8181)
     props.put(ServerLogConfigs.LOG_RETENTION_TIME_MILLIS_CONFIG, "2592000000")
     val config = KafkaConfig(props)
-    val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]), 
mock(classOf[KafkaBroker]))
+    val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]))
     config.dynamicConfig.initialize(None)
     config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig)
 
@@ -704,7 +704,7 @@ class DynamicBrokerConfigTest {
     val props = TestUtils.createBrokerConfig(0, port = 8181)
     props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, "4294967296")
     val config = KafkaConfig(props)
-    val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]), 
mock(classOf[KafkaBroker]))
+    val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]))
     config.dynamicConfig.initialize(None)
     config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig)
 
@@ -964,7 +964,7 @@ class DynamicBrokerConfigTest {
     props.put(ServerLogConfigs.LOG_RETENTION_TIME_MILLIS_CONFIG, 
retentionMs.toString)
     props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, 
retentionBytes.toString)
     val config = KafkaConfig(props)
-    val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]), 
mock(classOf[KafkaBroker]))
+    val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]))
     config.dynamicConfig.initialize(None)
     config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig)
 
@@ -992,7 +992,7 @@ class DynamicBrokerConfigTest {
       .thenAnswer(invocation => 
currentDefaultLogConfig.set(invocation.getArgument(0)))
 
     config.dynamicConfig.initialize(None)
-    config.dynamicConfig.addBrokerReconfigurable(new 
DynamicLogConfig(logManagerMock, serverMock))
+    config.dynamicConfig.addBrokerReconfigurable(new 
DynamicLogConfig(logManagerMock))
   }
 
   @Test