Addressing review comments.

Author: VenkatasivareddyTR

athena-synapse/src/main/java/com/amazonaws/athena/connectors/synapse/SynapseJdbcConnectionFactory.java

@@ -21,7 +21,6 @@
 
 import com.amazonaws.athena.connector.credentials.CredentialsConstants;
 import com.amazonaws.athena.connector.credentials.CredentialsProvider;
-import com.amazonaws.athena.connector.credentials.OAuthAccessTokenCredentials;
 import com.amazonaws.athena.connectors.jdbc.connection.DatabaseConnectionConfig;
 import com.amazonaws.athena.connectors.jdbc.connection.DatabaseConnectionInfo;
 import com.amazonaws.athena.connectors.jdbc.connection.GenericJdbcConnectionFactory;
@@ -79,21 +78,9 @@ public Connection getConnection(final CredentialsProvider credentialsProvider)
                     );
                 }
                 else {
-                    // Check if this is OAuth credentials
-                    if (credentialsProvider.getCredential() instanceof OAuthAccessTokenCredentials) {
-                        // OAuth token
-                        OAuthAccessTokenCredentials oauthCreds = (OAuthAccessTokenCredentials) credentialsProvider.getCredential();
-                        connectionProps.setProperty(CredentialsConstants.ACCESS_TOKEN_PROPERTY, oauthCreds.getAccessToken());
-                        secretReplacement = "";
-                    }
-                    else {
-                        // replace aws secret value with credentials and change username as user
-                        secretReplacement = String.format(
-                                "%s;%s",
-                                "user=" + credentialsProvider.getCredentialMap().get(CredentialsConstants.USER),
-                                "password=" + credentialsProvider.getCredentialMap().get(CredentialsConstants.PASSWORD)
-                        );
-                    }
+                    Map<String, String> credentialMap = credentialsProvider.getCredentialMap();
+                    connectionProps.putAll(credentialMap);
+                    secretReplacement = "";
                 }
 
                 derivedJdbcString = secretMatcher.replaceAll(Matcher.quoteReplacement(secretReplacement));

athena-synapse/src/test/java/com/amazonaws/athena/connectors/synapse/SynapseJdbcConnectionFactoryTest.java

@@ -119,7 +119,6 @@ public void testGetConnectionWithBasicCredentialsSuccess()
         credentialMap.put(CredentialsConstants.PASSWORD, TEST_PASSWORD);
 
         when(mockCredentialsProvider.getCredentialMap()).thenReturn(credentialMap);
-        when(mockCredentialsProvider.getCredential()).thenReturn(null);
 
         connectionFactory = new SynapseJdbcConnectionFactory(
             mockDatabaseConnectionConfig, 
@@ -138,9 +137,11 @@ public void testGetConnectionWithBasicCredentialsSuccess()
     public void testGetConnectionWithOAuthCredentialsSuccess()
     {
         when(mockDatabaseConnectionConfig.getJdbcConnectionString()).thenReturn(TEST_JDBC_URL_WITH_SECRET);
-        
-        when(mockCredentialsProvider.getCredential()).thenReturn(mockOAuthCredentials);
-        when(mockOAuthCredentials.getAccessToken()).thenReturn(TEST_ACCESS_TOKEN);
+
+        Map<String, String> credentialMap = new HashMap<>();
+        credentialMap.put(CredentialsConstants.ACCESS_TOKEN_PROPERTY, TEST_ACCESS_TOKEN);
+
+        when(mockCredentialsProvider.getCredentialMap()).thenReturn(credentialMap);
 
         connectionFactory = new SynapseJdbcConnectionFactory(
             mockDatabaseConnectionConfig, 
@@ -186,7 +187,6 @@ public void testGetConnectionWithNullCredentialsProviderCredentialMapThrowsExcep
         when(mockDatabaseConnectionConfig.getJdbcConnectionString()).thenReturn(TEST_JDBC_URL_WITH_SECRET);
 
         when(mockCredentialsProvider.getCredentialMap()).thenReturn(null);
-        when(mockCredentialsProvider.getCredential()).thenReturn(null);
 
         connectionFactory = new SynapseJdbcConnectionFactory(
             mockDatabaseConnectionConfig,