From 667578860a746a0065bf5c3f976e346ddb0c2e26 Mon Sep 17 00:00:00 2001
From: David Jacot <djacot@confluent.io>
Date: Wed, 31 Mar 2021 11:28:29 +0200
Subject: [PATCH] KAFKA-12577; Remove deprecated `ConfigEntry` constructor for
 3.0 (#10436)

ConfigEntry's public constructor was deprecated in 1.1.0. This patch removes it in AK 3.0.

Reviewers: Chia-Ping Tsai <chia7712@gmail.com>, Ismael Juma <ismael@juma.me.uk>
---
 .../kafka/clients/admin/ConfigEntry.java      | 25 ++-----------------
 docs/upgrade.html                             |  2 ++
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java b/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java
index b6d947f1b57..0fed04f6f52 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java
@@ -47,29 +47,8 @@ public class ConfigEntry {
      * @param value the config value or null
      */
     public ConfigEntry(String name, String value) {
-        this(name, value, false, false, false);
-    }
-
-    /**
-     * Create a configuration with the provided values.
-     *
-     * @param name the non-null config name
-     * @param value the config value or null
-     * @param isDefault whether the config value is the default or if it's been explicitly set
-     * @param isSensitive whether the config value is sensitive, the broker never returns the value if it is sensitive
-     * @param isReadOnly whether the config is read-only and cannot be updated
-     * @deprecated since 1.1.0. This constructor will be removed in a future release.
-     */
-    @Deprecated
-    public ConfigEntry(String name, String value, boolean isDefault, boolean isSensitive, boolean isReadOnly) {
-        this(name,
-             value,
-             isDefault ? ConfigSource.DEFAULT_CONFIG : ConfigSource.UNKNOWN,
-             isSensitive,
-             isReadOnly,
-             Collections.<ConfigSynonym>emptyList(),
-             ConfigType.UNKNOWN,
-             null);
+        this(name, value, ConfigSource.UNKNOWN, false, false,
+            Collections.emptyList(), ConfigType.UNKNOWN, null);
     }
 
     /**
diff --git a/docs/upgrade.html b/docs/upgrade.html
index 20581f321ca..05b28a05593 100644
--- a/docs/upgrade.html
+++ b/docs/upgrade.html
@@ -32,6 +32,8 @@
         Furthermore, deprecated constants and constructors were removed from <code>SslConfigs</code>, <code>SaslConfigs</code>,
         <code>AclBinding</code> and <code>AclBindingFilter</code>.</li>
     <li>The deprecated <code>Admin.electedPreferredLeaders()</code> methods were removed. Please use <code>Admin.electLeaders</code> instead.</li>
+    <li>The deprecated <code>ConfigEntry</code> constructor was removed (<a href="https://issues.apache.org/jira/browse/KAFKA-12577">KAFKA-12577</a>).
+        Please use the remaining public constructor instead.</li>
 </ul>
 
 <h5><a id="upgrade_280_notable" href="#upgrade_280_notable">Notable changes in 2.8.0</a></h5>