Version 0.6.0.

* Support for MariaDB 11.3.
* Up version on libraries.

Author: shigenobu

README.ja.md

@@ -9,7 +9,7 @@ MariaDBの同一ホスト内の2つのデータベースの差分を取り、同
 ### システム要件
 
 * JDK 1.8 以上
-* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2
+* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3
 
 ### コマンド
 

README.md

@@ -9,7 +9,7 @@ Get diff and sync between two databases in same host created by MariaDB.
 ### System Required
 
 * over JDK 1.8
-* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2
+* MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2, 11.3
 
 ### Usage by cli
 

cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.walksocket</groupId>
     <artifactId>magentadesk</artifactId>
-    <version>0.5.3</version>
+    <version>0.6.0</version>
   </parent>
   <artifactId>cli</artifactId>
   <packaging>jar</packaging>

cli/src/main/java/com/walksocket/md/MdExecute.java

@@ -49,8 +49,9 @@ public static MdOutputAbstract execute(MdInputAbstract input) throws Exception {
           || version.contains("10.11.")
           || version.contains("11.0.")
           || version.contains("11.1.")
-          || version.contains("11.2."))) {
-        throw new MdExceptionInvalidVersion("MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2 is required.");
+          || version.contains("11.2.")
+          || version.contains("11.3."))) {
+        throw new MdExceptionInvalidVersion("MariaDB 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 10.10, 10.11, 11.0, 11.1, 11.2 , 11.3 is required.");
       }
 
       // create database `magentadesk`.

cli/src/test/java/com/walksocket/md/TestDiff.java

@@ -1,29 +1,35 @@
 package com.walksocket.md;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 import com.walksocket.md.exception.MdExceptionAbstract;
 import com.walksocket.md.input.MdInputDiff;
 import com.walksocket.md.input.MdInputMaintenance;
 import com.walksocket.md.output.MdOutputDiff;
 import com.walksocket.md.output.MdOutputMaintenance;
-import org.junit.*;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer.MethodName;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import org.junit.jupiter.api.TestMethodOrder;
 
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@TestMethodOrder(MethodName.class)
 public class TestMaintenance {
 
   private MdInputMaintenance inputMaintenance;
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() throws IOException {
     MdEnv.setDebug();
     MdEnv.setPretty();
     MdDate.init(60 * 60 * 9);
     MdLogger.open("stderr");
   }
 
-  @Before
+  @BeforeEach
   public void testBefore() {
     inputMaintenance = new MdInputMaintenance();
     inputMaintenance.host = "127.0.0.1";
@@ -35,7 +41,7 @@ public void testBefore() {
     inputMaintenance.compareDatabase = "compare";
   }
 
-  @After
+  @AfterEach
   public void testAfter() throws Exception {
     // maintenance off
     inputMaintenance.maintenance = "off";
@@ -50,7 +56,7 @@ public void test01SetMaintenanceOn() throws Exception {
     MdOutputMaintenance outputMaintenance = (MdOutputMaintenance) MdExecute.execute(inputMaintenance);
     System.out.println(MdJson.toJsonStringFriendly(outputMaintenance));
 
-    Assert.assertEquals("on", outputMaintenance.maintenance);
+    assertEquals("on", outputMaintenance.maintenance);
 
     // check fail
     MdInputDiff inputDiff = new MdInputDiff();
@@ -64,9 +70,9 @@ public void test01SetMaintenanceOn() throws Exception {
 
     try {
       MdExecute.execute(inputDiff);
-      Assert.fail("not hear.");
+      fail("not hear.");
     } catch (MdExceptionAbstract e) {
-      Assert.assertEquals(MdExceptionAbstract.ExitCode.IN_MAINTENANCE, e.getExitCode());
+      assertEquals(MdExceptionAbstract.ExitCode.IN_MAINTENANCE, e.getExitCode());
     }
   }
 
@@ -78,7 +84,7 @@ public void test02SetMaintenanceOff() throws Exception {
     MdOutputMaintenance outputMaintenance = (MdOutputMaintenance) MdExecute.execute(inputMaintenance);
     System.out.println(MdJson.toJsonStringFriendly(outputMaintenance));
 
-    Assert.assertEquals("off", outputMaintenance.maintenance);
+    assertEquals("off", outputMaintenance.maintenance);
 
     // check success
     MdInputDiff inputDiff = new MdInputDiff();
@@ -92,9 +98,9 @@ public void test02SetMaintenanceOff() throws Exception {
 
     try {
       MdOutputDiff outputDiff = (MdOutputDiff) MdExecute.execute(inputDiff);
-      Assert.assertNotNull(outputDiff);
+      assertNotNull(outputDiff);
     } catch (MdExceptionAbstract e) {
-      Assert.fail("not hear.");
+      fail("not hear.");
     }
   }
 }

cli/src/test/java/com/walksocket/md/TestMaintenance.java

@@ -3,10 +3,6 @@
 import com.walksocket.md.input.MdInputDiff;
 import com.walksocket.md.input.member.MdInputMemberOption;
 import com.walksocket.md.output.MdOutputDiff;
-import java.io.IOException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import org.junit.Assert;
 
 public class TestMulti {
 

cli/src/test/java/com/walksocket/md/TestMulti.java

@@ -1,5 +1,7 @@
 package com.walksocket.md;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 import com.walksocket.md.bash.MdBashCommand;
 import com.walksocket.md.exception.MdExceptionAbstract;
 import com.walksocket.md.input.MdInputDiff;
@@ -11,29 +13,34 @@
 import com.walksocket.md.output.MdOutputSync;
 import com.walksocket.md.output.member.MdOutputMemberCommandResult;
 import com.walksocket.md.output.member.MdOutputMemberHttpResult;
-import org.junit.*;
-import org.junit.runners.MethodSorters;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer.MethodName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+@TestMethodOrder(MethodName.class)
 public class TestSync {
 
   private MdInputDiff inputDiff;
 
   private MdInputSync inputSync;
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() throws IOException {
     MdEnv.setDebug();
     MdEnv.setPretty();
     MdDate.init(60 * 60 * 9);
     MdLogger.open("stderr");
   }
 
-  @Before
+  @BeforeEach
   public void before() {
     inputDiff = new MdInputDiff();
     inputDiff.host = "127.0.0.1";
@@ -52,7 +59,7 @@ public void before() {
     inputSync.charset = "utf8mb4";
   }
 
-  @After
+  @AfterEach
   public void after() {
     MdBash.exec(new MdBashCommand("mysql -h 127.0.0.1 -P 13306 -u root -ppass < ../docker/mysql/init/1_base.sql", 300));
     MdBash.exec(new MdBashCommand("mysql -h 127.0.0.1 -P 13306 -u root -ppass < ../docker/mysql/init/2_compare.sql", 300));
@@ -78,8 +85,8 @@ public void testSyncAllTypes() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // match
-    Assert.assertTrue(
-        "matchTables:t_all_types",
+    assertTrue(
+//        "matchTables:t_all_types",
         outputDiff.matchTables.stream().filter(o -> o.tableName.equals("t_all_types")).findFirst().isPresent());
   }
 
@@ -110,15 +117,15 @@ public void testSyncByDiffSeq() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputSync));
 
     // check change
-    Assert.assertTrue(outputSync.reflectedRecordTables.get(0).records.get(0).changes.get(0));
+    assertTrue(outputSync.reflectedRecordTables.get(0).records.get(0).changes.get(0));
 
     // re diff
     outputDiff = (MdOutputDiff) MdExecute.execute(inputDiff);
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // mismatch
-    Assert.assertTrue(
-        "mismatchRecordTables:t_diff",
+    assertTrue(
+//        "mismatchRecordTables:t_diff",
         outputDiff.mismatchRecordTables.stream().filter(o -> o.tableName.equals("t_diff")).findFirst().isPresent());
   }
 
@@ -155,8 +162,8 @@ public void testSyncForceByDiffSeq() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // mismatch
-    Assert.assertTrue(
-        "mismatchRecordTables:t_diff",
+    assertTrue(
+//        "mismatchRecordTables:t_diff",
         outputDiff.mismatchRecordTables.stream().filter(o -> o.tableName.equals("t_diff")).findFirst().isPresent());
   }
 
@@ -179,11 +186,15 @@ public void testSyncForceByAll() throws Exception {
     // check previous value
     outputSync.reflectedRecordTables.get(0).records.forEach(r -> {
       if (r.values.get(0) != null && r.values.get(0).equals("3")) {
-        Assert.assertNull("null - compare", r.previousValues.get(0));
+        assertNull(
+//            "null - compare",
+            r.previousValues.get(0));
         System.out.println(r.previousValues.get(0) == null);
       }
       if (r.previousValues.get(0) != null && r.previousValues.get(0).equals("2")) {
-        Assert.assertNull("null - base", r.values.get(0));
+        assertNull(
+//            "null - base",
+            r.values.get(0));
         System.out.println(r.values.get(0) == null);
       }
     });
@@ -193,8 +204,8 @@ public void testSyncForceByAll() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // match
-    Assert.assertTrue(
-        "matchTables:t_diff",
+    assertTrue(
+//        "matchTables:t_diff",
         outputDiff.matchTables.stream().filter(o -> o.tableName.equals("t_diff")).findFirst().isPresent());
   }
 
@@ -223,8 +234,8 @@ public void testSyncFull() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // mismatchRecordTables
-    Assert.assertTrue(
-        "mismatchRecordTables",
+    assertTrue(
+//        "mismatchRecordTables",
         outputDiff.mismatchRecordTables.size() == 0);
   }
 
@@ -249,8 +260,8 @@ public void testDuplicateUnique() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // match
-    Assert.assertTrue(
-        "matchTables:t_dup_unique",
+    assertTrue(
+//        "matchTables:t_dup_unique",
         outputDiff.matchTables.stream().filter(o -> o.tableName.equals("t_dup_unique")).findFirst().isPresent());
   }
 
@@ -281,16 +292,16 @@ public void testCommandAndHttp() throws Exception {
     MdOutputSync outputSync = (MdOutputSync) MdExecute.execute(inputSync);
     System.out.println(MdJson.toJsonStringFriendly(outputSync));
     for (MdOutputMemberCommandResult commandResult : outputSync.commandResultsBeforeCommit) {
-      Assert.assertEquals(0, commandResult.code);
+      assertEquals(0, commandResult.code);
     }
     for (MdOutputMemberCommandResult commandResult : outputSync.commandResultsAfterCommit) {
-      Assert.assertEquals(23, commandResult.code);
+      assertEquals(23, commandResult.code);
     }
     for (MdOutputMemberHttpResult httpResult : outputSync.httpResultsBeforeCommit) {
-      Assert.assertEquals(200, httpResult.status);
+      assertEquals(200, httpResult.status);
     }
     for (MdOutputMemberHttpResult httpResult : outputSync.httpResultsAfterCommit) {
-      Assert.assertEquals(201, httpResult.status);
+      assertEquals(201, httpResult.status);
     }
   }
 
@@ -320,7 +331,7 @@ public void testCommandError() throws Exception {
       System.out.println(MdJson.toJsonStringFriendly(outputSync));
       throw new IllegalAccessException();
     } catch (MdExceptionAbstract e) {
-      Assert.assertEquals(MdExceptionAbstract.ExitCode.NOT_SUCCESS_CODE, e.getExitCode());
+      assertEquals(MdExceptionAbstract.ExitCode.NOT_SUCCESS_CODE, e.getExitCode());
       e.printStackTrace();
     }
   }
@@ -351,7 +362,7 @@ public void testHttpError() throws Exception {
       System.out.println(MdJson.toJsonStringFriendly(outputSync));
       throw new IllegalAccessException();
     } catch (MdExceptionAbstract e) {
-      Assert.assertEquals(MdExceptionAbstract.ExitCode.NOT_SUCCESS_STATUS, e.getExitCode());
+      assertEquals(MdExceptionAbstract.ExitCode.NOT_SUCCESS_STATUS, e.getExitCode());
       e.printStackTrace();
     }
   }
@@ -382,8 +393,8 @@ public void testSyncUuid() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // mismatchRecordTables
-    Assert.assertTrue(
-        "mismatchRecordTables",
+    assertTrue(
+//        "mismatchRecordTables",
         outputDiff.mismatchRecordTables.size() == 0);
   }
 
@@ -413,8 +424,8 @@ public void testSyncInet6() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // mismatchRecordTables
-    Assert.assertTrue(
-        "mismatchRecordTables",
+    assertTrue(
+//        "mismatchRecordTables",
         outputDiff.mismatchRecordTables.size() == 0);
   }
 
@@ -444,8 +455,8 @@ public void testSyncInet4() throws Exception {
     System.out.println(MdJson.toJsonStringFriendly(outputDiff));
 
     // mismatchRecordTables
-    Assert.assertTrue(
-        "mismatchRecordTables",
+    assertTrue(
+//        "mismatchRecordTables",
         outputDiff.mismatchRecordTables.size() == 0);
   }
 }

cli/src/test/java/com/walksocket/md/TestSync.java

@@ -14,7 +14,7 @@ services:
   mysql:
     build: ./docker/mysql
     container_name: magentadesk-mysql
-    image: magentadesk-mysql:0.0.9
+    image: magentadesk-mysql:0.1.0
     ports:
       - 13306:3306
     environment:

docker-compose.yml

@@ -1,4 +1,4 @@
-FROM mariadb:11.2
+FROM mariadb:11.3
 
 # copy configuration
 COPY ./mariadb.conf.d/server.cnf /etc/mysql/mariadb.conf.d/server.cnf