PLUGIN-1883 : Rework

Author: sgarg-CS

src/main/java/io/cdap/plugin/snowflake/sink/batch/SnowflakeSinkConfig.java

@@ -23,6 +23,7 @@
 import io.cdap.plugin.snowflake.common.BaseSnowflakeConfig;
 import io.cdap.plugin.snowflake.common.client.SnowflakeAccessor;
 import io.cdap.plugin.snowflake.common.util.SchemaHelper;
+
 import javax.annotation.Nullable;
 
 /**

src/main/java/io/cdap/plugin/snowflake/source/batch/ImportQueryType.java

@@ -25,12 +25,16 @@ public enum ImportQueryType {
   TABLE_NAME;
 
   public static ImportQueryType fromString(String value) {
+    if (value == null) {
+      return ImportQueryType.IMPORT_QUERY;
+    }
+
     for (ImportQueryType type : ImportQueryType.values()) {
       if (type.name().equalsIgnoreCase(value)) {
         return type;
       }
     }
-    throw new IllegalArgumentException(
-      String.format("Unsupported importQueryType '%s'. Supported types are: importQuery, tableName.", value));
+    
+    return ImportQueryType.IMPORT_QUERY;
   }
 }

src/main/java/io/cdap/plugin/snowflake/source/batch/SnowflakeBatchSourceConfig.java

@@ -22,6 +22,7 @@
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.etl.api.FailureCollector;
 import io.cdap.plugin.snowflake.common.BaseSnowflakeConfig;
+
 import java.util.Objects;
 import javax.annotation.Nullable;
 
@@ -59,8 +60,9 @@ public class SnowflakeBatchSourceConfig extends BaseSnowflakeConfig {
 
 
   @Name(PROPERTY_TABLE_NAME)
-  @Nullable
   @Description("The name of the table used to retrieve the schema.")
+  @Macro
+  @Nullable
   private final String tableName;
 
   @Name("importQueryType")
@@ -114,8 +116,9 @@ public String getTableName() {
     return tableName;
   }
 
+  @Nullable
   public ImportQueryType getImportQueryType() {
-    return importQueryType;
+    return importQueryType == null ? ImportQueryType.IMPORT_QUERY : importQueryType;
   }
 
   public void validate(FailureCollector collector) {