remove AuthenticationConnectionPlugin

sergiyvamz · sergiyvamz · commit ac548ae10285 · 2025-01-14T09:45:23.000-08:00
diff --git a/wrapper/src/main/java/software/amazon/jdbc/AuthenticationConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/AuthenticationConnectionPlugin.java
diff --git a/wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginManager.java b/wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginManager.java
@@ -115,9 +115,6 @@ public class ConnectionPluginManager implements CanReleaseResources, Wrapper {
   @SuppressWarnings("rawtypes")
   protected final Map<String, PluginChainJdbcCallable> pluginChainFuncMap = new HashMap<>();
 
-  @SuppressWarnings("rawtypes")
-  protected final Map<String, PluginChainJdbcCallable> pluginForceConnectChainFuncMap = new HashMap<>();
-
   public ConnectionPluginManager(
       final @NonNull ConnectionProvider defaultConnProvider,
       final @Nullable ConnectionProvider effectiveConnProvider,
@@ -225,18 +222,11 @@ protected <T, E extends Exception> T executeWithSubscribedPlugins(
     }
 
     // noinspection unchecked
-    PluginChainJdbcCallable<T, E> pluginChainFunc =
-        FORCE_CONNECT_METHOD.equals(methodName)
-            ? this.pluginForceConnectChainFuncMap.get(methodName)
-            : this.pluginChainFuncMap.get(methodName);
+    PluginChainJdbcCallable<T, E> pluginChainFunc = this.pluginChainFuncMap.get(methodName);
 
     if (pluginChainFunc == null) {
       pluginChainFunc = this.makePluginChainFunc(methodName);
-      if (FORCE_CONNECT_METHOD.equals(methodName)) {
-        this.pluginForceConnectChainFuncMap.put(methodName, pluginChainFunc);
-      } else {
-        this.pluginChainFuncMap.put(methodName, pluginChainFunc);
-      }
+      this.pluginChainFuncMap.put(methodName, pluginChainFunc);
     }
 
     if (pluginChainFunc == null) {
@@ -269,11 +259,8 @@ protected <T, E extends Exception> PluginChainJdbcCallable<T, E> makePluginChain
       final ConnectionPlugin plugin = this.plugins.get(i);
       final Set<String> pluginSubscribedMethods = plugin.getSubscribedMethods();
       final String pluginName = pluginNameByClass.getOrDefault(plugin.getClass(), plugin.getClass().getSimpleName());
-      final boolean isSubscribed =
-          (!FORCE_CONNECT_METHOD.equals(methodName)
-              || (plugin instanceof AuthenticationConnectionPlugin)
-              || (plugin instanceof DefaultConnectionPlugin))
-          && (pluginSubscribedMethods.contains(ALL_METHODS) || pluginSubscribedMethods.contains(methodName));
+      final boolean isSubscribed = pluginSubscribedMethods.contains(ALL_METHODS)
+          || pluginSubscribedMethods.contains(methodName);
 
       if (isSubscribed) {
         if (pluginChainFunc == null) {
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/AwsSecretsManagerConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/AwsSecretsManagerConnectionPlugin.java
@@ -40,7 +40,6 @@
 import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
 import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
 import software.amazon.awssdk.services.secretsmanager.model.SecretsManagerException;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.AwsWrapperProperty;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.JdbcCallable;
@@ -56,8 +55,7 @@
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
 import software.amazon.jdbc.util.telemetry.TelemetryTraceLevel;
 
-public class AwsSecretsManagerConnectionPlugin extends AbstractConnectionPlugin
-    implements AuthenticationConnectionPlugin {
+public class AwsSecretsManagerConnectionPlugin extends AbstractConnectionPlugin {
   private static final Logger LOGGER = Logger.getLogger(AwsSecretsManagerConnectionPlugin.class.getName());
   private static final String TELEMETRY_UPDATE_SECRETS = "fetch credentials";
   private static final String TELEMETRY_FETCH_CREDENTIALS_COUNTER = "secretsManager.fetchCredentials.count";
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/ConnectTimeConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/ConnectTimeConnectionPlugin.java
@@ -24,13 +24,11 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Logger;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.JdbcCallable;
 import software.amazon.jdbc.util.Messages;
 
-public class ConnectTimeConnectionPlugin extends AbstractConnectionPlugin
-    implements AuthenticationConnectionPlugin {
+public class ConnectTimeConnectionPlugin extends AbstractConnectionPlugin {
 
   private static final Set<String> subscribedMethods =
       Collections.unmodifiableSet(new HashSet<>(Arrays.asList("connect", "forceConnect")));
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/DefaultConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/DefaultConnectionPlugin.java
@@ -31,7 +31,6 @@
 import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionProvider;
 import software.amazon.jdbc.ConnectionProviderManager;
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/dev/DeveloperConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/dev/DeveloperConnectionPlugin.java
@@ -24,15 +24,13 @@
 import java.util.Set;
 import java.util.logging.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.JdbcCallable;
 import software.amazon.jdbc.plugin.AbstractConnectionPlugin;
 import software.amazon.jdbc.util.StringUtils;
 import software.amazon.jdbc.util.WrapperUtils;
 
-public class DeveloperConnectionPlugin extends AbstractConnectionPlugin
-    implements AuthenticationConnectionPlugin, ExceptionSimulator {
+public class DeveloperConnectionPlugin extends AbstractConnectionPlugin implements ExceptionSimulator {
 
   private static final Logger LOGGER =
       Logger.getLogger(DeveloperConnectionPlugin.class.getName());
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/federatedauth/FederatedAuthPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/federatedauth/FederatedAuthPlugin.java
@@ -24,13 +24,11 @@
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.AwsWrapperProperty;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.JdbcCallable;
@@ -48,7 +46,7 @@
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
 import software.amazon.jdbc.util.telemetry.TelemetryGauge;
 
-public class FederatedAuthPlugin extends AbstractConnectionPlugin implements AuthenticationConnectionPlugin {
+public class FederatedAuthPlugin extends AbstractConnectionPlugin {
 
   private final CredentialsProviderFactory credentialsProviderFactory;
   private static final int DEFAULT_TOKEN_EXPIRATION_SEC = 15 * 60 - 30;
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/federatedauth/OktaAuthPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/federatedauth/OktaAuthPlugin.java
@@ -24,11 +24,9 @@
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.AwsWrapperProperty;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.JdbcCallable;
@@ -46,7 +44,7 @@
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
 import software.amazon.jdbc.util.telemetry.TelemetryGauge;
 
-public class OktaAuthPlugin extends AbstractConnectionPlugin implements AuthenticationConnectionPlugin {
+public class OktaAuthPlugin extends AbstractConnectionPlugin {
 
   private final CredentialsProviderFactory credentialsProviderFactory;
   private static final int DEFAULT_TOKEN_EXPIRATION_SEC = 15 * 60 - 30;
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/iam/IamAuthConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/iam/IamAuthConnectionPlugin.java
@@ -24,11 +24,9 @@
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.AwsWrapperProperty;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.JdbcCallable;
@@ -46,7 +44,7 @@
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
 import software.amazon.jdbc.util.telemetry.TelemetryGauge;
 
-public class IamAuthConnectionPlugin extends AbstractConnectionPlugin implements AuthenticationConnectionPlugin {
+public class IamAuthConnectionPlugin extends AbstractConnectionPlugin {
 
   private static final Logger LOGGER = Logger.getLogger(IamAuthConnectionPlugin.class.getName());
   private static final Set<String> subscribedMethods =
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/FastestResponseStrategyPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/FastestResponseStrategyPlugin.java
@@ -120,22 +120,6 @@ public Connection connect(
     return conn;
   }
 
-  @Override
-  public Connection forceConnect(
-      final String driverProtocol,
-      final HostSpec hostSpec,
-      final Properties props,
-      final boolean isInitialConnection,
-      final JdbcCallable<Connection, SQLException> forceConnectFunc)
-      throws SQLException {
-
-    Connection conn = forceConnectFunc.call();
-    if (isInitialConnection) {
-      this.hostResponseTimeService.setHosts(this.pluginService.getHosts());
-    }
-    return conn;
-  }
-
   @Override
   public boolean acceptsStrategy(HostRole role, String strategy) {
     return FASTEST_RESPONSE_STRATEGY_NAME.equalsIgnoreCase(strategy);
diff --git a/wrapper/src/test/java/software/amazon/jdbc/ConnectionPluginManagerTests.java b/wrapper/src/test/java/software/amazon/jdbc/ConnectionPluginManagerTests.java
@@ -304,9 +304,11 @@ public void testForceConnect() throws Exception {
 
     // Expecting only TestPluginThree to participate in forceConnect().
     assertEquals(expectedConnection, conn);
-    assertEquals(2, calls.size());
-    assertEquals("TestPluginThree:before forceConnect", calls.get(0));
-    assertEquals("TestPluginThree:forced connection", calls.get(1));
+    assertEquals(4, calls.size());
+    assertEquals("TestPluginOne:before forceConnect", calls.get(0));
+    assertEquals("TestPluginThree:before forceConnect", calls.get(1));
+    assertEquals("TestPluginThree:forced connection", calls.get(2));
+    assertEquals("TestPluginOne:after forceConnect", calls.get(3));
   }
 
   @Test
@@ -527,9 +529,11 @@ public void testForceConnectCachedJdbcCallForceConnect() throws Exception {
     // The method has been called just once to generate a final lambda and cache it.
     verify(target, times(1)).makePluginChainFunc(eq("forceConnect"));
 
-    assertEquals(2, calls.size());
-    assertEquals("TestPluginThree:before forceConnect", calls.get(0));
-    assertEquals("TestPluginThree:forced connection", calls.get(1));
+    assertEquals(4, calls.size());
+    assertEquals("TestPluginOne:before forceConnect", calls.get(0));
+    assertEquals("TestPluginThree:before forceConnect", calls.get(1));
+    assertEquals("TestPluginThree:forced connection", calls.get(2));
+    assertEquals("TestPluginOne:after forceConnect", calls.get(3));
 
     calls.clear();
 
@@ -545,9 +549,11 @@ public void testForceConnectCachedJdbcCallForceConnect() throws Exception {
     // No additional calls to this method occurred. It's still been called once.
     verify(target, times(1)).makePluginChainFunc(eq("forceConnect"));
 
-    assertEquals(2, calls.size());
-    assertEquals("TestPluginThree:before forceConnect", calls.get(0));
-    assertEquals("TestPluginThree:forced connection", calls.get(1));
+    assertEquals(4, calls.size());
+    assertEquals("TestPluginOne:before forceConnect", calls.get(0));
+    assertEquals("TestPluginThree:before forceConnect", calls.get(1));
+    assertEquals("TestPluginThree:forced connection", calls.get(2));
+    assertEquals("TestPluginOne:after forceConnect", calls.get(3));
   }
 
   @Test
diff --git a/wrapper/src/test/java/software/amazon/jdbc/mock/TestPluginThree.java b/wrapper/src/test/java/software/amazon/jdbc/mock/TestPluginThree.java
@@ -22,11 +22,10 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Properties;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.JdbcCallable;
 
-public class TestPluginThree extends TestPluginOne implements AuthenticationConnectionPlugin {
+public class TestPluginThree extends TestPluginOne {
 
   private Connection connection;
 
diff --git a/wrapper/src/test/java/software/amazon/jdbc/mock/TestPluginTwo.java b/wrapper/src/test/java/software/amazon/jdbc/mock/TestPluginTwo.java
@@ -19,9 +19,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import software.amazon.jdbc.AuthenticationConnectionPlugin;
 
-public class TestPluginTwo extends TestPluginOne implements AuthenticationConnectionPlugin {
+public class TestPluginTwo extends TestPluginOne {
 
   public TestPluginTwo(ArrayList<String> calls) {
     super();
