refactor: use the ServicesContainer PluginFactory method by default

benchmarks/src/jmh/java/software/amazon/jdbc/benchmarks/ConnectionPluginManagerBenchmarks.java

@@ -51,21 +51,21 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import software.amazon.jdbc.ConnectionInfo;
-import software.amazon.jdbc.ConnectionPluginFactory;
 import software.amazon.jdbc.ConnectionPluginManager;
 import software.amazon.jdbc.ConnectionProvider;
-import software.amazon.jdbc.hostlistprovider.HostListProviderService;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.HostSpecBuilder;
 import software.amazon.jdbc.JdbcMethod;
 import software.amazon.jdbc.NodeChangeOptions;
 import software.amazon.jdbc.OldConnectionSuggestedAction;
+import software.amazon.jdbc.ConnectionPluginFactory;
 import software.amazon.jdbc.PluginManagerService;
 import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.PropertyDefinition;
 import software.amazon.jdbc.benchmarks.testplugin.BenchmarkPluginFactory;
 import software.amazon.jdbc.dialect.Dialect;
 import software.amazon.jdbc.hostavailability.SimpleHostAvailabilityStrategy;
+import software.amazon.jdbc.hostlistprovider.HostListProviderService;
 import software.amazon.jdbc.profile.ConfigurationProfile;
 import software.amazon.jdbc.profile.ConfigurationProfileBuilder;
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;

benchmarks/src/jmh/java/software/amazon/jdbc/benchmarks/testplugin/BenchmarkPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class BenchmarkPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(PluginService pluginService, Properties props) {
+  public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {
     return new BenchmarkPlugin();
   }
 }

wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginChainBuilder.java

@@ -220,12 +220,7 @@ public List<ConnectionPlugin> getPlugins(
       // make a chain of connection plugins
       plugins = new ArrayList<>(pluginFactories.size() + 1);
       for (final ConnectionPluginFactory factory : pluginFactories) {
-        if (factory instanceof ServicesContainerPluginFactory) {
-          ServicesContainerPluginFactory servicesContainerPluginFactory = (ServicesContainerPluginFactory) factory;
-          plugins.add(servicesContainerPluginFactory.getInstance(servicesContainer, props));
-        } else {
-          plugins.add(factory.getInstance(servicesContainer.getPluginService(), props));
-        }
+        plugins.add(factory.getInstance(servicesContainer, props));
       }
     } else {
       plugins = new ArrayList<>(1); // one spot for default connection plugin

wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginFactory.java

@@ -20,13 +20,16 @@
 import software.amazon.jdbc.util.FullServicesContainer;
 
 /**
- * Interface for connection plugin factories. This class implements ways to initialize a connection
- * plugin.
- *
- * <p>Note: consider using {@link ServicesContainerPluginFactory} for new implementations as it provides access to all
- * services in the {@link FullServicesContainer}.
+ * Interface for plugin factories. This class implements ways to initialize a plugin.
  */
 public interface ConnectionPluginFactory {
 
-  ConnectionPlugin getInstance(PluginService pluginService, Properties props);
+  /**
+   * Get an instance of a {@link ConnectionPlugin}.
+   *
+   * @param servicesContainer the service container containing the services to be used by the {@link ConnectionPlugin}.
+   * @param props             to be used by the {@link ConnectionPlugin}.
+   * @return an instance of a {@link ConnectionPlugin}.
+   */
+  ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props);
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/AuroraConnectionTrackerPluginFactory.java

@@ -19,11 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class AuroraConnectionTrackerPluginFactory implements ConnectionPluginFactory {
+
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    return new AuroraConnectionTrackerPlugin(pluginService, props);
+  public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {
+    return new AuroraConnectionTrackerPlugin(servicesContainer.getPluginService(), props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/AuroraInitialConnectionStrategyPluginFactory.java

@@ -19,11 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class AuroraInitialConnectionStrategyPluginFactory implements ConnectionPluginFactory {
+
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    return new AuroraInitialConnectionStrategyPlugin(pluginService, props);
+  public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {
+    return new AuroraInitialConnectionStrategyPlugin(servicesContainer.getPluginService(), props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/AwsSecretsManagerConnectionPluginFactory.java

@@ -19,11 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class AwsSecretsManagerConnectionPluginFactory implements ConnectionPluginFactory {
+
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    return new AwsSecretsManagerConnectionPlugin(pluginService, props);
+  public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {
+    return new AwsSecretsManagerConnectionPlugin(servicesContainer.getPluginService(), props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/ConnectTimeConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class ConnectTimeConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(PluginService pluginService, Properties props) {
+  public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {
     return new ConnectTimeConnectionPlugin();
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/DataCacheConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class DataCacheConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    return new DataCacheConnectionPlugin(pluginService, props);
+  public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {
+    return new DataCacheConnectionPlugin(servicesContainer.getPluginService(), props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/DriverMetaDataConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class DriverMetaDataConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(PluginService pluginService, Properties props) {
+  public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {
     return new DriverMetaDataConnectionPlugin(props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/ExecutionTimeConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class ExecutionTimeConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
+  public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {
     return new ExecutionTimeConnectionPlugin();
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/LogQueryConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class LogQueryConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
+  public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {
     return new LogQueryConnectionPlugin(props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/bluegreen/BlueGreenConnectionPluginFactory.java

@@ -18,18 +18,10 @@
 
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
-import software.amazon.jdbc.PluginService;
-import software.amazon.jdbc.ServicesContainerPluginFactory;
+import software.amazon.jdbc.ConnectionPluginFactory;
 import software.amazon.jdbc.util.FullServicesContainer;
-import software.amazon.jdbc.util.Messages;
 
-public class BlueGreenConnectionPluginFactory implements ServicesContainerPluginFactory {
-  @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    throw new UnsupportedOperationException(
-        Messages.get(
-            "ServicesContainerPluginFactory.servicesContainerRequired", new Object[] {"BlueGreenConnectionPlugin"}));
-  }
+public class BlueGreenConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
   public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {

wrapper/src/main/java/software/amazon/jdbc/plugin/customendpoint/CustomEndpointPluginFactory.java

@@ -19,18 +19,11 @@
 
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
-import software.amazon.jdbc.PluginService;
-import software.amazon.jdbc.ServicesContainerPluginFactory;
+import software.amazon.jdbc.ConnectionPluginFactory;
 import software.amazon.jdbc.util.FullServicesContainer;
 import software.amazon.jdbc.util.Messages;
 
-public class CustomEndpointPluginFactory implements ServicesContainerPluginFactory {
-  @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    throw new UnsupportedOperationException(
-        Messages.get(
-            "ServicesContainerPluginFactory.servicesContainerRequired", new Object[] {"CustomEndpointPlugin"}));
-  }
+public class CustomEndpointPluginFactory implements ConnectionPluginFactory {
 
   @Override
   public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {

wrapper/src/main/java/software/amazon/jdbc/plugin/dev/DeveloperConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class DeveloperConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(PluginService pluginService, Properties props) {
+  public ConnectionPlugin getInstance(FullServicesContainer fullServicesContainer, Properties props) {
     return new DeveloperConnectionPlugin();
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/efm/HostMonitoringConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
-/** Class initializing a {@link HostMonitoringConnectionPlugin}. */
 public class HostMonitoringConnectionPluginFactory implements ConnectionPluginFactory {
+
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    return new HostMonitoringConnectionPlugin(pluginService, props);
+  public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {
+    return new HostMonitoringConnectionPlugin(servicesContainer.getPluginService(), props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/efm2/HostMonitoringConnectionPluginFactory.java

@@ -18,20 +18,11 @@
 
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
-import software.amazon.jdbc.PluginService;
-import software.amazon.jdbc.ServicesContainerPluginFactory;
+import software.amazon.jdbc.ConnectionPluginFactory;
 import software.amazon.jdbc.util.FullServicesContainer;
-import software.amazon.jdbc.util.Messages;
 
 /** Class initializing a {@link HostMonitoringConnectionPlugin}. */
-public class HostMonitoringConnectionPluginFactory implements ServicesContainerPluginFactory {
-  @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    throw new UnsupportedOperationException(
-        Messages.get(
-            "ServiceContainerPluginFactory.serviceContainerRequired",
-            new Object[] {"efm2.HostMonitoringConnectionPlugin"}));
-  }
+public class HostMonitoringConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
   public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {

wrapper/src/main/java/software/amazon/jdbc/plugin/failover/FailoverConnectionPluginFactory.java

@@ -18,18 +18,10 @@
 
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
-import software.amazon.jdbc.PluginService;
-import software.amazon.jdbc.ServicesContainerPluginFactory;
+import software.amazon.jdbc.ConnectionPluginFactory;
 import software.amazon.jdbc.util.FullServicesContainer;
-import software.amazon.jdbc.util.Messages;
 
-public class FailoverConnectionPluginFactory implements ServicesContainerPluginFactory {
-  @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    throw new UnsupportedOperationException(
-        Messages.get(
-            "ServicesContainerPluginFactory.servicesContainerRequired", new Object[] {"FailoverConnectionPlugin"}));
-  }
+public class FailoverConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
   public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {

wrapper/src/main/java/software/amazon/jdbc/plugin/failover2/FailoverConnectionPluginFactory.java

@@ -19,12 +19,12 @@
 import java.util.Properties;
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
-import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 
 public class FailoverConnectionPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
-    return new FailoverConnectionPlugin(pluginService, props);
+  public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {
+    return new FailoverConnectionPlugin(servicesContainer.getPluginService(), props);
   }
 }

wrapper/src/main/java/software/amazon/jdbc/plugin/federatedauth/FederatedAuthPluginFactory.java

@@ -21,13 +21,15 @@
 import software.amazon.jdbc.ConnectionPlugin;
 import software.amazon.jdbc.ConnectionPluginFactory;
 import software.amazon.jdbc.PluginService;
+import software.amazon.jdbc.util.FullServicesContainer;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.StringUtils;
 
 public class FederatedAuthPluginFactory implements ConnectionPluginFactory {
 
   @Override
-  public ConnectionPlugin getInstance(final PluginService pluginService, final Properties props) {
+  public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {
+    PluginService pluginService = servicesContainer.getPluginService();
     return new FederatedAuthPlugin(pluginService, getCredentialsProviderFactory(pluginService, props));
   }