refactor: replace ConnectionService with ServiceUtility

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

@@ -63,7 +63,6 @@
 import software.amazon.jdbc.dialect.Dialect;
 import software.amazon.jdbc.hostavailability.SimpleHostAvailabilityStrategy;
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
-import software.amazon.jdbc.util.connection.ConnectionService;
 import software.amazon.jdbc.util.monitoring.MonitorService;
 import software.amazon.jdbc.util.storage.StorageService;
 import software.amazon.jdbc.util.telemetry.GaugeCallable;
@@ -94,7 +93,6 @@ public class PluginBenchmarks {
 
   @Mock private StorageService mockStorageService;
   @Mock private MonitorService mockMonitorService;
-  @Mock private ConnectionService mockConnectionService;
   @Mock private PluginService mockPluginService;
   @Mock private TargetDriverDialect mockTargetDriverDialect;
   @Mock private Dialect mockDialect;
@@ -183,8 +181,7 @@ private ConnectionWrapper getConnectionWrapper(Properties props, String connStri
         mockHostListProviderService,
         mockPluginManagerService,
         mockStorageService,
-        mockMonitorService,
-        mockConnectionService);
+        mockMonitorService);
   }
 
   @Benchmark

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

@@ -25,7 +25,6 @@
 import software.amazon.jdbc.PluginManagerService;
 import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
-import software.amazon.jdbc.util.connection.ConnectionService;
 import software.amazon.jdbc.util.monitoring.MonitorService;
 import software.amazon.jdbc.util.storage.StorageService;
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
@@ -45,8 +44,7 @@ public TestConnectionWrapper(
       @NonNull final HostListProviderService hostListProviderService,
       @NonNull final PluginManagerService pluginManagerService,
       @NonNull final StorageService storageService,
-      @NonNull final MonitorService monitorService,
-      @NonNull final ConnectionService connectionService)
+      @NonNull final MonitorService monitorService)
       throws SQLException {
     super(
         props,
@@ -58,6 +56,7 @@ public TestConnectionWrapper(
         pluginService,
         hostListProviderService,
         pluginManagerService,
-        storageService, monitorService, connectionService);
+        storageService,
+        monitorService);
   }
 }

examples/AWSDriverExample/src/main/java/software/amazon/ReadWriteSplittingPostgresExample.java

@@ -23,8 +23,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
-import software.amazon.jdbc.ConnectionProviderManager;
-import software.amazon.jdbc.HikariPooledConnectionProvider;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.PropertyDefinition;
 import software.amazon.jdbc.plugin.failover.FailoverFailedSQLException;

examples/AWSDriverExample/src/main/java/software/amazon/ReadWriteSplittingSpringJdbcTemplateMySQLExample.java

@@ -16,7 +16,6 @@
 
 package software.amazon;
 
-import com.mysql.cj.jdbc.MysqlDataSource;
 import com.zaxxer.hikari.HikariDataSource;
 import java.sql.Connection;
 import java.sql.SQLException;

examples/HikariExample/src/main/java/software/amazon/HikariExample.java

@@ -22,7 +22,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Properties;
 
 public class HikariExample {
 

examples/SpringHibernateBalancedReaderTwoDataSourceExample/src/main/java/example/spring/Config.java

@@ -16,10 +16,7 @@
 
 package example.spring;
 
-import com.zaxxer.hikari.HikariConfig;
-import java.util.Arrays;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import org.hibernate.exception.JDBCConnectionException;
@@ -40,10 +37,6 @@
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import software.amazon.jdbc.HikariPooledConnectionProvider;
-import software.amazon.jdbc.HostSpec;
-import software.amazon.jdbc.profile.ConfigurationProfileBuilder;
-import software.amazon.jdbc.profile.ConfigurationProfilePresetCodes;
 
 @Configuration
 @EnableTransactionManagement

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

@@ -148,8 +148,7 @@ public List<ConnectionPlugin> getPlugins(
       final ConnectionProvider effectiveConnProvider,
       final PluginManagerService pluginManagerService,
       final Properties props,
-      @Nullable ConfigurationProfile configurationProfile)
-      throws SQLException {
+      @Nullable ConfigurationProfile configurationProfile) throws SQLException {
 
     List<ConnectionPlugin> plugins;
     List<ConnectionPluginFactory> pluginFactories;

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

@@ -29,7 +29,6 @@
 import java.util.logging.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jetbrains.annotations.NotNull;
 import software.amazon.jdbc.cleanup.CanReleaseResources;
 import software.amazon.jdbc.plugin.AuroraConnectionTrackerPlugin;
 import software.amazon.jdbc.plugin.AuroraInitialConnectionStrategyPlugin;
@@ -180,8 +179,7 @@ public void init(
       final FullServicesContainer servicesContainer,
       final Properties props,
       final PluginManagerService pluginManagerService,
-      @Nullable ConfigurationProfile configurationProfile)
-      throws SQLException {
+      @Nullable ConfigurationProfile configurationProfile) throws SQLException {
 
     this.props = props;
     this.servicesContainer = servicesContainer;

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

@@ -239,8 +239,8 @@ public Connection connect(final String url, final Properties info) throws SQLExc
         effectiveConnectionProvider = configurationProfile.getConnectionProvider();
       }
 
-      FullServicesContainer
-          servicesContainer = new FullServicesContainerImpl(storageService, monitorService, telemetryFactory);
+      FullServicesContainer servicesContainer =
+          new FullServicesContainerImpl(storageService, monitorService, defaultConnectionProvider, telemetryFactory);
 
       return new ConnectionWrapper(
           servicesContainer,

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

@@ -17,7 +17,6 @@
 package software.amazon.jdbc;
 
 import java.sql.Timestamp;
-import java.time.Instant;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import software.amazon.jdbc.hostavailability.HostAvailability;
 import software.amazon.jdbc.hostavailability.HostAvailabilityStrategy;

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

@@ -510,8 +510,7 @@ public Connection forceConnect(
       final HostSpec hostSpec,
       final Properties props)
       throws SQLException {
-    throw new UnsupportedOperationException(
-        Messages.get("PartialPluginService.unexpectedMethodCall", new Object[] {"forceConnect"}));
+    return this.forceConnect(hostSpec, props, null);
   }
 
   @Override
@@ -520,8 +519,8 @@ public Connection forceConnect(
       final Properties props,
       final @Nullable ConnectionPlugin pluginToSkip)
       throws SQLException {
-    throw new UnsupportedOperationException(
-        Messages.get("PartialPluginService.unexpectedMethodCall", new Object[] {"forceConnect"}));
+    return this.pluginManager.forceConnect(
+        this.driverProtocol, hostSpec, props, true, pluginToSkip);
   }
 
   private void updateHostAvailability(final List<HostSpec> hosts) {

wrapper/src/main/java/software/amazon/jdbc/authentication/AwsCredentialsManager.java

@@ -23,7 +23,6 @@
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.PropertyDefinition;
-import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.StringUtils;
 
 public class AwsCredentialsManager {

wrapper/src/main/java/software/amazon/jdbc/ds/AwsWrapperDataSource.java

@@ -281,8 +281,8 @@ ConnectionWrapper createConnectionWrapper(
       final @NonNull TargetDriverDialect targetDriverDialect,
       final @Nullable ConfigurationProfile configurationProfile,
       final TelemetryFactory telemetryFactory) throws SQLException {
-    FullServicesContainer
-        servicesContainer = new FullServicesContainerImpl(storageService, monitorService, telemetryFactory);
+    FullServicesContainer servicesContainer =
+        new FullServicesContainerImpl(storageService, monitorService, defaultProvider, telemetryFactory);
     return new ConnectionWrapper(
         servicesContainer,
         props,

wrapper/src/main/java/software/amazon/jdbc/hostavailability/HostAvailabilityStrategy.java

@@ -16,8 +16,6 @@
 
 package software.amazon.jdbc.hostavailability;
 
-import software.amazon.jdbc.AwsWrapperProperty;
-
 public interface HostAvailabilityStrategy {
 
   void setHostAvailability(HostAvailability hostAvailability);