[WIP] Implement refactoring changes

benchmarks/build.gradle.kts

@@ -22,8 +22,9 @@ dependencies {
     jmhImplementation(project(":aws-advanced-jdbc-wrapper"))
     implementation("org.postgresql:postgresql:42.7.5")
     implementation("com.mysql:mysql-connector-j:9.2.0")
-    implementation("org.mariadb.jdbc:mariadb-java-client:3.5.1")
+    implementation("org.mariadb.jdbc:mariadb-java-client:3.5.3")
     implementation("com.zaxxer:HikariCP:4.0.3")
+    implementation("org.checkerframework:checker-qual:3.49.2")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.1")
     testImplementation("org.mockito:mockito-inline:4.11.0") // 4.11.0 is the last version compatible with Java 8

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

@@ -62,6 +62,9 @@
 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;
 import software.amazon.jdbc.util.telemetry.TelemetryContext;
 import software.amazon.jdbc.util.telemetry.TelemetryCounter;
@@ -88,6 +91,9 @@ public class PluginBenchmarks {
   private final HostSpec writerHostSpec = new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
       .host(TEST_HOST).port(TEST_PORT).build();
 
+  @Mock private StorageService mockStorageService;
+  @Mock private MonitorService mockMonitorService;
+  @Mock private ConnectionService mockConnectionService;
   @Mock private PluginService mockPluginService;
   @Mock private Dialect mockDialect;
   @Mock private ConnectionPluginManager mockConnectionPluginManager;
@@ -164,7 +170,10 @@ public ConnectionWrapper initAndReleaseWithExecutionTimePlugin() throws SQLExcep
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -179,7 +188,10 @@ public ConnectionWrapper initAndReleaseWithAuroraHostListPlugin() throws SQLExce
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -194,7 +206,10 @@ public ConnectionWrapper initAndReleaseWithExecutionTimeAndAuroraHostListPlugins
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -209,7 +224,10 @@ public ConnectionWrapper initAndReleaseWithReadWriteSplittingPlugin() throws SQL
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -225,7 +243,10 @@ public ConnectionWrapper initAndReleaseWithAuroraHostListAndReadWriteSplittingPl
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService)) {
       wrapper.releaseResources();
       return wrapper;
     }
@@ -243,7 +264,10 @@ public ConnectionWrapper initAndReleaseWithReadWriteSplittingPlugin_internalConn
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService)) {
       wrapper.releaseResources();
       ConnectionProviderManager.releaseResources();
       Driver.resetCustomConnectionProvider();
@@ -264,7 +288,10 @@ public ConnectionWrapper initAndReleaseWithAuroraHostListAndReadWriteSplittingPl
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService)) {
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService)) {
       wrapper.releaseResources();
       ConnectionProviderManager.releaseResources();
       Driver.resetCustomConnectionProvider();
@@ -281,7 +308,10 @@ public Statement executeStatementBaseline() throws SQLException {
         mockTelemetryFactory,
         mockPluginService,
         mockHostListProviderService,
-        mockPluginManagerService);
+        mockPluginManagerService,
+        mockStorageService,
+        mockMonitorService,
+        mockConnectionService);
          Statement statement = wrapper.createStatement()) {
       return statement;
     }
@@ -297,7 +327,10 @@ public ResultSet executeStatementWithExecutionTimePlugin() throws SQLException {
             mockTelemetryFactory,
             mockPluginService,
             mockHostListProviderService,
-            mockPluginManagerService);
+            mockPluginManagerService,
+            mockStorageService,
+            mockMonitorService,
+        mockConnectionService);
         Statement statement = wrapper.createStatement();
         ResultSet resultSet = statement.executeQuery("some sql")) {
       return resultSet;
@@ -314,7 +347,10 @@ public ResultSet executeStatementWithTelemetryDisabled() throws SQLException {
             mockTelemetryFactory,
             mockPluginService,
             mockHostListProviderService,
-            mockPluginManagerService);
+            mockPluginManagerService,
+            mockStorageService,
+            mockMonitorService,
+        mockConnectionService);
         Statement statement = wrapper.createStatement();
         ResultSet resultSet = statement.executeQuery("some sql")) {
       return resultSet;
@@ -331,7 +367,10 @@ public ResultSet executeStatementWithTelemetry() throws SQLException {
             mockTelemetryFactory,
             mockPluginService,
             mockHostListProviderService,
-            mockPluginManagerService);
+            mockPluginManagerService,
+            mockStorageService,
+            mockMonitorService,
+        mockConnectionService);
         Statement statement = wrapper.createStatement();
         ResultSet resultSet = statement.executeQuery("some sql")) {
       return resultSet;

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

@@ -23,21 +23,28 @@
 import software.amazon.jdbc.HostListProviderService;
 import software.amazon.jdbc.PluginManagerService;
 import software.amazon.jdbc.PluginService;
+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;
 import software.amazon.jdbc.wrapper.ConnectionWrapper;
 
 // Test class allowing for mocks to be used with ConnectionWrapper logic
 public class TestConnectionWrapper extends ConnectionWrapper {
 
-  public TestConnectionWrapper(@NonNull Properties props,
+  public TestConnectionWrapper(
+      @NonNull Properties props,
       @NonNull String url,
       @NonNull ConnectionPluginManager connectionPluginManager,
       @NonNull final TelemetryFactory telemetryFactory,
       @NonNull PluginService pluginService,
       @NonNull HostListProviderService hostListProviderService,
-      @NonNull PluginManagerService pluginManagerService)
+      @NonNull PluginManagerService pluginManagerService,
+      @NonNull StorageService storageService,
+      @NonNull MonitorService monitorService,
+      @NonNull ConnectionService connectionService)
       throws SQLException {
     super(props, url, connectionPluginManager, telemetryFactory, pluginService, hostListProviderService,
-        pluginManagerService);
+        pluginManagerService, storageService, monitorService, connectionService);
   }
 }