code review

Author: sergiyv-improving

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

@@ -98,13 +98,15 @@ public static void main(String[] args) throws RunnerException {
   }
 
   @Setup(Level.Iteration)
+  @SuppressWarnings("deprecation")
   public void setUpIteration() throws Exception {
     closeable = MockitoAnnotations.openMocks(this);
     when(mockConnectionPluginManager.connect(any(), any(), any(Properties.class), anyBoolean()))
         .thenReturn(mockConnection);
     when(mockConnectionPluginManager.execute(
         any(), any(), any(), eq("Connection.createStatement"), any(), any()))
         .thenReturn(mockStatement);
+
     when(mockConnectionProvider.connect(anyString(), any(Properties.class))).thenReturn(
         mockConnection);
     when(mockConnectionProvider.connect(anyString(), any(Dialect.class), any(HostSpec.class), any(Properties.class)))

wrapper/src/main/java/software/amazon/jdbc/targetdriverdialect/MariadbDataSourceHelper.java

@@ -34,6 +34,7 @@ public class MariadbDataSourceHelper {
       Logger.getLogger(MariadbDataSourceHelper.class.getName());
 
   private static final String LOGIN_TIMEOUT = "loginTimeout";
+  private static final String DS_CLASS_NAME = MariaDbDataSource.class.getName();
 
   public void prepareDataSource(
       final @NonNull DataSource dataSource,
@@ -44,7 +45,7 @@ public void prepareDataSource(
     if (!(dataSource instanceof MariaDbDataSource)) {
       throw new SQLException(Messages.get(
           "TargetDriverDialectManager.unexpectedClass",
-          new Object[] {"org.mariadb.jdbc.MariaDbDataSource", dataSource.getClass().getName()}));
+          new Object[] { DS_CLASS_NAME, dataSource.getClass().getName() }));
     }
 
     final MariaDbDataSource mariaDbDataSource = (MariaDbDataSource) dataSource;

wrapper/src/main/java/software/amazon/jdbc/targetdriverdialect/MariadbTargetDriverDialect.java

@@ -28,16 +28,20 @@
 public class MariadbTargetDriverDialect extends GenericTargetDriverDialect {
 
   private static final String PERMIT_MYSQL_SCHEME = "permitMysqlScheme";
+  private static final String DRIVER_CLASS_NAME = org.mariadb.jdbc.Driver.class.getName();
+  private static final String DS_CLASS_NAME = org.mariadb.jdbc.MariaDbDataSource.class.getName();
+  private static final String CP_DS_CLASS_NAME =
+      org.mariadb.jdbc.MariaDbPoolDataSource.class.getName();
 
   @Override
   public boolean isDialect(Driver driver) {
-    return "org.mariadb.jdbc.Driver".equals(driver.getClass().getName());
+    return DRIVER_CLASS_NAME.equals(driver.getClass().getName());
   }
 
   @Override
   public boolean isDialect(String dataSourceClass) {
-    return "org.mariadb.jdbc.MariaDbDataSource".equals(dataSourceClass)
-        || "org.mariadb.jdbc.MariaDbPoolDataSource".equals(dataSourceClass);
+    return DS_CLASS_NAME.equals(dataSourceClass)
+        || CP_DS_CLASS_NAME.equals(dataSourceClass);
   }
 
   @Override

wrapper/src/main/java/software/amazon/jdbc/targetdriverdialect/MysqlConnectorJTargetDriverDialect.java

@@ -26,15 +26,20 @@
 
 public class MysqlConnectorJTargetDriverDialect extends GenericTargetDriverDialect {
 
+  private static final String DRIVER_CLASS_NAME = com.mysql.cj.jdbc.Driver.class.getName();
+  private static final String DS_CLASS_NAME = com.mysql.cj.jdbc.MysqlDataSource.class.getName();
+  private static final String CP_DS_CLASS_NAME =
+      com.mysql.cj.jdbc.MysqlConnectionPoolDataSource.class.getName();
+
   @Override
   public boolean isDialect(Driver driver) {
-    return "com.mysql.cj.jdbc.Driver".equals(driver.getClass().getName());
+    return DRIVER_CLASS_NAME.equals(driver.getClass().getName());
   }
 
   @Override
   public boolean isDialect(String dataSourceClass) {
-    return "com.mysql.cj.jdbc.MysqlDataSource".equals(dataSourceClass)
-        || "com.mysql.cj.jdbc.MysqlConnectionPoolDataSource".equals(dataSourceClass);
+    return DS_CLASS_NAME.equals(dataSourceClass)
+        || CP_DS_CLASS_NAME.equals(dataSourceClass);
   }
 
   @Override

wrapper/src/main/java/software/amazon/jdbc/targetdriverdialect/PgDataSourceHelper.java

@@ -30,7 +30,6 @@ public class PgDataSourceHelper {
 
   public void prepareDataSource(
       final @NonNull DataSource dataSource,
-      final @NonNull String protocol,
       final @NonNull HostSpec hostSpec,
       final @NonNull Properties props) throws SQLException {
 

wrapper/src/main/java/software/amazon/jdbc/targetdriverdialect/PgTargetDriverDialect.java

@@ -29,14 +29,22 @@
 
 public class PgTargetDriverDialect extends GenericTargetDriverDialect {
 
+  private static final String DRIVER_CLASS_NAME = org.postgresql.Driver.class.getName();
+  private static final String SIMPLE_DS_CLASS_NAME =
+      org.postgresql.ds.PGSimpleDataSource.class.getName();
+  private static final String POOLING_DS_CLASS_NAME =
+      org.postgresql.ds.PGPoolingDataSource.class.getName();
+  private static final String CP_DS_CLASS_NAME =
+      org.postgresql.ds.PGConnectionPoolDataSource.class.getName();
+
   private static final Set<String> dataSourceClassMap = new HashSet<>(Arrays.asList(
-          "org.postgresql.ds.PGSimpleDataSource",
-          "org.postgresql.ds.PGPoolingDataSource",
-          "org.postgresql.ds.PGConnectionPoolDataSource"));
+      SIMPLE_DS_CLASS_NAME,
+      POOLING_DS_CLASS_NAME,
+      CP_DS_CLASS_NAME));
 
   @Override
   public boolean isDialect(Driver driver) {
-    return "org.postgresql.Driver".equals(driver.getClass().getName());
+    return DRIVER_CLASS_NAME.equals(driver.getClass().getName());
   }
 
   @Override
@@ -58,6 +66,6 @@ public void prepareDataSource(
     // The logic is isolated to a separated class since it uses
     // direct reference to org.postgresql.ds.common.BaseDataSource
     final PgDataSourceHelper helper = new PgDataSourceHelper();
-    helper.prepareDataSource(dataSource, protocol, hostSpec, props);
+    helper.prepareDataSource(dataSource, hostSpec, props);
   }
 }