SNOW-1658905 PR fixes 2

snowflakedb · Sep 19, 2024 · c36cf76 · c36cf76
1 parent bbfe1a0
commit c36cf76
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/src/main/java/com/snowflake/kafka/connector/config/IcebergConfigValidator.java b/src/main/java/com/snowflake/kafka/connector/config/IcebergConfigValidator.java
@@ -21,21 +21,24 @@ public class IcebergConfigValidator implements StreamingConfigValidator {
   @Override
   public ImmutableMap<String, String> validate(Map<String, String> inputConfig) {
     boolean isIcebergEnabled = Boolean.parseBoolean(inputConfig.get(ICEBERG_ENABLED));
+
+    if (!isIcebergEnabled) {
+      return ImmutableMap.of();
+    }
+
     Map<String, String> validationErrors = new HashMap<>();
 
-    if (isIcebergEnabled) {
-      boolean isSchematizationEnabled =
-          Boolean.parseBoolean(
-              inputConfig.get(SnowflakeSinkConnectorConfig.ENABLE_SCHEMATIZATION_CONFIG));
-      IngestionMethodConfig ingestionMethod =
-          IngestionMethodConfig.valueOf(inputConfig.get(INGESTION_METHOD_OPT).toUpperCase());
-
-      if (!isSchematizationEnabled) {
-        validationErrors.put(ENABLE_SCHEMATIZATION_CONFIG, NO_SCHEMATIZATION_ERROR_MESSAGE);
-      }
-      if (ingestionMethod != SNOWPIPE_STREAMING) {
-        validationErrors.put(INGESTION_METHOD_OPT, INCOMPATIBLE_INGESTION_METHOD);
-      }
+    boolean isSchematizationEnabled =
+        Boolean.parseBoolean(
+            inputConfig.get(SnowflakeSinkConnectorConfig.ENABLE_SCHEMATIZATION_CONFIG));
+    IngestionMethodConfig ingestionMethod =
+        IngestionMethodConfig.valueOf(inputConfig.get(INGESTION_METHOD_OPT).toUpperCase());
+
+    if (!isSchematizationEnabled) {
+      validationErrors.put(ENABLE_SCHEMATIZATION_CONFIG, NO_SCHEMATIZATION_ERROR_MESSAGE);
+    }
+    if (ingestionMethod != SNOWPIPE_STREAMING) {
+      validationErrors.put(INGESTION_METHOD_OPT, INCOMPATIBLE_INGESTION_METHOD);
     }
 
     return ImmutableMap.copyOf(validationErrors);

diff --git a/src/test/java/com/snowflake/kafka/connector/config/SnowflakeSinkConnectorConfigBuilder.java b/src/test/java/com/snowflake/kafka/connector/config/SnowflakeSinkConnectorConfigBuilder.java
@@ -11,7 +11,7 @@
 import java.util.Map;
 
 /**
- * This is a builder class for the connector config For now it returns map. Let's change it to a
+ * This is a builder class for the connector config. For now it returns map. Let's change it to a
  * more convenient abstraction when we have it.
  */
 public class SnowflakeSinkConnectorConfigBuilder {

diff --git a/src/test/java/com/snowflake/kafka/connector/internal/TestUtils.java b/src/test/java/com/snowflake/kafka/connector/internal/TestUtils.java
@@ -760,6 +760,7 @@ public static List<SinkRecord> createBigAvroRecords(
   }
 
   /** @deprecated use SnowflakeSinkConnectorConfigBuilder instead */
+  @Deprecated
   public static Map<String, String> getConfig() {
     return SnowflakeSinkConnectorConfigBuilder.snowpipeConfig().build();
   }