From d77af44bd17f403ec4e2b380d6e8d7c7260e10b7 Mon Sep 17 00:00:00 2001 From: bryan31 Date: Fri, 23 Apr 2021 13:49:26 +0800 Subject: [PATCH] =?UTF-8?q?bug=20#I3NSF8=20=E7=A9=BA=E7=9A=84flow=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/parser/JsonFlowParser.java | 23 +-- .../liteflow/parser/XmlFlowParser.java | 3 + .../liteflow/parser/YmlFlowParser.java | 3 + .../test/emptyflow/EmptyFlowTest.java | 39 ++++++ .../emptyFlow/application.properties | 1 + .../src/test/resources/emptyFlow/flow.xml | 0 .../java/com/yomahub/flowtest/Runner.java | 3 +- .../java/com/yomahub/flowtest/TestFlow.java | 2 +- .../flowtest/aspect/ComponentAspect.java | 18 --- .../yomahub/flowtest/curator/CuratorTest.java | 131 ------------------ .../flowtest/curator/CuratorTest2.java | 117 ---------------- .../com/yomahub/flowtest/regex/RegexTest.java | 23 --- .../src/main/resources/application.properties | 5 +- 13 files changed, 54 insertions(+), 314 deletions(-) create mode 100644 liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/emptyflow/EmptyFlowTest.java create mode 100644 liteflow-spring-boot-starter/src/test/resources/emptyFlow/application.properties create mode 100644 liteflow-spring-boot-starter/src/test/resources/emptyFlow/flow.xml delete mode 100644 liteflow-test-springboot/src/main/java/com/yomahub/flowtest/aspect/ComponentAspect.java delete mode 100644 liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest.java delete mode 100644 liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest2.java delete mode 100644 liteflow-test-springboot/src/main/java/com/yomahub/flowtest/regex/RegexTest.java diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java index 0044a88c..0266eb48 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java @@ -28,6 +28,10 @@ public abstract class JsonFlowParser extends FlowParser{ @Override public void parse(String content) throws Exception { + if (StrUtil.isBlank(content)){ + return; + } + //把字符串原生转换为json对象，如果不加第二个参数OrderedField，会无序 JSONObject flowJsonObject = JSONObject.parseObject(content, Feature.OrderedField); parse(flowJsonObject); @@ -41,28 +45,11 @@ public abstract class JsonFlowParser extends FlowParser{ JSONArray nodeArrayList = flowJsonObject.getJSONObject("flow").getJSONObject("nodes").getJSONArray("node"); String id; String clazz; - Node node; - NodeComponent component; - Class nodeComponentClass; for(int i = 0; i< nodeArrayList.size(); i++) { JSONObject nodeObject = nodeArrayList.getJSONObject(i); - node = new Node(); id = nodeObject.getString("id"); clazz = nodeObject.getString("class"); - node.setId(id); - node.setClazz(clazz); - nodeComponentClass = (Class)Class.forName(clazz); - //以node方式配置，本质上是为了适配无spring的环境，如果有spring环境，其实不用这么配置 - //这里的逻辑是判断是否能从spring上下文中取到，如果没有spring，则就是new instance了 - component = SpringAware.registerOrGet(nodeComponentClass); - if (ObjectUtil.isNull(component)) { - LOG.error("couldn't find component class [{}] from spring context", clazz); - component = nodeComponentClass.newInstance(); - } - component.setNodeId(id); - component.setSelf(component); - node.setInstance(component); - FlowBus.addNode(id, node); + FlowBus.addNode(id, clazz); } } else { for(Map.Entry componentEntry : ComponentScanner.nodeComponentMap.entrySet()){ diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java index 64f83a92..fdab15e0 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java @@ -32,6 +32,9 @@ public abstract class XmlFlowParser extends FlowParser{ private final Logger LOG = LoggerFactory.getLogger(XmlFlowParser.class); public void parse(String content) throws Exception { + if (StrUtil.isBlank(content)){ + return; + } Document document = DocumentHelper.parseText(content); parse(document); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java index dc748bf5..c8b44c09 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java @@ -22,6 +22,9 @@ public abstract class YmlFlowParser extends JsonFlowParser{ @Override public void parseMain(String rulePath) throws Exception { String ruleContent = ResourceUtil.readUtf8Str(StrUtil.format("classpath:{}",rulePath)); + if (StrUtil.isBlank(ruleContent)){ + return; + } JSONObject ruleObject = convertToJson(ruleContent); parse(ruleObject.toJSONString()); } diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/emptyflow/EmptyFlowTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/emptyflow/EmptyFlowTest.java new file mode 100644 index 00000000..eb641599 --- /dev/null +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/emptyflow/EmptyFlowTest.java @@ -0,0 +1,39 @@ +package com.yomahub.liteflow.test.emptyflow; + +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.entity.data.LiteflowResponse; +import com.yomahub.liteflow.test.BaseTest; +import com.yomahub.liteflow.test.aop.aspect.CustomAspect; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; + +/** + * 切面场景单元测试 + * @author Bryan.Zhang + */ +@RunWith(SpringRunner.class) +@TestPropertySource(value = "classpath:/emptyFlow/application.properties") +@SpringBootTest(classes = EmptyFlowTest.class) +@EnableAutoConfiguration +@Import(CustomAspect.class) +public class EmptyFlowTest extends BaseTest { + + @Resource + private FlowExecutor flowExecutor; + + //测试自定义AOP，串行场景 + @Test + public void testEmptyFlow() { + //不做任何事，为的是能正常启动 + } +} diff --git a/liteflow-spring-boot-starter/src/test/resources/emptyFlow/application.properties b/liteflow-spring-boot-starter/src/test/resources/emptyFlow/application.properties new file mode 100644 index 00000000..953c0206 --- /dev/null +++ b/liteflow-spring-boot-starter/src/test/resources/emptyFlow/application.properties @@ -0,0 +1 @@ +liteflow.rule-source=emptyFlow/flow.xml \ No newline at end of file diff --git a/liteflow-spring-boot-starter/src/test/resources/emptyFlow/flow.xml b/liteflow-spring-boot-starter/src/test/resources/emptyFlow/flow.xml new file mode 100644 index 00000000..e69de29b diff --git a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/Runner.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/Runner.java index d3cdf278..78ab31cb 100644 --- a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/Runner.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/Runner.java @@ -9,8 +9,7 @@ public class Runner { public static void main(String[] args) { try{ SpringApplication.run(Runner.class, args); - -// System.exit(0); + System.exit(0); }catch (Throwable t){ t.printStackTrace(); } diff --git a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/TestFlow.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/TestFlow.java index 903fe368..f661e7e6 100644 --- a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/TestFlow.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/TestFlow.java @@ -15,7 +15,7 @@ public class TestFlow implements CommandLineRunner { @Override public void run(String... args) throws Exception { - LiteflowResponse response= flowExecutor.execute2Resp("chain4", "it's a request"); + LiteflowResponse response= flowExecutor.execute2Resp("chain3", "it's a request"); System.out.println(response); } } diff --git a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/aspect/ComponentAspect.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/aspect/ComponentAspect.java deleted file mode 100644 index 48898ec4..00000000 --- a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/aspect/ComponentAspect.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yomahub.flowtest.aspect; - -import com.yomahub.liteflow.aop.ICmpAroundAspect; -import com.yomahub.liteflow.entity.data.Slot; -import org.springframework.stereotype.Component; - -@Component -public class ComponentAspect implements ICmpAroundAspect { - @Override - public void beforeProcess(String nodeId, Slot slot) { - System.out.println("before process"); - } - - @Override - public void afterProcess(String nodeId, Slot slot) { - System.out.println("after process"); - } -} diff --git a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest.java deleted file mode 100644 index 64aab60b..00000000 --- a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.yomahub.flowtest.curator; - -import org.apache.curator.framework.CuratorFramework; -import org.apache.curator.framework.CuratorFrameworkFactory; -import org.apache.curator.framework.recipes.cache.*; -import org.apache.curator.retry.RetryNTimes; - -public class CuratorTest { - - /** Zookeeper info */ - private static final String ZK_ADDRESS = "123.206.92.144:2181,123.206.92.144:2182,123.206.92.144:2183"; - private static final String ZK_PATH = "/zktest/a1/aa1"; - - public static void main(String[] args) throws Exception { - // 1.Connect to zk - CuratorFramework client = CuratorFrameworkFactory.newClient( - ZK_ADDRESS, - new RetryNTimes(10, 5000) - ); - client.start(); - - checkNode(client); - -// childNodeListen(client); - -// removeNodeData(client); - -// createNode(client); - -// nodeListen(client); -// -// modifyNodeData(client); - - System.in.read(); - -// getNodeData(client); -// -// - - } - - private static void checkNode(CuratorFramework client) throws Exception { - System.out.println(client.checkExists().forPath("/test")); - } - - private static void createNode(CuratorFramework client) throws Exception { - String data1 = "nice to meet you"; - print("create", ZK_PATH, data1); - client.create(). - creatingParentsIfNeeded(). - forPath(ZK_PATH, data1.getBytes()); - } - - private static void getNodeData(CuratorFramework client) throws Exception { - print("ls", "/"); - print(client.getChildren().forPath("/")); - print("get", ZK_PATH); - print(client.getData().forPath(ZK_PATH)); - } - - private static void modifyNodeData(CuratorFramework client) throws Exception { - String data2 = "world for u"; - print("set", ZK_PATH, data2); - client.setData().forPath(ZK_PATH, data2.getBytes()); - print("get", ZK_PATH); - print(client.getData().forPath(ZK_PATH)); - } - - private static void removeNodeData(CuratorFramework client) throws Exception { - print("delete", "/zktest/dddd"); - client.delete().forPath("/zktest/dddd"); - print("ls", "/"); - print(client.getChildren().forPath("/")); - } - - private static void nodeListen(CuratorFramework client) throws Exception { - final NodeCache cache = new NodeCache(client,ZK_PATH); - cache.start(); - - cache.getListenable().addListener(new NodeCacheListener() { - - @Override - public void nodeChanged() throws Exception { - byte[] res = cache.getCurrentData().getData(); - System.out.println("data: " + new String(res)); - } - }); - } - - private static void childNodeListen(CuratorFramework client) throws Exception { - final PathChildrenCache cache = new PathChildrenCache(client,"/zktest",true); - cache.start(); - - cache.getListenable().addListener(new PathChildrenCacheListener() { - - @Override - public void childEvent(CuratorFramework curator, PathChildrenCacheEvent event) throws Exception { - switch (event.getType()) { - case CHILD_ADDED: - System.out.println("add:" + event.getData().getPath() + ":" + new String(event.getData().getData())); - break; - case CHILD_UPDATED: - System.out.println("update:" + event.getData().getPath() + ":" + new String(event.getData().getData())); - break; - case CHILD_REMOVED: - System.out.println("remove:" + event.getData().getPath() + ":" + new String(event.getData().getData())); - break; - default: - break; - } - } - }); - } - - - private static void print(String... cmds) { - StringBuilder text = new StringBuilder("$ "); - for (String cmd : cmds) { - text.append(cmd).append(" "); - } - System.out.println(text.toString()); - } - - private static void print(Object result) { - System.out.println( - result instanceof byte[] - ? new String((byte[]) result) - : result); - } - -} diff --git a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest2.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest2.java deleted file mode 100644 index c2673117..00000000 --- a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest2.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.yomahub.flowtest.curator; - -import org.apache.curator.framework.CuratorFramework; -import org.apache.curator.framework.CuratorFrameworkFactory; -import org.apache.curator.framework.recipes.cache.*; -import org.apache.curator.retry.RetryNTimes; - -public class CuratorTest2 { - - /** Zookeeper info */ - private static final String ZK_ADDRESS = "114.55.174.189:2181"; - private static final String ZK_PATH = "/zktest/ffff"; - - public static void main(String[] args) throws Exception { - // 1.Connect to zk - CuratorFramework client = CuratorFrameworkFactory.newClient( - ZK_ADDRESS, - new RetryNTimes(10, 5000) - ); - client.start(); - -// removeNodeData(client); - -// createNode(client); - -// nodeListen(client); -// - modifyNodeData(client); - - } - - private static void createNode(CuratorFramework client) throws Exception { - String data1 = "hello"; - print("create", ZK_PATH, data1); - client.create(). - creatingParentsIfNeeded(). - forPath(ZK_PATH, data1.getBytes()); - } - - private static void getNodeData(CuratorFramework client) throws Exception { - print("ls", "/"); - print(client.getChildren().forPath("/")); - print("get", ZK_PATH); - print(client.getData().forPath(ZK_PATH)); - } - - private static void modifyNodeData(CuratorFramework client) throws Exception { - String data2 = "world for u"; - print("set", ZK_PATH, data2); - client.setData().forPath(ZK_PATH, data2.getBytes()); - print("get", ZK_PATH); - print(client.getData().forPath(ZK_PATH)); - } - - private static void removeNodeData(CuratorFramework client) throws Exception { - print("delete", "/zktest/dddd"); - client.delete().forPath("/zktest/dddd"); - print("ls", "/"); - print(client.getChildren().forPath("/")); - } - - private static void nodeListen(CuratorFramework client) throws Exception { - final NodeCache cache = new NodeCache(client,ZK_PATH); - cache.start(); - - cache.getListenable().addListener(new NodeCacheListener() { - - @Override - public void nodeChanged() throws Exception { - byte[] res = cache.getCurrentData().getData(); - System.out.println("data: " + new String(res)); - } - }); - } - - private static void childNodeListen(CuratorFramework client) throws Exception { - final PathChildrenCache cache = new PathChildrenCache(client,"/zktest",true); - cache.start(); - - cache.getListenable().addListener(new PathChildrenCacheListener() { - - @Override - public void childEvent(CuratorFramework curator, PathChildrenCacheEvent event) throws Exception { - switch (event.getType()) { - case CHILD_ADDED: - System.out.println("add:" + event.getData().getPath() + ":" + new String(event.getData().getData())); - break; - case CHILD_UPDATED: - System.out.println("update:" + event.getData().getPath() + ":" + new String(event.getData().getData())); - break; - case CHILD_REMOVED: - System.out.println("remove:" + event.getData().getPath() + ":" + new String(event.getData().getData())); - break; - default: - break; - } - } - }); - } - - - private static void print(String... cmds) { - StringBuilder text = new StringBuilder("$ "); - for (String cmd : cmds) { - text.append(cmd).append(" "); - } - System.out.println(text.toString()); - } - - private static void print(Object result) { - System.out.println( - result instanceof byte[] - ? new String((byte[]) result) - : result); - } - -} diff --git a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/regex/RegexTest.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/regex/RegexTest.java deleted file mode 100644 index 7e4a60f3..00000000 --- a/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/regex/RegexTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yomahub.flowtest.regex; - -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class RegexTest { - - public static void main(String[] args) { - String str = "192.168.1.1:2181,192.168.1.2:2182,192.168.1.3:2183"; - List list = new ArrayList(); - Pattern p = Pattern.compile("[\\w\\d][\\w\\d\\.]+\\:(\\d)+(\\,[\\w\\d][\\w\\d\\.]+\\:(\\d)+)*"); - Matcher m = p.matcher(str); - while(m.find()){ - list.add(m.group()); - } - System.out.println(list.size()); - System.out.println(list); - - } - -} diff --git a/liteflow-test-springboot/src/main/resources/application.properties b/liteflow-test-springboot/src/main/resources/application.properties index 18986c1a..bd92e176 100644 --- a/liteflow-test-springboot/src/main/resources/application.properties +++ b/liteflow-test-springboot/src/main/resources/application.properties @@ -1,7 +1,4 @@ -#liteflow.rule-source=config/flow.xml -#liteflow.rule-source=config/flow.yml -liteflow.rule-source=config/flow.json;com.yomahub.flowtest.custom.CustomXmlClass -#liteflow.slot-size=2048 +liteflow.rule-source=config/flow.xml liteflow.when-max-wait-seconds=20 liteflow.monitor.enable-log=true liteflow.monitor.queue-limit=300