From 0d6bfec2654674e68910e16c4b484faef806ca7f Mon Sep 17 00:00:00 2001
From: Vojtech Juranek <vjuranek@redhat.com>
Date: Tue, 31 May 2022 16:10:26 +0200
Subject: [PATCH] DBZ-5045 Remove deprecated FIELD_BLACKLIST

---
 .../io/debezium/connector/mongodb/Filters.java     |  2 +-
 .../connector/mongodb/MongoDbConnectorConfig.java  | 14 --------------
 .../debezium/connector/mongodb/Configurator.java   |  4 ----
 .../connector/mongodb/FieldBlacklistIT.java        |  4 ++--
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/Filters.java b/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/Filters.java
index 3b1109757..4fe2e24bd 100644
--- a/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/Filters.java
+++ b/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/Filters.java
@@ -61,7 +61,7 @@ else if (collectionExcludeList != null && !collectionExcludeList.trim().isEmpty(
 
         // Define the field selector that provides the field filter to exclude or rename fields in a document ...
         fieldSelector = FieldSelector.builder()
-                .excludeFields(config.getFallbackStringProperty(MongoDbConnectorConfig.FIELD_EXCLUDE_LIST, MongoDbConnectorConfig.FIELD_BLACKLIST))
+                .excludeFields(config.getString(MongoDbConnectorConfig.FIELD_EXCLUDE_LIST))
                 .renameFields(config.getString(MongoDbConnectorConfig.FIELD_RENAMES))
                 .build();
     }
diff --git a/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/MongoDbConnectorConfig.java b/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/MongoDbConnectorConfig.java
index 4f6d6fc2a..f5688caf4 100644
--- a/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/MongoDbConnectorConfig.java
+++ b/debezium-connector-mongodb/src/main/java/io/debezium/connector/mongodb/MongoDbConnectorConfig.java
@@ -410,19 +410,6 @@ public boolean isFullUpdate() {
             .withValidation(MongoDbConnectorConfig::validateFieldExcludeList)
             .withDescription("A comma-separated list of the fully-qualified names of fields that should be excluded from change event message values");
 
-    /**
-     * Old, backwards-compatible "blacklist" property.
-     */
-    @Deprecated
-    public static final Field FIELD_BLACKLIST = Field.create("field.blacklist")
-            .withDisplayName("Deprecated: Exclude Fields")
-            .withType(Type.STRING)
-            .withWidth(Width.LONG)
-            .withImportance(Importance.LOW)
-            .withInvisibleRecommender()
-            .withDescription("A comma-separated list of the fully-qualified names of fields that should be excluded from change event message values (deprecated, use \""
-                    + FIELD_EXCLUDE_LIST.name() + "\" instead)");
-
     /**
      * A comma-separated list of the fully-qualified replacements of fields that should be used to rename fields in change
      * event message values. Fully-qualified replacements for fields are of the form {@code
@@ -539,7 +526,6 @@ public boolean isFullUpdate() {
                     DATABASE_EXCLUDE_LIST,
                     COLLECTION_INCLUDE_LIST,
                     COLLECTION_EXCLUDE_LIST,
-                    FIELD_BLACKLIST,
                     FIELD_EXCLUDE_LIST,
                     FIELD_RENAMES,
                     SNAPSHOT_FILTER_QUERY_BY_COLLECTION)
diff --git a/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/Configurator.java b/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/Configurator.java
index 207bdb6ae..5524f2053 100644
--- a/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/Configurator.java
+++ b/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/Configurator.java
@@ -66,10 +66,6 @@ public Configurator excludeCollections(String regexList) {
     }
 
     public Configurator excludeFields(String excludeList) {
-        if (Math.random() >= 0.5) {
-            Testing.debug("Using \"" + MongoDbConnectorConfig.FIELD_BLACKLIST.name() + "\" config property");
-            return with(MongoDbConnectorConfig.FIELD_BLACKLIST, excludeList);
-        }
         Testing.debug("Using \"" + MongoDbConnectorConfig.FIELD_EXCLUDE_LIST.name() + "\" config property");
         return with(MongoDbConnectorConfig.FIELD_EXCLUDE_LIST, excludeList);
     }
diff --git a/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/FieldBlacklistIT.java b/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/FieldBlacklistIT.java
index fe8c2cc58..27140a00b 100644
--- a/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/FieldBlacklistIT.java
+++ b/debezium-connector-mongodb/src/test/java/io/debezium/connector/mongodb/FieldBlacklistIT.java
@@ -1450,9 +1450,9 @@ public void shouldExcludeFieldsForDeleteTombstoneEvent() throws InterruptedExcep
         assertThat(value).isNull();
     }
 
-    private Configuration getConfiguration(String blackList) {
+    private Configuration getConfiguration(String excludeList) {
         return TestHelper.getConfiguration().edit()
-                .with(MongoDbConnectorConfig.FIELD_BLACKLIST, blackList)
+                .with(MongoDbConnectorConfig.FIELD_EXCLUDE_LIST, excludeList)
                 .with(MongoDbConnectorConfig.COLLECTION_INCLUDE_LIST, "dbA.c1")
                 .with(MongoDbConnectorConfig.LOGICAL_NAME, SERVER_NAME)
                 .build();