data-upgrade-demo updates

data-upgrade-demo/src/main/java/com/qmth/boot/data/upgrade/demo/service/DataInit_1.java

@@ -2,12 +2,13 @@ package com.qmth.boot.data.upgrade.demo.service;
 
 import com.qmth.boot.data.upgrade.service.DataInitService;
 import com.qmth.boot.data.upgrade.utils.ResourceFileHelper;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import java.util.Arrays;
+
 public class DataInit_1 implements DataInitService {
 
     private static final Logger log = LoggerFactory.getLogger(DataInit_1.class);
@@ -17,18 +18,10 @@ public class DataInit_1 implements DataInitService {
         log.info("process...");
 
         String[] sqlList = StringUtils.split(ResourceFileHelper.readContent("install/init.sql"), ";");
-        if (ArrayUtils.isEmpty(sqlList)) {
-            return;
-        }
-
-        for (String sql : sqlList) {
-            if (StringUtils.isBlank(sql)) {
-                continue;
-            }
-
+        Arrays.stream(sqlList).filter(StringUtils::isNotBlank).forEach(sql -> {
             log.info(sql);
             jdbcTemplate.execute(sql);
-        }
+        });
     }
 
 }

data-upgrade-demo/src/main/java/com/qmth/boot/data/upgrade/demo/service/DataInit_2.java

@@ -1,5 +1,11 @@
-package com.qmth.boot.data.upgrade.demo.service;
-
+// package com.qmth.boot.data.upgrade.demo.service;
+//
+// import com.qmth.boot.data.upgrade.service.DataInitService;
+// import org.slf4j.Logger;
+// import org.slf4j.LoggerFactory;
+// import org.springframework.jdbc.core.JdbcTemplate;
+//
+//
 // public class DataInit_2 implements DataInitService {
 //
 //     private static final Logger log = LoggerFactory.getLogger(DataInit_2.class);

data-upgrade-demo/src/main/java/com/qmth/boot/data/upgrade/demo/service/DataUpgrade_1_0_3.java

@@ -2,10 +2,14 @@ package com.qmth.boot.data.upgrade.demo.service;
 
 import com.qmth.boot.data.upgrade.annotation.DataUpgradeVersion;
 import com.qmth.boot.data.upgrade.service.DataUpgradeService;
+import com.qmth.boot.data.upgrade.utils.ResourceFileHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import java.util.Arrays;
+
 @DataUpgradeVersion("1.0.3")
 public class DataUpgrade_1_0_3 implements DataUpgradeService {
 
@@ -14,6 +18,12 @@ public class DataUpgrade_1_0_3 implements DataUpgradeService {
     @Override
     public void process(JdbcTemplate jdbcTemplate) throws Exception {
         log.info("process...");
+
+        String[] sqlList = StringUtils.split(ResourceFileHelper.readContent("upgrade/1.0.3.sql"), ";");
+        Arrays.stream(sqlList).filter(StringUtils::isNotBlank).forEach(sql -> {
+            log.info(sql);
+            jdbcTemplate.execute(sql);
+        });
     }
 
 }

data-upgrade-demo/src/main/java/com/qmth/boot/data/upgrade/demo/service/DataUpgrade_1_0_5.java

@@ -3,12 +3,13 @@ package com.qmth.boot.data.upgrade.demo.service;
 import com.qmth.boot.data.upgrade.annotation.DataUpgradeVersion;
 import com.qmth.boot.data.upgrade.service.DataUpgradeService;
 import com.qmth.boot.data.upgrade.utils.ResourceFileHelper;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import java.util.Arrays;
+
 @DataUpgradeVersion("1.0.5")
 public class DataUpgrade_1_0_5 implements DataUpgradeService {
 
@@ -19,18 +20,12 @@ public class DataUpgrade_1_0_5 implements DataUpgradeService {
         log.info("process...");
 
         String[] sqlList = StringUtils.split(ResourceFileHelper.readContent("upgrade/1.0.5.sql"), ";");
-        if (ArrayUtils.isEmpty(sqlList)) {
-            return;
-        }
-
-        for (String sql : sqlList) {
-            if (StringUtils.isBlank(sql)) {
-                continue;
-            }
-
+        Arrays.stream(sqlList).filter(StringUtils::isNotBlank).forEach(sql -> {
             log.info(sql);
             jdbcTemplate.execute(sql);
-        }
+        });
+
+        // if (true) throw new RuntimeException("test err...");
     }
 
 }