Rename ServicesContainer to ServiceContainer

Author: aaron-congo

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

@@ -68,7 +68,7 @@
 import software.amazon.jdbc.profile.ConfigurationProfile;
 import software.amazon.jdbc.profile.ConfigurationProfileBuilder;
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
-import software.amazon.jdbc.util.FullServicesContainer;
+import software.amazon.jdbc.util.ServiceContainer;
 import software.amazon.jdbc.util.telemetry.DefaultTelemetryFactory;
 import software.amazon.jdbc.util.telemetry.GaugeCallable;
 import software.amazon.jdbc.util.telemetry.TelemetryContext;
@@ -95,7 +95,7 @@ public class ConnectionPluginManagerBenchmarks {
 
   @Mock ConnectionProvider mockConnectionProvider;
   @Mock ConnectionWrapper mockConnectionWrapper;
-  @Mock FullServicesContainer mockServicesContainer;
+  @Mock ServiceContainer mockServiceContainer;
   @Mock PluginService mockPluginService;
   @Mock PluginManagerService mockPluginManagerService;
   @Mock TelemetryFactory mockTelemetryFactory;
@@ -140,7 +140,7 @@ public void setUpIteration() throws Exception {
     when(mockResultSet.getString(eq(FIELD_SESSION_ID))).thenReturn(WRITER_SESSION_ID);
     when(mockResultSet.getString(eq(FIELD_SERVER_ID)))
         .thenReturn("myInstance1.domain.com", "myInstance2.domain.com", "myInstance3.domain.com");
-    when(mockServicesContainer.getPluginService()).thenReturn(mockPluginService);
+    when(mockServiceContainer.getPluginService()).thenReturn(mockPluginService);
     when(mockPluginService.getCurrentConnection()).thenReturn(mockConnection);
     when(mockPluginService.getTelemetryFactory()).thenReturn(mockTelemetryFactory);
 
@@ -166,11 +166,11 @@ public void setUpIteration() throws Exception {
         null,
         mockConnectionWrapper,
         telemetryFactory);
-    pluginManager.init(mockServicesContainer, propertiesWithPlugins, mockPluginManagerService, configurationProfile);
+    pluginManager.init(mockServiceContainer, propertiesWithPlugins, mockPluginManagerService, configurationProfile);
 
     pluginManagerWithNoPlugins = new ConnectionPluginManager(mockConnectionProvider, null,
         mockConnectionWrapper, telemetryFactory);
-    pluginManagerWithNoPlugins.init(mockServicesContainer, propertiesWithoutPlugins, mockPluginManagerService, null);
+    pluginManagerWithNoPlugins.init(mockServiceContainer, propertiesWithoutPlugins, mockPluginManagerService, null);
   }
 
   @TearDown(Level.Iteration)
@@ -182,15 +182,15 @@ public void tearDownIteration() throws Exception {
   public ConnectionPluginManager initConnectionPluginManagerWithNoPlugins() throws SQLException {
     final ConnectionPluginManager manager = new ConnectionPluginManager(mockConnectionProvider, null,
         mockConnectionWrapper, mockTelemetryFactory);
-    manager.init(mockServicesContainer, propertiesWithoutPlugins, mockPluginManagerService, configurationProfile);
+    manager.init(mockServiceContainer, propertiesWithoutPlugins, mockPluginManagerService, configurationProfile);
     return manager;
   }
 
   @Benchmark
   public ConnectionPluginManager initConnectionPluginManagerWithPlugins() throws SQLException {
     final ConnectionPluginManager manager = new ConnectionPluginManager(mockConnectionProvider, null,
         mockConnectionWrapper, mockTelemetryFactory);
-    manager.init(mockServicesContainer, propertiesWithPlugins, mockPluginManagerService, configurationProfile);
+    manager.init(mockServiceContainer, propertiesWithPlugins, mockPluginManagerService, configurationProfile);
     return manager;
   }
 

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

@@ -51,7 +51,7 @@
 import software.amazon.jdbc.plugin.staledns.AuroraStaleDnsPluginFactory;
 import software.amazon.jdbc.plugin.strategy.fastestresponse.FastestResponseStrategyPluginFactory;
 import software.amazon.jdbc.profile.ConfigurationProfile;
-import software.amazon.jdbc.util.FullServicesContainer;
+import software.amazon.jdbc.util.ServiceContainer;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.SqlState;
 import software.amazon.jdbc.util.StringUtils;
@@ -143,7 +143,7 @@ public PluginFactoryInfo(final ConnectionPluginFactory factory, final int weight
   }
 
   public List<ConnectionPlugin> getPlugins(
-      final FullServicesContainer servicesContainer,
+      final ServiceContainer serviceContainer,
       final ConnectionProvider defaultConnProvider,
       final ConnectionProvider effectiveConnProvider,
       final PluginManagerService pluginManagerService,
@@ -218,11 +218,11 @@ 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));
+        if (factory instanceof ServiceContainerPluginFactory) {
+          ServiceContainerPluginFactory serviceContainerPluginFactory = (ServiceContainerPluginFactory) factory;
+          plugins.add(serviceContainerPluginFactory.getInstance(serviceContainer, props));
         } else {
-          plugins.add(factory.getInstance(servicesContainer.getPluginService(), props));
+          plugins.add(factory.getInstance(serviceContainer.getPluginService(), props));
         }
       }
     } else {
@@ -231,7 +231,7 @@ public List<ConnectionPlugin> getPlugins(
 
     // add default connection plugin to the tail
     final ConnectionPlugin defaultPlugin = new DefaultConnectionPlugin(
-        servicesContainer.getPluginService(),
+        serviceContainer.getPluginService(),
         defaultConnProvider,
         effectiveConnProvider,
         pluginManagerService);

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

@@ -17,14 +17,14 @@
 package software.amazon.jdbc;
 
 import java.util.Properties;
-import software.amazon.jdbc.util.FullServicesContainer;
+import software.amazon.jdbc.util.ServiceContainer;
 
 /**
  * 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}.
+ * <p>Note: consider using {@link ServiceContainerPluginFactory} for new implementations as it provides access to all
+ * services in the {@link ServiceContainer}.
  */
 public interface ConnectionPluginFactory {
 

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

@@ -48,7 +48,7 @@
 import software.amazon.jdbc.plugin.staledns.AuroraStaleDnsPlugin;
 import software.amazon.jdbc.plugin.strategy.fastestresponse.FastestResponseStrategyPlugin;
 import software.amazon.jdbc.profile.ConfigurationProfile;
-import software.amazon.jdbc.util.FullServicesContainer;
+import software.amazon.jdbc.util.ServiceContainer;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.Utils;
 import software.amazon.jdbc.util.WrapperUtils;
@@ -99,7 +99,7 @@ public class ConnectionPluginManager implements CanReleaseResources, Wrapper {
   protected final @NonNull ConnectionProvider defaultConnProvider;
   protected final @Nullable ConnectionProvider effectiveConnProvider;
   protected final ConnectionWrapper connectionWrapper;
-  protected FullServicesContainer servicesContainer;
+  protected ServiceContainer serviceContainer;
   protected PluginService pluginService;
   protected TelemetryFactory telemetryFactory;
   protected boolean isTelemetryInUse;
@@ -169,27 +169,27 @@ public void unlock() {
    * <p>The {@link DefaultConnectionPlugin} will always be initialized and attached as the last
    * connection plugin in the chain.
    *
-   * @param servicesContainer     the service container for the services required by this class.
+   * @param serviceContainer     the service container for the services required by this class.
    * @param props                the configuration of the connection
    * @param pluginManagerService a reference to a plugin manager service
    * @param configurationProfile a profile configuration defined by the user
    * @throws SQLException if errors occurred during the execution
    */
   public void init(
-      final FullServicesContainer servicesContainer,
+      final ServiceContainer serviceContainer,
       final Properties props,
       final PluginManagerService pluginManagerService,
       @Nullable ConfigurationProfile configurationProfile) throws SQLException {
 
     this.props = props;
-    this.servicesContainer = servicesContainer;
-    this.pluginService = servicesContainer.getPluginService();
-    this.telemetryFactory = servicesContainer.getTelemetryFactory();
+    this.serviceContainer = serviceContainer;
+    this.pluginService = serviceContainer.getPluginService();
+    this.telemetryFactory = serviceContainer.getTelemetryFactory();
     this.isTelemetryInUse = telemetryFactory.inUse();
 
     ConnectionPluginChainBuilder pluginChainBuilder = new ConnectionPluginChainBuilder();
     this.plugins = pluginChainBuilder.getPlugins(
-        this.servicesContainer,
+        this.serviceContainer,
         this.defaultConnProvider,
         this.effectiveConnProvider,
         pluginManagerService,

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

@@ -56,10 +56,10 @@
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialectManager;
 import software.amazon.jdbc.util.ConnectionUrlParser;
-import software.amazon.jdbc.util.CoreServicesContainer;
+import software.amazon.jdbc.util.CoreServiceContainer;
 import software.amazon.jdbc.util.DriverInfo;
-import software.amazon.jdbc.util.FullServicesContainer;
-import software.amazon.jdbc.util.FullServicesContainerImpl;
+import software.amazon.jdbc.util.ServiceContainer;
+import software.amazon.jdbc.util.StandardServiceContainer;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.PropertyUtils;
 import software.amazon.jdbc.util.RdsUtils;
@@ -112,12 +112,12 @@ public class Driver implements java.sql.Driver {
   private final MonitorService monitorService;
 
   public Driver() {
-    this(CoreServicesContainer.getInstance());
+    this(CoreServiceContainer.getInstance());
   }
 
-  public Driver(CoreServicesContainer coreServicesContainer) {
-    this.storageService = coreServicesContainer.getStorageService();
-    this.monitorService = coreServicesContainer.getMonitorService();
+  public Driver(CoreServiceContainer coreServiceContainer) {
+    this.storageService = coreServiceContainer.getStorageService();
+    this.monitorService = coreServiceContainer.getMonitorService();
   }
 
   public static void register() throws SQLException {
@@ -239,12 +239,12 @@ public Connection connect(final String url, final Properties info) throws SQLExc
         effectiveConnectionProvider = configurationProfile.getConnectionProvider();
       }
 
-      FullServicesContainer
-          servicesContainer = new FullServicesContainerImpl(
+      ServiceContainer
+          serviceContainer = new StandardServiceContainer(
               storageService, monitorService, defaultConnectionProvider, telemetryFactory);
 
       return new ConnectionWrapper(
-          servicesContainer,
+          serviceContainer,
           props,
           driverUrl,
           defaultConnectionProvider,
@@ -419,7 +419,7 @@ public static void resetConnectionInitFunc() {
   }
 
   public static void clearCaches() {
-    CoreServicesContainer.getInstance().getStorageService().clearAll();
+    CoreServiceContainer.getInstance().getStorageService().clearAll();
     RdsUtils.clearCache();
     RdsHostListProvider.clearAll();
     PluginServiceImpl.clearCache();
@@ -438,7 +438,7 @@ public static void clearCaches() {
   }
 
   public static void releaseResources() {
-    CoreServicesContainer.getInstance().getMonitorService().stopAndRemoveAll();
+    CoreServiceContainer.getInstance().getMonitorService().stopAndRemoveAll();
     HostMonitorThreadContainer.releaseInstance();
     ConnectionProviderManager.releaseResources();
     HikariPoolsHolder.closeAllPools();