From 07a7a7e2d805a330958b1d0886e61f8b3e1d8941 Mon Sep 17 00:00:00 2001
From: m1a2st <s7133700@gmail.com>
Date: Thu, 17 Oct 2024 22:24:58 +0800
Subject: [PATCH] revert print log issue code

---
 .../clients/consumer/ConsumerConfig.java      | 24 ++++---------------
 .../kafka/common/config/AbstractConfig.java   |  8 -------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java
index 6ece71081bca5..370807756e54c 100644
--- a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java
+++ b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java
@@ -35,7 +35,6 @@
 import org.apache.kafka.common.serialization.Deserializer;
 import org.apache.kafka.common.utils.Utils;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -62,12 +61,7 @@ public class ConsumerConfig extends AbstractConfig {
     // a list contains all the assignor names that only assign subscribed topics to consumer. Should be updated when new assignor added.
     // This is to help optimize ConsumerCoordinator#performAssignment method
     public static final List<String> ASSIGN_FROM_SUBSCRIBED_ASSIGNORS =
-        Collections.unmodifiableList(Arrays.asList(
-            RANGE_ASSIGNOR_NAME,
-            ROUNDROBIN_ASSIGNOR_NAME,
-            STICKY_ASSIGNOR_NAME,
-            COOPERATIVE_STICKY_ASSIGNOR_NAME
-        ));
+            List.of(RANGE_ASSIGNOR_NAME, ROUNDROBIN_ASSIGNOR_NAME, STICKY_ASSIGNOR_NAME, COOPERATIVE_STICKY_ASSIGNOR_NAME);
 
     /*
      * NOTE: DO NOT CHANGE EITHER CONFIG STRINGS OR THEIR JAVA VARIABLE NAMES AS
@@ -381,7 +375,7 @@ public class ConsumerConfig extends AbstractConfig {
 
     private static final AtomicInteger CONSUMER_CLIENT_ID_SEQUENCE = new AtomicInteger(1);
     private static final List<Class<? extends AbstractPartitionAssignor>> PARTITION_ASSIGNOR_DEFAULT_VALUE =
-            Collections.unmodifiableList(Arrays.asList(RangeAssignor.class, CooperativeStickyAssignor.class));
+            List.of(RangeAssignor.class, CooperativeStickyAssignor.class);
 
     /**
      * A list of configuration keys for CLASSIC protocol not supported. we should check the input string and clean up the
@@ -395,11 +389,8 @@ public class ConsumerConfig extends AbstractConfig {
      * A list of configuration keys for consumer protocol not supported. we should check the input string and clean up the
      * default value.
      */
-    private static final List<String> CONSUMER_PROTOCOL_UNSUPPORTED_CONFIGS = Collections.unmodifiableList(Arrays.asList(
-            PARTITION_ASSIGNMENT_STRATEGY_CONFIG, 
-            HEARTBEAT_INTERVAL_MS_CONFIG, 
-            SESSION_TIMEOUT_MS_CONFIG
-    ));
+    private static final List<String> CONSUMER_PROTOCOL_UNSUPPORTED_CONFIGS = 
+            List.of(PARTITION_ASSIGNMENT_STRATEGY_CONFIG, HEARTBEAT_INTERVAL_MS_CONFIG, SESSION_TIMEOUT_MS_CONFIG);
     
     static {
         CONFIG = new ConfigDef().define(BOOTSTRAP_SERVERS_CONFIG,
@@ -739,13 +730,6 @@ private void checkUnsupportedConfigs(GroupProtocol groupProtocol, List<String> u
                 Object config = originals().get(configName);
                 if (config != null && !Utils.isBlank(config.toString())) {
                     throw new ConfigException(configName + " cannot be set when " + GROUP_PROTOCOL_CONFIG + "=" + groupProtocol.name());
-                } else {
-                    /*
-                      Some default values are not supported in the CONSUMER protocol or CLASSIC protocol. When these default 
-                      values are printed in the log, they can misdirect users. Therefore, in this case, the default values 
-                      should be cleared.
-                     */
-                    super.clearConfig(configName);
                 }
             });
         }
diff --git a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java
index aec5af458036f..72038b4564cd3 100644
--- a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java
+++ b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java
@@ -355,14 +355,6 @@ public Map<String, Object> valuesWithPrefixAllOrNothing(String prefix) {
         return nonInternalConfigs;
     }
 
-    protected void clearConfig(String key) {
-        Object value = values.get(key);
-        if (value instanceof Number)
-            values.put(key, 0);
-        else
-            values.remove(key);
-    }
-
     private void logAll() {
         StringBuilder b = new StringBuilder();
         b.append(getClass().getSimpleName());