Replace MySQL deprecated loading class

Author: hmiguim

dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/Constants.java

@@ -0,0 +1,10 @@
+package com.databasepreservation.modules.mysql;
+
+public class Constants {
+
+    public static final String MYSQL_DRIVER_CLASS_NAME = "com.mysql.cj.jdbc.Driver";
+
+    private Constants() {
+        // private constructor
+    }
+}

dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/in/MySQLJDBCImportModule.java

@@ -39,6 +39,8 @@
 import com.databasepreservation.modules.mysql.MySQLModuleFactory;
 import com.databasepreservation.utils.MapUtils;
 
+import static com.databasepreservation.modules.mysql.Constants.MYSQL_DRIVER_CLASS_NAME;
+
 /**
  * @author Luis Faria <[email protected]>
  * @author Bruno Ferreira <[email protected]>
@@ -65,7 +67,7 @@ public class MySQLJDBCImportModule extends JDBCImportModule {
    */
   public MySQLJDBCImportModule(String moduleName, String hostname, int port, String database, String username,
     String password, boolean encrypt) {
-    super("com.mysql.jdbc.Driver",
+    super(MYSQL_DRIVER_CLASS_NAME,
       "jdbc:mysql://" + hostname + ":" + port + "/" + database + (encrypt ? "?useSSL=true" : ""), new MySQLHelper(),
       new MySQLDatatypeImporter(), moduleName,
       MapUtils.buildMapFromObjects(MySQLModuleFactory.PARAMETER_HOSTNAME, hostname,
@@ -80,7 +82,7 @@ public MySQLJDBCImportModule(String moduleName, String hostname, int port, Strin
   public MySQLJDBCImportModule(String moduleName, String hostname, int port, String database, String username,
     String password, boolean encrypt, String sshHost, String sshUser, String sshPassword, String sshPortNumber)
     throws ModuleException {
-    super("com.mysql.jdbc.Driver",
+    super(MYSQL_DRIVER_CLASS_NAME,
       "jdbc:mysql://" + hostname + ":" + port + "/" + database + (encrypt ? "?useSSL=true" : ""), new MySQLHelper(),
       new MySQLDatatypeImporter(), moduleName,
       MapUtils.buildMapFromObjects(MySQLModuleFactory.PARAMETER_HOSTNAME, hostname,
@@ -182,8 +184,8 @@ protected TableStructure getTableStructure(SchemaStructure schema, String tableN
           }
         }
       } catch (Exception e) {
-        LOGGER.debug(
-          "Exception while trying to obtain MySQL table '" + tableIndex + "' description (comment). with query ", e);
+        LOGGER.debug("Exception while trying to obtain MySQL table '{}' description (comment). with query ", tableIndex,
+          e);
       }
     }
 

dbptk-modules/dbptk-module-mysql/src/main/java/com/databasepreservation/modules/mysql/out/MySQLJDBCExportModule.java

@@ -2,7 +2,7 @@
  * The contents of this file are subject to the license and copyright
  * detailed in the LICENSE file at the root of the source
  * tree and available online at
- *
+ * <p>
  * https://github.com/keeps/db-preservation-toolkit
  */
 /**
@@ -30,6 +30,8 @@
 import com.databasepreservation.modules.mysql.MySQLHelper;
 import com.databasepreservation.utils.RemoteConnectionUtils;
 
+import static com.databasepreservation.modules.mysql.Constants.MYSQL_DRIVER_CLASS_NAME;
+
 /**
  * @author Luis Faria
  */
@@ -53,30 +55,6 @@ public class MySQLJDBCExportModule extends JDBCExportModule {
 
   private final boolean ssh;
 
-  /**
-   * MySQL JDBC export module constructor
-   *
-   * @param hostname
-   *          the hostname of the MySQL server
-   * @param database
-   *          the name of the database to import from
-   * @param username
-   *          the name of the user to use in connection
-   * @param password
-   *          the password of the user to use in connection
-
-  public MySQLJDBCExportModule(String hostname, String database, String username, String password, boolean encrypt) {
-    super("com.mysql.jdbc.Driver", createConnectionURL(hostname, -1, database, username, password, encrypt), new MySQLHelper());
-    this.hostname = hostname;
-    this.port = -1;
-    this.database = database;
-    this.username = username;
-    this.password = password;
-    this.encrypt = encrypt;
-    this.ignoredSchemas = new TreeSet<String>(Arrays.asList(IGNORED_SCHEMAS));
-  }
-  */
-
   /**
    * MySQL JDBC export module constructor
    *
@@ -91,8 +69,9 @@ public MySQLJDBCExportModule(String hostname, String database, String username,
    * @param password
    *          the password of the user to use in connection
    */
-  public MySQLJDBCExportModule(String hostname, int port, String database, String username, String password, boolean encrypt) {
-    super("com.mysql.jdbc.Driver", createConnectionURL(hostname, port, database, username, password, encrypt),
+  public MySQLJDBCExportModule(String hostname, int port, String database, String username, String password,
+    boolean encrypt) {
+    super(MYSQL_DRIVER_CLASS_NAME, createConnectionURL(hostname, port, database, username, password, encrypt),
       new MySQLHelper());
     this.hostname = hostname;
     this.port = port;
@@ -104,9 +83,11 @@ public MySQLJDBCExportModule(String hostname, int port, String database, String
     this.ssh = false;
   }
 
-  public MySQLJDBCExportModule(String hostname, int port, String database, String username, String password, boolean encrypt, boolean ssh, String sshHost, String sshUser, String sshPassword, String sshPortNumber) throws ModuleException {
-    super("com.mysql.jdbc.Driver", createConnectionURL(hostname, port, database, username, password, encrypt),
-        new MySQLHelper(), ssh, sshHost, sshUser, sshPassword, sshPortNumber);
+  public MySQLJDBCExportModule(String hostname, int port, String database, String username, String password,
+    boolean encrypt, boolean ssh, String sshHost, String sshUser, String sshPassword, String sshPortNumber)
+    throws ModuleException {
+    super(MYSQL_DRIVER_CLASS_NAME, createConnectionURL(hostname, port, database, username, password, encrypt),
+      new MySQLHelper(), ssh, sshHost, sshUser, sshPassword, sshPortNumber);
     this.hostname = hostname;
     this.port = port;
     this.database = database;
@@ -117,15 +98,16 @@ public MySQLJDBCExportModule(String hostname, int port, String database, String
     this.ssh = ssh;
   }
 
-  public static String createConnectionURL(String hostname, int port, String database, String username,
-    String password, boolean encrypt) {
+  public static String createConnectionURL(String hostname, int port, String database, String username, String password,
+    boolean encrypt) {
     return "jdbc:mysql://" + hostname + (port >= 0 ? ":" + port : "") + "/" + database + "?" + "user=" + username
       + "&password=" + password + "&useSSL=" + encrypt + "&rewriteBatchedStatements=true";
   }
 
   public String createConnectionURL(String databaseName) {
     if (ssh) {
-      return createConnectionURL(hostname, RemoteConnectionUtils.getLocalPort(), databaseName, username, password, encrypt);
+      return createConnectionURL(hostname, RemoteConnectionUtils.getLocalPort(), databaseName, username, password,
+        encrypt);
     } else {
       return createConnectionURL(hostname, port, databaseName, username, password, encrypt);
     }