Merge pull request #1 from tenpigs267/refacto/jakarta

Refacto/jakarta

Author: nicolasriousset

pom.xml

@@ -51,36 +51,48 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
             <version>8.0.33</version>
         </dependency>
         <dependency>
             <groupId>org.zeroturnaround</groupId>
             <artifactId>zt-zip</artifactId>
-            <version>1.15</version>
+            <version>1.16</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
+            <artifactId>jakarta.mail</artifactId>
+            <version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.9</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.3</version>
+            <version>5.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.17.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mysql</artifactId>
+            <version>1.17.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/com/smattme/EmailService.java

@@ -3,11 +3,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.mail.*;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import java.io.File;
 import java.util.Properties;
 

src/test/java/com/smattme/MysqlBackup4JIntegrationTest.java

@@ -6,6 +6,9 @@
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -22,15 +25,31 @@
  *
  */
 @Tag("Integration")
+@Testcontainers
 class MysqlBackup4JIntegrationTest {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
     private static final String TEST_DB = "mysqlbackup4j_test";
     private static final String RESTORED_DB = "mysqlbackup4j_restored";
     private static final String DB_USERNAME = "travis";
-    private static final String DB_PASSWORD = "";
+    private static final String DB_PASSWORD = "test";
     private static final String DRIVER_CLASS_NAME = "com.mysql.cj.jdbc.Driver";
 
+    @Container
+    private static final MySQLContainer mySQLContainer = new MySQLContainer<>("mysql:8.0.30")
+            .withDatabaseName(TEST_DB)
+            .withUsername(DB_USERNAME)
+            .withPassword(DB_PASSWORD)
+            .withExposedPorts(3306)
+            .withInitScript("sample_database.sql");
+
+    @Container
+    private static final MySQLContainer mySQLRestoredContainer = new MySQLContainer<>("mysql:8.0.30")
+            .withDatabaseName(RESTORED_DB)
+            .withUsername(DB_USERNAME)
+            .withPassword(DB_PASSWORD)
+            .withExposedPorts(3306);
+
     @BeforeAll
     static void setUp() {
         System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug");
@@ -50,10 +69,12 @@ void givenDBCredentials_whenExportDatabaseAndImportDatabase_thenBackUpAndRestore
         properties.setProperty(MysqlExportService.JDBC_DRIVER_NAME, DRIVER_CLASS_NAME);
         properties.setProperty(MysqlExportService.ADD_IF_NOT_EXISTS, "true");
 
-
         properties.setProperty(MysqlExportService.TEMP_DIR, new File("external").getPath());
         properties.setProperty(MysqlExportService.SQL_FILE_NAME, "test_output_file_name");
 
+        properties.setProperty(MysqlExportService.JDBC_CONNECTION_STRING, mySQLContainer.getJdbcUrl() + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useSSL=false");
+
+
         MysqlExportService mysqlExportService = new MysqlExportService(properties);
         mysqlExportService.export();
 
@@ -71,7 +92,7 @@ void givenDBCredentials_whenExportDatabaseAndImportDatabase_thenBackUpAndRestore
         String sql = new String(Files.readAllBytes(sqlFile.toPath()));
         MysqlImportService res = MysqlImportService.builder()
                 .setJdbcDriver("com.mysql.cj.jdbc.Driver")
-                .setDatabase(RESTORED_DB)
+                .setJdbcConnString(mySQLRestoredContainer.getJdbcUrl())
                 .setSqlString(sql)
                 .setUsername(DB_USERNAME)
                 .setPassword(DB_PASSWORD)
@@ -92,7 +113,7 @@ void givenJDBCConString_whenExportDatabaseAndImportDatabase_thenBackUpAndRestore
         properties.setProperty(MysqlExportService.DB_USERNAME, DB_USERNAME);
         properties.setProperty(MysqlExportService.DB_PASSWORD, DB_PASSWORD);
         properties.setProperty(MysqlExportService.DB_NAME, TEST_DB);
-        properties.setProperty(MysqlExportService.JDBC_CONNECTION_STRING, "jdbc:mysql://localhost:3306/" + TEST_DB + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useSSL=false");
+        properties.setProperty(MysqlExportService.JDBC_CONNECTION_STRING, mySQLContainer.getJdbcUrl() + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useSSL=false");
 
         properties.setProperty(MysqlExportService.PRESERVE_GENERATED_ZIP, "true");
         properties.setProperty(MysqlExportService.PRESERVE_GENERATED_SQL_FILE, "true");
@@ -120,7 +141,7 @@ void givenJDBCConString_whenExportDatabaseAndImportDatabase_thenBackUpAndRestore
         String sql = new String(Files.readAllBytes(sqlFile.toPath()));
         boolean res = MysqlImportService.builder()
                 .setSqlString(sql)
-                .setJdbcConnString("jdbc:mysql://localhost:3306/" + RESTORED_DB + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useSSL=false")
+                .setJdbcConnString(mySQLRestoredContainer.getJdbcUrl() + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&useSSL=false")
                 .setUsername(DB_USERNAME)
                 .setPassword(DB_PASSWORD)
                 .setDatabase(RESTORED_DB)
@@ -135,12 +156,12 @@ void givenJDBCConString_whenExportDatabaseAndImportDatabase_thenBackUpAndRestore
 
 
     private void assertDatabaseBackedUp() throws Exception {
-        Connection connection = MysqlBaseService.connect(DB_USERNAME, DB_PASSWORD, RESTORED_DB, DRIVER_CLASS_NAME);
+        Connection connection = MysqlBaseService.connectWithURL(DB_USERNAME, DB_PASSWORD, mySQLRestoredContainer.getJdbcUrl(), DRIVER_CLASS_NAME);
         Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
         statement.execute("SELECT COUNT(1) as total FROM users");
         ResultSet resultSet = statement.getResultSet();
         resultSet.first();
         assertTrue(resultSet.getLong("total") > 0);
     }
 
-}
+}