Cleanup

Author: aaron-congo

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

@@ -33,20 +33,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
-import software.amazon.jdbc.ConnectionPluginManager;
 import software.amazon.jdbc.HostRole;
 import software.amazon.jdbc.HostSpec;
-import software.amazon.jdbc.PartialPluginService;
 import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.hostavailability.HostAvailability;
 import software.amazon.jdbc.util.ExecutorFactory;
 import software.amazon.jdbc.util.FullServicesContainer;
-import software.amazon.jdbc.util.FullServicesContainerImpl;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.PropertyUtils;
 import software.amazon.jdbc.util.ServiceUtility;
 import software.amazon.jdbc.util.Utils;
-import software.amazon.jdbc.util.connection.ConnectionService;
 
 /**
  * An implementation of ReaderFailoverHandler.

wrapper/src/main/java/software/amazon/jdbc/util/connection/ConnectionService.java

@@ -22,6 +22,12 @@
 import software.amazon.jdbc.HostSpec;
 import software.amazon.jdbc.PluginService;
 
+/**
+ * @deprecated This interface is deprecated and will be removed in a future version. Use
+ * {@link software.amazon.jdbc.util.ServiceUtility#createServiceContainer} followed by
+ * {@link PluginService#forceConnect} instead.
+ */
+@Deprecated
 public interface ConnectionService {
   /**
    * Creates an auxiliary connection. Auxiliary connections are driver-internal connections that accomplish various
@@ -31,8 +37,10 @@ public interface ConnectionService {
    * @param props    the properties for the auxiliary connection.
    * @return a new connection to the given host using the given props.
    * @throws SQLException if an error occurs while opening the connection.
+   * @deprecated Use {@link software.amazon.jdbc.util.ServiceUtility#createServiceContainer} followed by
+   *     {@link PluginService#forceConnect} instead.
    */
-  Connection open(HostSpec hostSpec, Properties props) throws SQLException;
+  @Deprecated Connection open(HostSpec hostSpec, Properties props) throws SQLException;
 
-  PluginService getPluginService();
+  @Deprecated PluginService getPluginService();
 }

wrapper/src/main/java/software/amazon/jdbc/util/connection/ConnectionServiceImpl.java

@@ -16,6 +16,7 @@
 
 package software.amazon.jdbc.util.connection;
 
+import com.mchange.v2.util.PropertiesUtils;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Properties;
@@ -28,15 +29,26 @@
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
 import software.amazon.jdbc.util.FullServicesContainer;
 import software.amazon.jdbc.util.FullServicesContainerImpl;
+import software.amazon.jdbc.util.PropertyUtils;
 import software.amazon.jdbc.util.monitoring.MonitorService;
 import software.amazon.jdbc.util.storage.StorageService;
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
 
+/**
+ * @deprecated This class is deprecated and will be removed in a future version. Use
+ * {@link software.amazon.jdbc.util.ServiceUtility#createServiceContainer} followed by
+ * {@link PluginService#forceConnect} instead.
+ */
+@Deprecated
 public class ConnectionServiceImpl implements ConnectionService {
   protected final String targetDriverProtocol;
   protected final ConnectionPluginManager pluginManager;
   protected final PluginService pluginService;
 
+  /**
+   * @deprecated Use {@link software.amazon.jdbc.util.ServiceUtility#createServiceContainer} instead.
+   */
+  @Deprecated
   public ConnectionServiceImpl(
       StorageService storageService,
       MonitorService monitorService,
@@ -58,9 +70,10 @@ public ConnectionServiceImpl(
         telemetryFactory);
     servicesContainer.setConnectionPluginManager(this.pluginManager);
 
+    Properties propsCopy = PropertyUtils.copyProperties(props);
     PartialPluginService partialPluginService = new PartialPluginService(
         servicesContainer,
-        props,
+        propsCopy,
         originalUrl,
         this.targetDriverProtocol,
         driverDialect,
@@ -72,15 +85,17 @@ public ConnectionServiceImpl(
     servicesContainer.setPluginManagerService(partialPluginService);
 
     this.pluginService = partialPluginService;
-    this.pluginManager.init(servicesContainer, props, partialPluginService, null);
+    this.pluginManager.init(servicesContainer, propsCopy, partialPluginService, null);
   }
 
   @Override
+  @Deprecated
   public Connection open(HostSpec hostSpec, Properties props) throws SQLException {
     return this.pluginManager.forceConnect(this.targetDriverProtocol, hostSpec, props, true, null);
   }
 
   @Override
+  @Deprecated
   public PluginService getPluginService() {
     return this.pluginService;
   }

wrapper/src/test/java/software/amazon/jdbc/plugin/failover/FailoverConnectionPluginTest.java

@@ -63,7 +63,6 @@
 import software.amazon.jdbc.util.FullServicesContainer;
 import software.amazon.jdbc.util.RdsUrlType;
 import software.amazon.jdbc.util.SqlState;
-import software.amazon.jdbc.util.connection.ConnectionService;
 import software.amazon.jdbc.util.telemetry.GaugeCallable;
 import software.amazon.jdbc.util.telemetry.TelemetryContext;
 import software.amazon.jdbc.util.telemetry.TelemetryCounter;
@@ -82,7 +81,6 @@ class FailoverConnectionPluginTest {
           .host("reader1").port(1234).role(HostRole.READER).build());
 
   @Mock FullServicesContainer mockContainer;
-  @Mock ConnectionService mockConnectionService;
   @Mock PluginService mockPluginService;
   @Mock Connection mockConnection;
   @Mock HostSpec mockHostSpec;
@@ -143,7 +141,7 @@ void init() throws SQLException {
   }
 
   @Test
-  void test_notifyNodeListChanged_withFailoverDisabled() throws SQLException {
+  void test_notifyNodeListChanged_withFailoverDisabled() {
     properties.setProperty(FailoverConnectionPlugin.ENABLE_CLUSTER_AWARE_FAILOVER.name, "false");
     final Map<String, EnumSet<NodeChangeOptions>> changes = new HashMap<>();
 
@@ -155,7 +153,7 @@ void test_notifyNodeListChanged_withFailoverDisabled() throws SQLException {
   }
 
   @Test
-  void test_notifyNodeListChanged_withValidConnectionNotInTopology() throws SQLException {
+  void test_notifyNodeListChanged_withValidConnectionNotInTopology() {
     final Map<String, EnumSet<NodeChangeOptions>> changes = new HashMap<>();
     changes.put("cluster-host/", EnumSet.of(NodeChangeOptions.NODE_DELETED));
     changes.put("instance/", EnumSet.of(NodeChangeOptions.NODE_ADDED));
@@ -351,7 +349,7 @@ void test_failoverWriter_successFailover() throws SQLException {
   }
 
   @Test
-  void test_invalidCurrentConnection_withNoConnection() throws SQLException {
+  void test_invalidCurrentConnection_withNoConnection() {
     when(mockPluginService.getCurrentConnection()).thenReturn(null);
     initializePlugin();
     spyPlugin.invalidateCurrentConnection();
@@ -376,7 +374,7 @@ void test_invalidateCurrentConnection_inTransaction() throws SQLException {
   }
 
   @Test
-  void test_invalidateCurrentConnection_notInTransaction() throws SQLException {
+  void test_invalidateCurrentConnection_notInTransaction() {
     when(mockPluginService.isInTransaction()).thenReturn(false);
     when(mockHostSpec.getHost()).thenReturn("host");
     when(mockHostSpec.getPort()).thenReturn(123);
@@ -437,7 +435,7 @@ void test_execute_withDirectExecute() throws SQLException {
     verify(mockHostListProvider, never()).getRdsUrlType();
   }
 
-  private void initializePlugin() throws SQLException {
+  private void initializePlugin() {
     spyPlugin = spy(new FailoverConnectionPlugin(mockContainer, properties));
     spyPlugin.setWriterFailoverHandler(mockWriterFailoverHandler);
     spyPlugin.setReaderFailoverHandler(mockReaderFailoverHandler);