fixing up.

Author: AbhishekKumar9984

amazon-redshift-plugin/src/test/java/io/cdap/plugin/amazon/redshift/RedshiftFailedConnectionTest.java

@@ -35,4 +35,4 @@ public void test() throws ClassNotFoundException, IOException {
             "{user=username}. Error: ConnectException: Connection refused " +
             "(Connection refused).");
   }
-  }
+}

database-commons/src/main/java/io/cdap/plugin/db/config/AbstractDBSpecificSourceConfig.java

@@ -130,8 +130,7 @@ public String getBoundingQuery() {
     return cleanQuery(boundingQuery);
   }
 
-
-  public void validate(FailureCollector collector) {
+    public void validate(FailureCollector collector) {
     boolean hasOneSplit = false;
     if (!containsMacro(NUM_SPLITS) && numSplits != null) {
       if (numSplits < 1) {
@@ -171,13 +170,12 @@ public void validate(FailureCollector collector) {
                 .withConfigProperty(TABLE_NAME);
       }
     }
-    if (!Strings.isNullOrEmpty(importQuery) &&
-            (!hasOneSplit && !containsMacro(IMPORT_QUERY) && !getImportQuery().contains("$CONDITIONS"))) {
-        collector.addFailure(String.format(
-                                "Import Query %s must contain the string '$CONDITIONS'. " +
-                                        "if Number of Splits is not set to 1.", importQuery),
-                        "Include '$CONDITIONS' in the Import Query")
-                .withConfigProperty(IMPORT_QUERY);
+
+    if (!hasOneSplit && !containsMacro(IMPORT_QUERY) && !getImportQuery().contains("$CONDITIONS")) {
+      collector.addFailure(String.format(
+        "Import Query %s must contain the string '$CONDITIONS'. if Number of Splits is not set to 1.", importQuery),
+                      "Include '$CONDITIONS' in the Import Query")
+              .withConfigProperty(IMPORT_QUERY);
     }
 
     if (!hasOneSplit && !containsMacro(SPLIT_BY) && (splitBy == null || splitBy.isEmpty())) {
@@ -219,8 +217,9 @@ public void validateSchema(Schema actualSchema, FailureCollector collector) {
       Schema actualFieldSchema = actualField.getSchema().isNullable() ?
         actualField.getSchema().getNonNullable() : actualField.getSchema();
       Schema expectedFieldSchema = field.getSchema().isNullable() ?
-        field.getSchema().getNonNullable() : field.getSchema();
-      validateField(collector, field, actualFieldSchema, expectedFieldSchema); 
+              field.getSchema().getNonNullable() : field.getSchema();
+
+      validateField(collector, field, actualFieldSchema, expectedFieldSchema);
     }
   }
 

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

@@ -166,14 +166,11 @@ public Schema getSchema() throws SQLException {
       executeInitQueries(connection, sourceConfig.getInitQueries());
       String query = sourceConfig.getImportQuery();
       ImportQueryType type = ImportQueryType.fromString(sourceConfig.getImportQueryType());
-      if (type == ImportQueryType.IMPORT_QUERY) {
-        return loadSchemaFromDBwithQuery(connection, query);
-      } else if (type == ImportQueryType.TABLE_NAME) {
+      if (type == ImportQueryType.TABLE_NAME) {
         List<Schema.Field> fields = getSchemaReader().getSchemaFields(connection, sourceConfig.getTableName());
         return Schema.recordOf("schema", fields);
-      } else {
-        throw new SQLException("Either importQuery or tableName must be provided to get schema.");
       }
+      return loadSchemaFromDBwithQuery(connection, query);
     }
   }
 
@@ -501,7 +498,7 @@ public String getTableName() {
     }
 
     public String getImportQueryType() {
-      return " ";
+      return null;
     }
 
     public String getBoundingQuery() {

database-commons/src/test/java/io/cdap/plugin/db/source/AbstractDBSourceTest.java

@@ -49,7 +49,7 @@ public String getConnectionString() {
       return "";
     }
     public String getTableName() {
-      return " ";
+      return "";
     }
   };
 

postgresql-plugin/src/test/java/io/cdap/plugin/postgres/PostgresFailedConnectionTest.java

@@ -20,7 +20,6 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import static org.junit.Assert.assertTrue;
 
 public class PostgresFailedConnectionTest extends DBSpecificFailedConnectionTest {
   private static final String JDBC_DRIVER_CLASS_NAME = "org.postgresql.Driver";
@@ -29,24 +28,11 @@ public class PostgresFailedConnectionTest extends DBSpecificFailedConnectionTest
   public void test() throws ClassNotFoundException, IOException {
 
     PostgresConnector connector = new PostgresConnector(
-      new PostgresConnectorConfig("localhost", 5432, "username", "password",
-              "jdbc", ""));
+            new PostgresConnectorConfig("localhost", 5432, "username", "password", "jdbc", ""));
 
-    String expectedPrefix = "Failed to create connection to database via connection string: " +
-            "jdbc:postgresql://localhost:5432/null and arguments: {user=username}. Error:";
-
-    try {
-      super.test(JDBC_DRIVER_CLASS_NAME, connector, expectedPrefix + " ConnectException:" +
-              " Connection refused (Connection refused).");
-    } catch (AssertionError e) {
-      // Accept either ConnectException or authentication failure as a valid error
-      String message = e.getMessage();
-      assertTrue(
-              "Expected connection failure due to either connection refused or authentication " +
-                      "failed, but got: " + message,
-              message.contains("ConnectException: Connection refused") ||
-                      message.contains("FATAL: password authentication failed")
-      );
-    }
+    super.test(JDBC_DRIVER_CLASS_NAME, connector, "Failed to create connection to database via connection string: " +
+            "jdbc:postgresql://localhost:5432/null and arguments: " +
+            "{user=username}. Error: ConnectException: Connection refused " +
+            "(Connection refused).");
   }
 }