修复一些测试用例

liteflow-core/src/main/java/com/yomahub/liteflow/monitor/MonitorFile.java

@@ -52,22 +52,13 @@ public class MonitorFile {
     public void create() {
         for (String filePath : CollUtil.distinct(PATH_LIST)) {
             // 这里只监听两种类型，文件修改和文件覆盖
-            WatchMonitor.createAll(filePath, new DelayWatcher(new SimpleWatcher() {
-
+            WatchMonitor.createAll(filePath, new SimpleWatcher(){
                 @Override
                 public void onModify(WatchEvent<?> event, Path currentPath) {
                     logger.info("file modify,filePath={}", filePath);
                     FlowExecutorHolder.loadInstance().reloadRule();
                 }
-
-                @Override
-                public void onOverflow(WatchEvent<?> event, Path currentPath) {
-                    logger.info("file over flow,filePath={}", filePath);
-                    FlowExecutorHolder.loadInstance().reloadRule();
-                }
-                // 在监听目录或文件时，如果这个文件有修改操作，JDK会多次触发modify方法，为了解决这个问题
-                // 合并 500 毫秒内相同的变化
-            }, 500)).start();
+            }).start();
         }
     }
 

liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileELDeclMultiSpringbootTest.java

@@ -33,9 +33,6 @@ public class MonitorFileELDeclMultiSpringbootTest extends BaseTest {
         String content = FileUtil.readUtf8String(absolutePath);
         String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
         FileUtil.writeString(newContent,new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-
-        Thread.sleep(1500);
-
         LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
         Assert.assertEquals("a==>c==>b", response.getExecuteStepStr());
 

liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CmpConfig.java

@@ -12,31 +12,15 @@ public class CmpConfig {
 
     @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "a")
     public void processA(NodeComponent bindCmp) {
-        try {
-            Thread.sleep(new Random().nextInt(2000));
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-
         System.out.println("ACmp executed!");
     }
 
     @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "b")
     public void processB(NodeComponent bindCmp) {
-        try {
-            Thread.sleep(new Random().nextInt(2000));
-        }catch (Exception e){
-            e.printStackTrace();
-        }
         System.out.println("BCmp executed!");
     }
     @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "c")
     public void process(NodeComponent bindCmp) {
-        try {
-            Thread.sleep(new Random().nextInt(2000));
-        }catch (Exception e){
-            e.printStackTrace();
-        }
         System.out.println("BCmp executed!");
     }
 }

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileELDeclSpringbootTest.java

@@ -33,9 +33,6 @@ public class MonitorFileELDeclSpringbootTest extends BaseTest {
         String content = FileUtil.readUtf8String(absolutePath);
         String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
         FileUtil.writeString(newContent,new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-
-        Thread.sleep(1500);
-
         LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
         Assert.assertEquals("a==>c==>b", response.getExecuteStepStr());
     }

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/ACmp.java

@@ -19,12 +19,6 @@ public class ACmp{
 
 	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
 	public void process(NodeComponent bindCmp) {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-
 		System.out.println("ACmp executed!");
 	}
 }

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/BCmp.java

@@ -19,11 +19,6 @@ public class BCmp{
 
 	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
 	public void process(NodeComponent bindCmp) {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
 		System.out.println("BCmp executed!");
 	}
 

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CCmp.java

@@ -19,11 +19,6 @@ public class CCmp{
 
 	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
 	public void process(NodeComponent bindCmp) {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
 		System.out.println("CCmp executed!");
 	}
 

liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/monitorFile/LiteflowMonitorFileTest.java

@@ -27,14 +27,11 @@ public class LiteflowMonitorFileTest extends BaseTest {
     }
 
     @Test
-    public void testMultipleType() throws InterruptedException {
+    public void testMonitor() throws InterruptedException {
         String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
         String content = FileUtil.readUtf8String(absolutePath);
         String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
         FileUtil.writeString(newContent, new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-
-        Thread.sleep(1000);
-
         LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
         Assert.assertEquals("a==>c==>b", response.getExecuteStepStr());
     }

liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/java/com/yomahub/liteflow/test/script/groovy/monitorFile/MonitorFileGroovyELTest.java

@@ -35,9 +35,6 @@ public class MonitorFileGroovyELTest extends BaseTest {
         String content = FileUtil.readUtf8String(absolutePath);
         String newContent = content.replace("a=3", "a=2");
         FileUtil.writeString(newContent,new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-
-        Thread.sleep(1500);
-
         LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
         DefaultContext context = response.getFirstContextBean();
         Assert.assertTrue(response.isSuccess());

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileELSpringbootTest.java

@@ -28,9 +28,6 @@ public class MonitorFileELSpringbootTest extends BaseTest {
         String content = FileUtil.readUtf8String(absolutePath);
         String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
         FileUtil.writeString(newContent,new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-
-        Thread.sleep(1500);
-
         LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
         Assert.assertEquals("a==>c==>b", response.getExecuteStepStr());
     }

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/ACmp.java

@@ -17,12 +17,6 @@ public class ACmp extends NodeComponent {
 
 	@Override
 	public void process() {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-
 		System.out.println("ACmp executed!");
 	}
 }

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/BCmp.java

@@ -17,11 +17,6 @@ public class BCmp extends NodeComponent {
 
 	@Override
 	public void process() {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
 		System.out.println("BCmp executed!");
 	}
 

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CCmp.java

@@ -17,11 +17,6 @@ public class CCmp extends NodeComponent {
 
 	@Override
 	public void process() {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
 		System.out.println("CCmp executed!");
 	}
 

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileELSpringbootTest.java

@@ -34,9 +34,6 @@ public class MonitorFileELSpringbootTest extends BaseTest {
         String content = FileUtil.readUtf8String(absolutePath);
         String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
         FileUtil.writeString(newContent,new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-
-        Thread.sleep(1500);
-
         LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
         Assert.assertEquals("a==>c==>b", response.getExecuteStepStr());
     }

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/ACmp.java

@@ -17,12 +17,6 @@ public class ACmp extends NodeComponent {
 
 	@Override
 	public void process() {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-
 		System.out.println("ACmp executed!");
 	}
 }

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/BCmp.java

@@ -17,11 +17,6 @@ public class BCmp extends NodeComponent {
 
 	@Override
 	public void process() {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
 		System.out.println("BCmp executed!");
 	}
 

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CCmp.java

@@ -17,11 +17,6 @@ public class CCmp extends NodeComponent {
 
 	@Override
 	public void process() {
-		try {
-			Thread.sleep(new Random().nextInt(2000));
-		}catch (Exception e){
-			e.printStackTrace();
-		}
 		System.out.println("CCmp executed!");
 	}