fix: fixed imports and failing tests

appsmithorg · Jul 1, 2024 · 219c26c · 219c26c
1 parent 953d145
commit 219c26c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/.../appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java b/.../appsmith-plugins/snowflakePlugin/src/main/java/com/external/plugins/SnowflakePlugin.java
@@ -1,6 +1,5 @@
 package com.external.plugins;
 
-import com.appsmith.external.constants.Authentication;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import com.appsmith.external.exceptions.pluginExceptions.StaleConnectionException;
@@ -32,12 +31,22 @@
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
-import java.security.*;
-import java.sql.*;
+import java.security.PrivateKey;
 import java.sql.Connection;
-import java.util.*;
-
-import static com.appsmith.external.constants.Authentication.*;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import static com.appsmith.external.constants.Authentication.DB_AUTH;
+import static com.appsmith.external.constants.Authentication.SNOWFLAKE_KEY_PAIR_AUTH;
 import static com.appsmith.external.constants.PluginConstants.PluginName.SNOWFLAKE_PLUGIN_NAME;
 import static com.external.utils.ExecutionUtils.getRowsFromQueryResult;
 import static com.external.utils.SnowflakeDatasourceUtils.getConnectionFromHikariConnectionPool;
@@ -285,7 +294,7 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
             if (datasourceConfiguration.getAuthentication() == null) {
                 invalids.add(SnowflakeErrorMessages.DS_MISSING_AUTHENTICATION_DETAILS_ERROR_MSG);
             } else {
-                if (Authentication.SNOWFLAKE_KEY_PAIR_AUTH.equals(
+                if (SNOWFLAKE_KEY_PAIR_AUTH.equals(
                         datasourceConfiguration.getAuthentication().getAuthenticationType())) {
                     KeyPairAuth authentication = (KeyPairAuth) datasourceConfiguration.getAuthentication();
                     if (StringUtils.isEmpty(authentication.getUsername())) {

diff --git a/...smith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java b/...smith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java
@@ -102,6 +102,7 @@ public void testDatasourceWithInvalidUrl() {
         DBAuth auth = new DBAuth();
         auth.setUsername("test");
         auth.setPassword("test");
+        auth.setAuthenticationType("dbAuth");
         datasourceConfiguration.setAuthentication(auth);
         List<Property> properties = new ArrayList<>();
         properties.add(new Property("warehouse", "warehouse"));