From f3b899345754d665b77e0958be7b4822fbb0a23b Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sun, 11 Sep 2022 15:03:07 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#I5QMDZ=20=E6=8A=8AZk=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=9A=84=E6=94=AF=E6=8C=81=E6=8B=86=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=8F=92=E4=BB=B6=E8=A7=A3=E8=80=A6=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liteflow-core/pom.xml | 22 ----- .../yomahub/liteflow/core/FlowExecutor.java | 21 +++-- .../parser/ZookeeperJsonFlowParser.java | 23 ----- .../parser/ZookeeperXmlFlowParser.java | 21 ----- .../parser/ZookeeperYmlFlowParser.java | 22 ----- .../base/BaseZookeeperJsonFlowParser.java | 58 ------------- .../base/BaseZookeeperXmlFlowParser.java | 58 ------------- .../base/BaseZookeeperYmlFlowParser.java | 60 -------------- .../parser/el/ZookeeperJsonFlowELParser.java | 23 ----- .../parser/el/ZookeeperXmlFlowELParser.java | 22 ----- .../parser/el/ZookeeperYmlFlowELParser.java | 22 ----- .../parser/factory/FlowParserProvider.java | 49 ----------- .../factory/ZookeeperParserFactory.java | 47 ----------- .../parser/spi/ParserClassNameSpi.java | 11 +++ .../liteflow/property/LiteflowConfig.java | 24 +++--- .../property/LiteflowConfigGetter.java | 2 +- .../com/yomahub/liteflow/util/JsonUtil.java | 13 +++ .../yomahub/liteflow/util/LOGOPrinter.java | 2 +- liteflow-rule-zk/pom.xml | 46 ++++++++++ .../parser/spi/zk/ZkParserClassNameSpi.java | 17 ++++ .../liteflow/parser/zk/ZkXmlELParser.java | 69 +++++++++++++++ .../parser/zk/exception/ZkException.java | 23 +++++ .../parser/zk/util}/ZkParserHelper.java | 64 +++++++------- .../liteflow/parser/zk/vo/ZkParserVO.java | 29 +++++++ ...hub.liteflow.parser.spi.ParserClassNameSpi | 1 + .../liteflow/springboot/LiteflowProperty.java | 20 ++--- .../LiteflowPropertyAutoConfiguration.java | 2 +- ...itional-spring-configuration-metadata.json | 13 ++- .../META-INF/liteflow-default.properties | 1 - .../ZkNodeWithJsonELDeclSpringbootTest.java | 82 ------------------ .../ZkNodeWithXmlELDeclSpringbootTest.java | 82 ------------------ .../ZkNodeWithYmlELDeclSpringbootTest.java | 82 ------------------ .../liteflow/test/zookeeper/cmp/ACmp.java | 24 ------ .../liteflow/test/zookeeper/cmp/BCmp.java | 25 ------ .../liteflow/test/zookeeper/cmp/CCmp.java | 25 ------ .../zookeeper/application-json.properties | 1 - .../zookeeper/application-xml.properties | 1 - .../zookeeper/application-yml.properties | 1 - .../src/test/resources/zookeeper/flow.json | 10 --- .../src/test/resources/zookeeper/flow.yml | 4 - .../test/zookeeper/ZkNodeWithJsonTest.java | 75 ----------------- .../test/zookeeper/ZkNodeWithXmlTest.java | 75 ----------------- .../test/zookeeper/ZkNodeWithYmlTest.java | 75 ----------------- .../liteflow/test/zookeeper/cmp/ACmp.java | 18 ---- .../liteflow/test/zookeeper/cmp/BCmp.java | 19 ----- .../liteflow/test/zookeeper/cmp/CCmp.java | 19 ----- .../ZkNodeWithJsonELSpringbootTest.java | 82 ------------------ .../ZkNodeWithYmlELSpringbootTest.java | 82 ------------------ .../zookeeper/application-json.properties | 1 - .../application-xml-cluster.properties | 1 - .../zookeeper/application-xml.properties | 1 - .../zookeeper/application-yml.properties | 1 - .../src/test/resources/zookeeper/flow.json | 10 --- .../src/test/resources/zookeeper/flow.xml | 6 -- .../src/test/resources/zookeeper/flow.yml | 4 - .../zookeeper/ZkNodeWithJsonELSpringTest.java | 77 ----------------- .../zookeeper/ZkNodeWithXmlELSpringTest.java | 77 ----------------- .../zookeeper/ZkNodeWithYmlELSpringTest.java | 77 ----------------- .../liteflow/test/zookeeper/cmp/ACmp.java | 20 ----- .../liteflow/test/zookeeper/cmp/BCmp.java | 21 ----- .../liteflow/test/zookeeper/cmp/CCmp.java | 21 ----- .../resources/zookeeper/application-json.xml | 23 ----- .../resources/zookeeper/application-xml.xml | 23 ----- .../resources/zookeeper/application-yml.xml | 23 ----- .../src/test/resources/zookeeper/flow.el.json | 10 --- .../src/test/resources/zookeeper/flow.el.xml | 6 -- .../src/test/resources/zookeeper/flow.el.yml | 5 -- .../pom.xml | 67 +++++++++++++++ .../com/yomahub/liteflow/test/BaseTest.java | 20 +++++ .../ZkClusterWithXmlELSpringbootTest.java | 4 +- .../ZkNodeWithXmlELSpringbootTest.java | 0 .../liteflow/test/zookeeper/cmp/ACmp.java | 0 .../liteflow/test/zookeeper/cmp/BCmp.java | 0 .../liteflow/test/zookeeper/cmp/CCmp.java | 0 .../application-xml-cluster.properties | 1 + .../zookeeper/application-xml.properties | 1 + .../src/test/resources/zookeeper/flow.xml | 0 liteflow-testcase-el/pom.xml | 1 + .../pom.xml | 18 ---- .../ZkNodeWithJsonSpringbootTest.java | 83 ------------------- .../ZkNodeWithXmlSpringbootTest.java | 83 ------------------- .../ZkNodeWithYmlSpringbootTest.java | 83 ------------------- .../liteflow/test/zookeeper/cmp/ACmp.java | 24 ------ .../liteflow/test/zookeeper/cmp/BCmp.java | 25 ------ .../liteflow/test/zookeeper/cmp/CCmp.java | 25 ------ .../zookeeper/application-json.properties | 1 - .../zookeeper/application-xml.properties | 1 - .../zookeeper/application-yml.properties | 1 - .../src/test/resources/zookeeper/flow.json | 12 --- .../src/test/resources/zookeeper/flow.xml | 6 -- .../src/test/resources/zookeeper/flow.yml | 6 -- .../liteflow-testcase-nospring/pom.xml | 18 ---- .../test/zookeeper/ZkNodeWithJsonTest.java | 75 ----------------- .../test/zookeeper/ZkNodeWithXmlTest.java | 75 ----------------- .../test/zookeeper/ZkNodeWithYmlTest.java | 75 ----------------- .../liteflow/test/zookeeper/cmp/ACmp.java | 18 ---- .../liteflow/test/zookeeper/cmp/BCmp.java | 19 ----- .../liteflow/test/zookeeper/cmp/CCmp.java | 19 ----- .../src/test/resources/zookeeper/flow.json | 28 ------- .../src/test/resources/zookeeper/flow.xml | 12 --- .../src/test/resources/zookeeper/flow.yml | 14 ---- .../pom.xml | 18 ---- .../pom.xml | 17 ---- .../liteflow-testcase-springboot/pom.xml | 16 ---- .../ZkNodeWithJsonSpringbootTest.java | 83 ------------------- .../ZkNodeWithXmlSpringbootTest.java | 83 ------------------- .../ZkNodeWithYmlSpringbootTest.java | 83 ------------------- .../liteflow/test/zookeeper/cmp/ACmp.java | 20 ----- .../liteflow/test/zookeeper/cmp/BCmp.java | 21 ----- .../liteflow/test/zookeeper/cmp/CCmp.java | 21 ----- .../zookeeper/application-json.properties | 1 - .../zookeeper/application-xml.properties | 1 - .../zookeeper/application-yml.properties | 1 - .../src/test/resources/zookeeper/flow.json | 12 --- .../src/test/resources/zookeeper/flow.xml | 6 -- .../src/test/resources/zookeeper/flow.yml | 6 -- .../liteflow-testcase-springnative/pom.xml | 16 ---- .../zookeeper/ZkNodeWithJsonSpringTest.java | 78 ----------------- .../zookeeper/ZkNodeWithXmlSpringTest.java | 78 ----------------- .../zookeeper/ZkNodeWithYmlSpringTest.java | 78 ----------------- .../liteflow/test/zookeeper/cmp/ACmp.java | 20 ----- .../liteflow/test/zookeeper/cmp/BCmp.java | 21 ----- .../liteflow/test/zookeeper/cmp/CCmp.java | 21 ----- .../resources/zookeeper/application-json.xml | 23 ----- .../resources/zookeeper/application-xml.xml | 23 ----- .../resources/zookeeper/application-yml.xml | 23 ----- .../src/test/resources/zookeeper/flow.json | 12 --- .../src/test/resources/zookeeper/flow.xml | 6 -- .../src/test/resources/zookeeper/flow.yml | 6 -- pom.xml | 9 +- 130 files changed, 377 insertions(+), 3215 deletions(-) delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperXmlFlowParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperJsonFlowParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperXmlFlowParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperYmlFlowParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperJsonFlowELParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperXmlFlowELParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperYmlFlowELParser.java delete mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/ZookeeperParserFactory.java create mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/parser/spi/ParserClassNameSpi.java create mode 100644 liteflow-rule-zk/pom.xml create mode 100644 liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java create mode 100644 liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java create mode 100644 liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java rename {liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper => liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util}/ZkParserHelper.java (50%) create mode 100644 liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java create mode 100644 liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELDeclSpringbootTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELDeclSpringbootTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELDeclSpringbootTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-json.properties delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-xml.properties delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-yml.properties delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.json delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.yml delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringbootTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringbootTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-json.properties delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml-cluster.properties delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml.properties delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-yml.properties delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.json delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.xml delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.yml delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringTest.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-json.xml delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-xml.xml delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-yml.xml delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.json delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.xml delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.yml create mode 100644 liteflow-testcase-el/liteflow-testcase-el-zk-springboot/pom.xml create mode 100644 liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java rename liteflow-testcase-el/{liteflow-testcase-el-springboot => liteflow-testcase-el-zk-springboot}/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkClusterWithXmlELSpringbootTest.java (96%) rename liteflow-testcase-el/{liteflow-testcase-el-springboot => liteflow-testcase-el-zk-springboot}/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringbootTest.java (100%) rename liteflow-testcase-el/{liteflow-testcase-el-springboot => liteflow-testcase-el-zk-springboot}/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java (100%) rename liteflow-testcase-el/{liteflow-testcase-el-springboot => liteflow-testcase-el-zk-springboot}/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java (100%) rename liteflow-testcase-el/{liteflow-testcase-el-springboot => liteflow-testcase-el-zk-springboot}/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java (100%) create mode 100644 liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml-cluster.properties create mode 100644 liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml.properties rename liteflow-testcase-el/{liteflow-testcase-el-declare-springboot => liteflow-testcase-el-zk-springboot}/src/test/resources/zookeeper/flow.xml (100%) delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-json.properties delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-xml.properties delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-yml.properties delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.json delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.xml delete mode 100644 liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.yml delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml delete mode 100644 liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-json.properties delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-xml.properties delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-yml.properties delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.xml delete mode 100644 liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.yml delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-json.xml delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-xml.xml delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-yml.xml delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.xml delete mode 100644 liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.yml diff --git a/liteflow-core/pom.xml b/liteflow-core/pom.xml index 4ee8e5c2a..d64c9b6bc 100644 --- a/liteflow-core/pom.xml +++ b/liteflow-core/pom.xml @@ -40,28 +40,6 @@ org.dom4j dom4j - - org.apache.curator - curator-framework - - - log4j - log4j - - - slf4j-api - org.slf4j - - - commons-lang - commons-lang - - - - - org.apache.curator - curator-recipes - com.alibaba transmittable-thread-local diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java index 90f65b97d..7b064f492 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java @@ -19,6 +19,7 @@ import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.flow.id.IdGeneratorHolder; import com.yomahub.liteflow.parser.base.FlowParser; import com.yomahub.liteflow.parser.factory.FlowParserProvider; +import com.yomahub.liteflow.parser.spi.ParserClassNameSpi; import com.yomahub.liteflow.property.LiteflowConfig; import com.yomahub.liteflow.property.LiteflowConfigGetter; import com.yomahub.liteflow.slot.DataBus; @@ -29,10 +30,7 @@ import com.yomahub.liteflow.thread.ExecutorHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.concurrent.Future; /** @@ -84,10 +82,19 @@ public class FlowExecutor { //进行id生成器的初始化 IdGeneratorHolder.init(); - //如果没有配置规则文件路径，就停止初始化。 - //规则文件路径不是一定要有，因为liteflow分基于规则和基于代码两种，有可能是动态代码构建的 if (StrUtil.isBlank(liteflowConfig.getRuleSource())) { - return; + //查看有没有Parser的SPI实现 + //所有的Parser的SPI实现都是以custom形式放入的，且只支持xml形式 + ServiceLoader loader = ServiceLoader.load(ParserClassNameSpi.class); + Iterator it = loader.iterator(); + if (it.hasNext()){ + ParserClassNameSpi parserClassNameSpi = it.next(); + liteflowConfig.setRuleSource("el_xml:" + parserClassNameSpi.getSpiClassName()); + }else{ + //ruleSource为空，而且没有spi形式的扩展，那么说明真的没有ruleSource + //这种情况有可能是基于代码动态构建的 + return; + } } //如果有前缀的，则不需要再进行分割了，说明是一个整体 diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java deleted file mode 100644 index 21b572590..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yomahub.liteflow.parser; - -import com.fasterxml.jackson.databind.JsonNode; -import com.yomahub.liteflow.parser.base.BaseZookeeperJsonFlowParser; -import com.yomahub.liteflow.parser.helper.ParserHelper; - -/** - * 基于zk方式的json形式的解析器 - * @author guodongqing - * @since 2.5.0 - */ -public class ZookeeperJsonFlowParser extends BaseZookeeperJsonFlowParser { - - public ZookeeperJsonFlowParser(String node) { - super(node); - } - - @Override - public void parseOneChain(JsonNode chainObject) { - ParserHelper.parseOneChain(chainObject); - } - -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperXmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperXmlFlowParser.java deleted file mode 100644 index 42284e46b..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperXmlFlowParser.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yomahub.liteflow.parser; - -import com.yomahub.liteflow.parser.base.BaseZookeeperXmlFlowParser; -import com.yomahub.liteflow.parser.helper.ParserHelper; -import org.dom4j.Element; - -/** - * 基于zk方式的xml形式的解析器 - * @author Bryan.Zhang - */ -public class ZookeeperXmlFlowParser extends BaseZookeeperXmlFlowParser { - - public ZookeeperXmlFlowParser(String node) { - super(node); - } - - @Override - public void parseOneChain(Element chain) { - ParserHelper.parseOneChain(chain); - } -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java deleted file mode 100644 index 6c3d030cc..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yomahub.liteflow.parser; - -import com.fasterxml.jackson.databind.JsonNode; -import com.yomahub.liteflow.parser.base.BaseZookeeperYmlFlowParser; -import com.yomahub.liteflow.parser.helper.ParserHelper; - -/** - * 基于zk方式的yml形式的解析器 - * - * @author guodongqing - * @since 2.5.0 - */ -public class ZookeeperYmlFlowParser extends BaseZookeeperYmlFlowParser { - public ZookeeperYmlFlowParser(String node) { - super(node); - } - - @Override - public void parseOneChain(JsonNode chain) { - ParserHelper.parseOneChain(chain); - } -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperJsonFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperJsonFlowParser.java deleted file mode 100644 index 46f24b14e..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperJsonFlowParser.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.yomahub.liteflow.parser.base; - -import com.fasterxml.jackson.databind.JsonNode; -import com.yomahub.liteflow.parser.ZookeeperJsonFlowParser; -import com.yomahub.liteflow.parser.helper.ZkParserHelper; -import org.apache.curator.framework.CuratorFramework; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.function.Consumer; - -/** - * 基类，用于存放 ZookeeperJsonFlowParser 通用方法 - * - * @author tangkc - */ -public abstract class BaseZookeeperJsonFlowParser extends BaseJsonFlowParser { - - private static final Logger LOG = LoggerFactory.getLogger(ZookeeperJsonFlowParser.class); - - private final String nodePath; - - private final ZkParserHelper zkParserHelper; - - public BaseZookeeperJsonFlowParser(String node) { - nodePath = node; - Consumer parseConsumer = t -> { - try { - parse(t); - } catch (Exception e) { - throw new RuntimeException(e); - } - }; - zkParserHelper = new ZkParserHelper(nodePath, parseConsumer); - } - - @Override - public void parseMain(List pathList) throws Exception { - CuratorFramework client = zkParserHelper.getZkCuratorFramework(pathList); - - String content = new String(client.getData().forPath(nodePath)); - - zkParserHelper.checkContent(content); - - parse(content); - - zkParserHelper.listenZkNode(client); - } - - /** - * 解析一个chain的过程 - * - * @param chainObject chain 节点 - */ - @Override - public abstract void parseOneChain(JsonNode chainObject); -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperXmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperXmlFlowParser.java deleted file mode 100644 index a678f1ee5..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperXmlFlowParser.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.yomahub.liteflow.parser.base; - -import com.yomahub.liteflow.parser.ZookeeperXmlFlowParser; -import com.yomahub.liteflow.parser.helper.ZkParserHelper; -import org.apache.curator.framework.CuratorFramework; -import org.dom4j.Element; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.function.Consumer; - -/** - * 基类，用于存放 ZookeeperXmlFlowELParser 通用方法 - * - * @author tangkc - */ -public abstract class BaseZookeeperXmlFlowParser extends BaseXmlFlowParser { - - private static final Logger LOG = LoggerFactory.getLogger(ZookeeperXmlFlowParser.class); - - private final String nodePath; - - private final ZkParserHelper zkParserHelper; - - public BaseZookeeperXmlFlowParser(String node) { - nodePath = node; - Consumer parseConsumer = t -> { - try { - parse(t); - } catch (Exception e) { - throw new RuntimeException(e); - } - }; - zkParserHelper = new ZkParserHelper(nodePath, parseConsumer); - } - - @Override - public void parseMain(List pathList) throws Exception { - CuratorFramework client = zkParserHelper.getZkCuratorFramework(pathList); - - String content = new String(client.getData().forPath(nodePath)); - - zkParserHelper.checkContent(content); - - parse(content); - - zkParserHelper.listenZkNode(client); - } - - /** - * 解析一个chain的过程 - * - * @param chain 节点 - */ - @Override - public abstract void parseOneChain(Element chain); -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperYmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperYmlFlowParser.java deleted file mode 100644 index 8ff7d7e9c..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/base/BaseZookeeperYmlFlowParser.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.yomahub.liteflow.parser.base; - -import com.fasterxml.jackson.databind.JsonNode; -import com.yomahub.liteflow.parser.helper.ZkParserHelper; -import org.apache.curator.framework.CuratorFramework; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.function.Consumer; - -/** - * 基类，用于存放 ZookeeperYmlFlowELParser 通用方法 - * - * @author tangkc - */ -public abstract class BaseZookeeperYmlFlowParser extends BaseYmlFlowParser{ - - - private static final Logger LOG = LoggerFactory.getLogger(BaseZookeeperYmlFlowParser.class); - - private final String nodePath; - - private final ZkParserHelper zkParserHelper; - - public BaseZookeeperYmlFlowParser(String node) { - nodePath = node; - Consumer parseConsumer = t -> { - try { - parse(t); - } catch (Exception e) { - throw new RuntimeException(e); - } - }; - zkParserHelper = new ZkParserHelper(nodePath, parseConsumer); - } - - @Override - public void parseMain(List pathList) throws Exception { - CuratorFramework client = zkParserHelper.getZkCuratorFramework(pathList); - - String content = new String(client.getData().forPath(nodePath)); - - zkParserHelper.checkContent(content); - - JsonNode ruleObject = convertToJson(content); - - parse(ruleObject.toString()); - - zkParserHelper.listenZkNode(client); - } - - /** - * 解析一个 chain 的过程 - * - * @param chain chain - */ - @Override - public abstract void parseOneChain(JsonNode chain); -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperJsonFlowELParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperJsonFlowELParser.java deleted file mode 100644 index 2f94ef0d0..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperJsonFlowELParser.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yomahub.liteflow.parser.el; - -import com.fasterxml.jackson.databind.JsonNode; -import com.yomahub.liteflow.parser.base.BaseZookeeperJsonFlowParser; -import com.yomahub.liteflow.parser.helper.ParserHelper; - -/** - * 基于zk方式的json形式的解析器 - * @author guodongqing - * @since 2.5.0 - */ -public class ZookeeperJsonFlowELParser extends BaseZookeeperJsonFlowParser { - - public ZookeeperJsonFlowELParser(String node) { - super(node); - } - - @Override - public void parseOneChain(JsonNode chainObject) { - ParserHelper.parseOneChainEl(chainObject); - } - -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperXmlFlowELParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperXmlFlowELParser.java deleted file mode 100644 index 3c1d06652..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperXmlFlowELParser.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yomahub.liteflow.parser.el; - -import com.yomahub.liteflow.parser.base.BaseZookeeperXmlFlowParser; -import com.yomahub.liteflow.parser.helper.ParserHelper; -import org.dom4j.Element; - -/** - * 基于zk方式的xml形式EL表达式解析器 - * @author Bryan.Zhang - * @since 2.8.0 - */ -public class ZookeeperXmlFlowELParser extends BaseZookeeperXmlFlowParser { - - public ZookeeperXmlFlowELParser(String node) { - super(node); - } - - @Override - public void parseOneChain(Element chain) { - ParserHelper.parseOneChainEl(chain); - } -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperYmlFlowELParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperYmlFlowELParser.java deleted file mode 100644 index 6ad2b37e5..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/el/ZookeeperYmlFlowELParser.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yomahub.liteflow.parser.el; - -import com.fasterxml.jackson.databind.JsonNode; -import com.yomahub.liteflow.parser.base.BaseZookeeperYmlFlowParser; -import com.yomahub.liteflow.parser.helper.ParserHelper; - -/** - * 基于zk方式的yml形式EL表达式解析器 - * - * @author Bryan.Zhang - * @since 2.8.0 - */ -public class ZookeeperYmlFlowELParser extends BaseZookeeperYmlFlowParser { - public ZookeeperYmlFlowELParser(String node) { - super(node); - } - - @Override - public void parseOneChain(JsonNode chain) { - ParserHelper.parseOneChainEl(chain); - } -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/FlowParserProvider.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/FlowParserProvider.java index fe6d1d34a..3b651ce84 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/FlowParserProvider.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/FlowParserProvider.java @@ -36,24 +36,10 @@ public class FlowParserProvider { private static final String LOCAL_EL_YML_CONFIG_REGEX = "^[\\w\\:\\-\\@\\/\\\\\\*]+\\.el\\.yml$"; - private static final String FORMAT_EL_XML_CONFIG_REGEX = "el_xml:.+"; - - private static final String FORMAT_EL_JSON_CONFIG_REGEX = "el_json:.+"; - - private static final String FORMAT_EL_YML_CONFIG_REGEX = "el_yml:.+"; - - private static final String FORMAT_XML_CONFIG_REGEX = "xml:.+"; - - private static final String FORMAT_JSON_CONFIG_REGEX = "json:.+"; - - private static final String FORMAT_YML_CONFIG_REGEX = "yml:.+"; - private static final String PREFIX_FORMAT_CONFIG_REGEX = "xml:|json:|yml:|el_xml:|el_json:|el_yml:"; private static final String CLASS_CONFIG_REGEX = "^(xml:|json:|yml:|el_xml:|el_json:|el_yml:)?\\w+(\\.\\w+)*$"; - private static final String ZK_CONFIG_REGEX = "(xml:|json:|yml:|el_xml:|el_json:|el_yml:)?[\\w\\d][\\w\\d\\.]+\\:(\\d)+(\\,[\\w\\d][\\w\\d\\.]+\\:(\\d)+)*"; - /** * 根据配置的地址找到对应的解析器 */ @@ -118,34 +104,6 @@ public class FlowParserProvider { String errorMsg = StrUtil.format("can't support the format {}", path); throw new ErrorSupportPathException(errorMsg); } - else if (isZKConfig(path)) { - FlowParserFactory factory = new ZookeeperParserFactory(); - if (ReUtil.isMatch(FORMAT_XML_CONFIG_REGEX, path)) { - LOG.info("flow info loaded from Zookeeper,zkNode={},format type={}", path, TYPE_XML.getType()); - return factory.createXmlParser(path); - } - else if (ReUtil.isMatch(FORMAT_JSON_CONFIG_REGEX, path)) { - LOG.info("flow info loaded from Zookeeper,zkNode={},format type={}", path, TYPE_JSON.getType()); - return factory.createJsonParser(path); - } - else if (ReUtil.isMatch(FORMAT_YML_CONFIG_REGEX, path)) { - LOG.info("flow info loaded from Zookeeper,zkNode={},format type={}", path, TYPE_YML.getType()); - return factory.createYmlParser(path); - } - else if (ReUtil.isMatch(FORMAT_EL_XML_CONFIG_REGEX, path)) { - LOG.info("flow info loaded from Zookeeper with el,zkNode={},format type={}", path, TYPE_EL_XML.getType()); - return factory.createXmlELParser(path); - } - else if (ReUtil.isMatch(FORMAT_EL_YML_CONFIG_REGEX, path)) { - LOG.info("flow info loaded from Zookeeper with el,zkNode={},format type={}", path, TYPE_EL_YML.getType()); - return factory.createYmlELParser(path); - } - else if (ReUtil.isMatch(FORMAT_EL_JSON_CONFIG_REGEX, path)) { - LOG.info("flow info loaded from Zookeeper with el,zkNode={},format type={}", path, TYPE_EL_JSON.getType()); - return factory.createJsonELParser(path); - } - - } // not found String errorMsg = StrUtil.format("can't find the parser for path:{}", path); @@ -170,11 +128,4 @@ public class FlowParserProvider { private static boolean isClassConfig(String path) { return ReUtil.isMatch(CLASS_CONFIG_REGEX, path); } - - /** - * 判定是否为zk配置 - */ - private static boolean isZKConfig(String path) { - return ReUtil.isMatch(ZK_CONFIG_REGEX, path); - } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/ZookeeperParserFactory.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/ZookeeperParserFactory.java deleted file mode 100644 index deec5f84d..000000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/factory/ZookeeperParserFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.yomahub.liteflow.parser.factory; - -import com.yomahub.liteflow.parser.*; -import com.yomahub.liteflow.parser.base.BaseJsonFlowParser; -import com.yomahub.liteflow.parser.base.BaseXmlFlowParser; -import com.yomahub.liteflow.parser.base.BaseYmlFlowParser; -import com.yomahub.liteflow.parser.el.*; -import com.yomahub.liteflow.property.LiteflowConfigGetter; - -/** - * Class文件 - *

- * - * @author junjun - */ -public class ZookeeperParserFactory implements FlowParserFactory { - - @Override - public BaseJsonFlowParser createJsonParser(String path) { - return new ZookeeperJsonFlowParser(LiteflowConfigGetter.get().getZkNode()); - } - - @Override - public BaseXmlFlowParser createXmlParser(String path) { - return new ZookeeperXmlFlowParser(LiteflowConfigGetter.get().getZkNode()); - } - - @Override - public BaseYmlFlowParser createYmlParser(String path) { - return new ZookeeperYmlFlowParser(LiteflowConfigGetter.get().getZkNode()); - } - - @Override - public BaseJsonFlowParser createJsonELParser(String path) { - return new ZookeeperJsonFlowELParser(LiteflowConfigGetter.get().getZkNode()); - } - - @Override - public BaseXmlFlowParser createXmlELParser(String path) { - return new ZookeeperXmlFlowELParser(LiteflowConfigGetter.get().getZkNode()); - } - - @Override - public BaseYmlFlowParser createYmlELParser(String path) { - return new ZookeeperYmlFlowELParser(LiteflowConfigGetter.get().getZkNode()); - } -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/spi/ParserClassNameSpi.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/spi/ParserClassNameSpi.java new file mode 100644 index 000000000..6466ed9bb --- /dev/null +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/spi/ParserClassNameSpi.java @@ -0,0 +1,11 @@ +package com.yomahub.liteflow.parser.spi; + +/** + * 解析器SPI插件接口 + * @author Bryan.Zhang + * @since 2.8.6 + */ +public interface ParserClassNameSpi { + + String getSpiClassName(); +} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfig.java b/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfig.java index f50d8f46c..671f08b02 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfig.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfig.java @@ -29,8 +29,8 @@ public class LiteflowConfig { //流程定义资源地址 private String ruleSource; - //zk配置的node定义 - private String zkNode; + //流程资源扩展数据 + private String ruleSourceExtData; //slot的数量 private Integer slotSize; @@ -242,18 +242,6 @@ public class LiteflowConfig { this.retryCount = retryCount; } - public String getZkNode() { - if (StrUtil.isBlank(zkNode)) { - return "/lite-flow/flow"; - } else { - return zkNode; - } - } - - public void setZkNode(String zkNode) { - this.zkNode = zkNode; - } - public Boolean getPrintBanner() { if (ObjectUtil.isNull(printBanner)) { return Boolean.TRUE; @@ -344,4 +332,12 @@ public class LiteflowConfig { public void setSubstituteCmpClass(String substituteCmpClass) { this.substituteCmpClass = substituteCmpClass; } + + public String getRuleSourceExtData() { + return ruleSourceExtData; + } + + public void setRuleSourceExtData(String ruleSourceExtData) { + this.ruleSourceExtData = ruleSourceExtData; + } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfigGetter.java b/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfigGetter.java index 04a8098a9..c5951338e 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfigGetter.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfigGetter.java @@ -16,7 +16,7 @@ public class LiteflowConfigGetter { //这里liteflowConfig不可能为null //如果在springboot环境，由于自动装配，所以不可能为null //在spring环境，如果xml没配置，在FlowExecutor的init时候就已经报错了 - //只有在非spring环境下，是为null + //非spring环境下，FlowExecutorHolder.loadInstance(config)的时候，会把config放入这个类的静态属性中 if (ObjectUtil.isNull(liteflowConfig)){ liteflowConfig = new LiteflowConfig(); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/util/JsonUtil.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/JsonUtil.java index 2642bc9de..9ca896fcf 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/util/JsonUtil.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/JsonUtil.java @@ -54,4 +54,17 @@ public class JsonUtil { throw new JsonProcessException(errMsg); } } + + public static T parseObject(String json, Class clazz){ + if (StrUtil.isEmpty(json)) { + return null; + } + try { + return objectMapper.readValue(json, clazz); + } catch (IOException e) { + String errMsg = StrUtil.format("Error while parsing text [{}],reason: {}", json, e.getMessage()); + LOG.error(e.getMessage(), e); + throw new JsonProcessException(errMsg); + } + } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java index c7ee90b91..e2cf6fe95 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java @@ -13,7 +13,7 @@ public class LOGOPrinter { /** * LiteFlow 当前版本号 */ - private static final String VERSION_NO = "v2.8.6-BETA"; + private static final String VERSION_NO = "v2.9.0"; public static void print() { StringBuilder str = new StringBuilder("\n"); diff --git a/liteflow-rule-zk/pom.xml b/liteflow-rule-zk/pom.xml new file mode 100644 index 000000000..740cfd04d --- /dev/null +++ b/liteflow-rule-zk/pom.xml @@ -0,0 +1,46 @@ + + + + com.yomahub + liteflow + ${revision} + ../pom.xml + + 4.0.0 + + liteflow-rule-zk + + + + com.yomahub + liteflow-core + ${revision} + true + + + + org.apache.curator + curator-framework + + + log4j + log4j + + + slf4j-api + org.slf4j + + + commons-lang + commons-lang + + + + + org.apache.curator + curator-recipes + + + \ No newline at end of file diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java new file mode 100644 index 000000000..694ae1c69 --- /dev/null +++ b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java @@ -0,0 +1,17 @@ +package com.yomahub.liteflow.parser.spi.zk; + + +import com.yomahub.liteflow.parser.spi.ParserClassNameSpi; +import com.yomahub.liteflow.parser.zk.ZkXmlELParser; + +/** + * ZK解析器SPI实现 + * @author Bryan.Zhang + * @since 2.8.6 + */ +public class ZkParserClassNameSpi implements ParserClassNameSpi { + @Override + public String getSpiClassName() { + return ZkXmlELParser.class.getName(); + } +} diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java new file mode 100644 index 000000000..88e231f76 --- /dev/null +++ b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java @@ -0,0 +1,69 @@ +package com.yomahub.liteflow.parser.zk; + +import cn.hutool.core.util.StrUtil; +import com.yomahub.liteflow.parser.el.ClassXmlFlowELParser; +import com.yomahub.liteflow.parser.zk.exception.ZkException; +import com.yomahub.liteflow.parser.zk.util.ZkParserHelper; +import com.yomahub.liteflow.parser.zk.vo.ZkParserVO; +import com.yomahub.liteflow.property.LiteflowConfig; +import com.yomahub.liteflow.property.LiteflowConfigGetter; +import com.yomahub.liteflow.util.JsonUtil; +import org.apache.curator.framework.CuratorFramework; + +import java.util.function.Consumer; + +/** + * ZK解析器实现，只支持EL形式的XML，不支持其他的形式 + * @author Bryan.Zhang + * @since 2.8.6 + */ +public class ZkXmlELParser extends ClassXmlFlowELParser { + + private final ZkParserHelper zkParserHelper; + + public ZkXmlELParser() { + Consumer parseConsumer = t -> { + try { + parse(t); + } catch (Exception e) { + throw new RuntimeException(e); + } + }; + LiteflowConfig liteflowConfig = LiteflowConfigGetter.get(); + + if (StrUtil.isBlank(liteflowConfig.getRuleSourceExtData())){ + throw new ZkException("rule-source-ext-data is empty"); + } + + try{ + ZkParserVO zkParserVO = JsonUtil.parseObject(liteflowConfig.getRuleSourceExtData(), ZkParserVO.class); + assert zkParserVO != null; + + if (StrUtil.isBlank(zkParserVO.getNodePath())){ + zkParserVO.setNodePath("/lite-flow/flow"); + } + if (StrUtil.isBlank(zkParserVO.getConnectStr())){ + throw new ZkException("zk connect string is empty"); + } + + zkParserHelper = new ZkParserHelper(zkParserVO, parseConsumer); + }catch (Exception e){ + throw new ZkException(e.getMessage()); + } + } + + @Override + public String parseCustom() { + try{ + String content = zkParserHelper.getContent(); + + zkParserHelper.checkContent(content); + + zkParserHelper.listenZkNode(); + + return content; + }catch (Exception e){ + throw new ZkException(e.getMessage()); + } + } +} diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java new file mode 100644 index 000000000..a7b315fe3 --- /dev/null +++ b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java @@ -0,0 +1,23 @@ + +package com.yomahub.liteflow.parser.zk.exception; + +public class ZkException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + /** 异常信息 */ + private String message; + + public ZkException(String message) { + this.message = message; + } + + @Override + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ZkParserHelper.java b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java similarity index 50% rename from liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ZkParserHelper.java rename to liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java index aa09b4a3b..96b1e476d 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ZkParserHelper.java +++ b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java @@ -1,7 +1,9 @@ -package com.yomahub.liteflow.parser.helper; +package com.yomahub.liteflow.parser.zk.util; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.exception.ParseException; +import com.yomahub.liteflow.parser.zk.exception.ZkException; +import com.yomahub.liteflow.parser.zk.vo.ZkParserVO; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.cache.NodeCache; @@ -10,63 +12,61 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.text.MessageFormat; -import java.util.List; import java.util.function.Consumer; public class ZkParserHelper { private static final Logger LOG = LoggerFactory.getLogger(ZkParserHelper.class); - private final String nodePath; + private final ZkParserVO zkParserVO; private final Consumer parseConsumer; - public ZkParserHelper(String node, Consumer parseConsumer) { - this.nodePath = node; + private final CuratorFramework client; + + public ZkParserHelper(ZkParserVO zkParserVO, Consumer parseConsumer) { + this.zkParserVO = zkParserVO; this.parseConsumer = parseConsumer; + + try{ + CuratorFramework client = CuratorFrameworkFactory.newClient( + zkParserVO.getConnectStr(), + new RetryNTimes(10, 5000) + ); + client.start(); + + if (client.checkExists().forPath(zkParserVO.getNodePath()) == null) { + client.create().creatingParentsIfNeeded().forPath(zkParserVO.getNodePath(), "".getBytes()); + } + this.client = client; + }catch (Exception e){ + throw new ZkException(e.getMessage()); + } + } - /** - * 获取zk客户端 - * - * @param pathList zk路径 - * @return - * @throws Exception - */ - public CuratorFramework getZkCuratorFramework(List pathList) throws Exception { - //zk不允许有多个path - String path = pathList.get(0); - CuratorFramework client = CuratorFrameworkFactory.newClient( - path, - new RetryNTimes(10, 5000) - ); - client.start(); - - if (client.checkExists().forPath(nodePath) == null) { - client.create().creatingParentsIfNeeded().forPath(nodePath, "".getBytes()); + public String getContent(){ + try{ + return new String(client.getData().forPath(zkParserVO.getNodePath())); + }catch (Exception e){ + throw new ZkException(e.getMessage()); } - return client; } /** * 检查 content 是否合法 - * - * @param content 内容 */ public void checkContent(String content) { if (StrUtil.isBlank(content)) { - String error = MessageFormat.format("the node[{0}] value is empty", nodePath); + String error = MessageFormat.format("the node[{0}] value is empty", zkParserVO.getNodePath()); throw new ParseException(error); } } /** * 监听 zk 节点 - * - * @param client zk 客户端 - * @throws Exception */ - public void listenZkNode(CuratorFramework client) throws Exception { - final NodeCache cache = new NodeCache(client, nodePath); + public void listenZkNode() throws Exception { + final NodeCache cache = new NodeCache(client, zkParserVO.getNodePath()); cache.start(); cache.getListenable().addListener(() -> { diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java new file mode 100644 index 000000000..315797a8b --- /dev/null +++ b/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java @@ -0,0 +1,29 @@ +package com.yomahub.liteflow.parser.zk.vo; + +/** + * 用于解析RuleSourceExtData的vo类，用于zk模式中 + * @author Bryan.Zhang + * @since 2.8.6 + */ +public class ZkParserVO { + + private String connectStr; + + private String nodePath; + + public String getConnectStr() { + return connectStr; + } + + public void setConnectStr(String connectStr) { + this.connectStr = connectStr; + } + + public String getNodePath() { + return nodePath; + } + + public void setNodePath(String nodePath) { + this.nodePath = nodePath; + } +} diff --git a/liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi b/liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi new file mode 100644 index 000000000..ba7604419 --- /dev/null +++ b/liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi @@ -0,0 +1 @@ +com.yomahub.liteflow.parser.spi.zk.ZkParserClassNameSpi \ No newline at end of file diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java index 1ad21adcc..884ac5de2 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java @@ -15,8 +15,8 @@ public class LiteflowProperty { //流程定义资源地址 private String ruleSource; - //zk配置的node节点地址 - private String zkNode; + //流程资源扩展数据 + private String ruleSourceExtData; //slot的数量 private int slotSize; @@ -137,14 +137,6 @@ public class LiteflowProperty { this.retryCount = retryCount; } - public String getZkNode() { - return zkNode; - } - - public void setZkNode(String zkNode) { - this.zkNode = zkNode; - } - public boolean isPrintBanner() { return printBanner; } @@ -208,4 +200,12 @@ public class LiteflowProperty { public void setSubstituteCmpClass(String substituteCmpClass) { this.substituteCmpClass = substituteCmpClass; } + + public String getRuleSourceExtData() { + return ruleSourceExtData; + } + + public void setRuleSourceExtData(String ruleSourceExtData) { + this.ruleSourceExtData = ruleSourceExtData; + } } diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java index 80986b4bf..75b568c63 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java @@ -25,6 +25,7 @@ public class LiteflowPropertyAutoConfiguration { public LiteflowConfig liteflowConfig(LiteflowProperty property, LiteflowMonitorProperty liteflowMonitorProperty){ LiteflowConfig liteflowConfig = new LiteflowConfig(); liteflowConfig.setRuleSource(property.getRuleSource()); + liteflowConfig.setRuleSourceExtData(property.getRuleSourceExtData()); liteflowConfig.setSlotSize(property.getSlotSize()); liteflowConfig.setThreadExecutorClass(property.getThreadExecutorClass()); liteflowConfig.setWhenMaxWaitSeconds(property.getWhenMaxWaitSeconds()); @@ -38,7 +39,6 @@ public class LiteflowPropertyAutoConfiguration { liteflowConfig.setEnable(property.isEnable()); liteflowConfig.setSupportMultipleType(property.isSupportMultipleType()); liteflowConfig.setRetryCount(property.getRetryCount()); - liteflowConfig.setZkNode(property.getZkNode()); liteflowConfig.setPrintBanner(property.isPrintBanner()); liteflowConfig.setNodeExecutorClass(property.getNodeExecutorClass()); liteflowConfig.setRequestIdGeneratorClass(property.getRequestIdGeneratorClass()); diff --git a/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 51b0a3324..b60dcf563 100644 --- a/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,5 +1,11 @@ { "properties": [ + { + "name": "liteflow.rule-source-ext-data", + "type": "java.lang.String", + "description": "rule source extended data.", + "sourceType": "com.yomahub.liteflow.springboot.LiteflowProperty" + }, { "name": "liteflow.request-id-generator-class", "type": "java.lang.String", @@ -28,13 +34,6 @@ "sourceType": "com.yomahub.liteflow.springboot.LiteflowProperty", "defaultValue": true }, - { - "name": "liteflow.zk-node", - "type": "java.lang.String", - "description": "Node definition for ZK configuration.", - "sourceType": "com.yomahub.liteflow.springboot.LiteflowProperty", - "defaultValue": "/lite-flow/flow" - }, { "name": "liteflow.slot-size", "type": "java.lang.Integer", diff --git a/liteflow-spring-boot-starter/src/main/resources/META-INF/liteflow-default.properties b/liteflow-spring-boot-starter/src/main/resources/META-INF/liteflow-default.properties index 50264318f..35a41afd5 100644 --- a/liteflow-spring-boot-starter/src/main/resources/META-INF/liteflow-default.properties +++ b/liteflow-spring-boot-starter/src/main/resources/META-INF/liteflow-default.properties @@ -1,6 +1,5 @@ liteflow.enable=true liteflow.print-banner=true -liteflow.zk-node=/lite-flow/flow liteflow.slot-size=1024 liteflow.main-executor-works=64 liteflow.main-executor-class=com.yomahub.liteflow.thread.LiteFlowDefaultMainExecutorBuilder diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELDeclSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELDeclSpringbootTest.java deleted file mode 100644 index 9c4081e83..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELDeclSpringbootTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-json.properties") -@SpringBootTest(classes = ZkNodeWithJsonELDeclSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithJsonELDeclSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithJson() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELDeclSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELDeclSpringbootTest.java deleted file mode 100644 index d578554ad..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELDeclSpringbootTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为xml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-xml.properties") -@SpringBootTest(classes = ZkNodeWithXmlELDeclSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithXmlELDeclSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithXml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELDeclSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELDeclSpringbootTest.java deleted file mode 100644 index 4776d94ea..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELDeclSpringbootTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-yml.properties") -@SpringBootTest(classes = ZkNodeWithYmlELDeclSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithYmlELDeclSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithYml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java deleted file mode 100644 index 31ae50e37..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import org.springframework.stereotype.Component; - -@Component("a") -@LiteflowCmpDefine -public class ACmp{ - - @LiteflowMethod(LiteFlowMethodEnum.PROCESS) - public void process(NodeComponent bindCmp) { - System.out.println("ACmp executed!"); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java deleted file mode 100644 index 0599bc17f..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import org.springframework.stereotype.Component; - -@Component("b") -@LiteflowCmpDefine -public class BCmp{ - - @LiteflowMethod(LiteFlowMethodEnum.PROCESS) - public void process(NodeComponent bindCmp) { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java deleted file mode 100644 index cddcc3365..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import org.springframework.stereotype.Component; - -@Component("c") -@LiteflowCmpDefine -public class CCmp{ - - @LiteflowMethod(LiteFlowMethodEnum.PROCESS) - public void process(NodeComponent bindCmp) { - System.out.println("CCmp executed!"); - } - -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-json.properties b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-json.properties deleted file mode 100644 index e8d44c429..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-json.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=el_json:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-xml.properties b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-xml.properties deleted file mode 100644 index e3a6e33db..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-xml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=el_xml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-yml.properties b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-yml.properties deleted file mode 100644 index 8022eb56f..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/application-yml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=el_yml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.json b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.json deleted file mode 100644 index e78b1e919..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flow": { - "chain": [ - { - "name": "chain1", - "value": "THEN(a, b, c);" - } - ] - } -} \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.yml b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.yml deleted file mode 100644 index 2b7bfd1dc..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.yml +++ /dev/null @@ -1,4 +0,0 @@ -flow: - chain: - - name: chain1 - value: "THEN(a, b, c);" \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java deleted file mode 100644 index 29e0815cd..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.core.FlowExecutorHolder; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.property.LiteflowConfig; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * 非spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -public class ZkNodeWithJsonTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - private static FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - - LiteflowConfig config = new LiteflowConfig(); - config.setRuleSource("el_json:127.0.0.1:21810"); - flowExecutor = FlowExecutorHolder.loadInstance(config); - } - - @Test - public void testZkNodeWithJson() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java deleted file mode 100644 index 7f8e0569c..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.core.FlowExecutorHolder; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.property.LiteflowConfig; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * 非spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为xml文件 - * @author zendwang - * @since 2.5.0 - */ -public class ZkNodeWithXmlTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - private static FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - - LiteflowConfig config = new LiteflowConfig(); - config.setRuleSource("el_xml:127.0.0.1:21810"); - flowExecutor = FlowExecutorHolder.loadInstance(config); - } - - @Test - public void testZkNodeWithXml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java deleted file mode 100644 index 223c54a5a..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.core.FlowExecutorHolder; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.property.LiteflowConfig; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * 非spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -public class ZkNodeWithYmlTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - private static FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - - LiteflowConfig config = new LiteflowConfig(); - config.setRuleSource("el_yml:127.0.0.1:21810"); - flowExecutor = FlowExecutorHolder.loadInstance(config); - } - - @Test - public void testZkNodeWithYml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java deleted file mode 100644 index 9201a7b6b..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; - -public class ACmp extends NodeComponent { - - @Override - public void process() { - System.out.println("ACmp executed!"); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java deleted file mode 100644 index da6444f5f..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; - -public class BCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java deleted file mode 100644 index a4d7ed06b..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; - -public class CCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("CCmp executed!"); - } - -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringbootTest.java deleted file mode 100644 index bdda819be..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringbootTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-json.properties") -@SpringBootTest(classes = ZkNodeWithJsonELSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithJsonELSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithJson() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringbootTest.java deleted file mode 100644 index d7c0ee58b..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringbootTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-yml.properties") -@SpringBootTest(classes = ZkNodeWithYmlELSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithYmlELSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithYml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-json.properties b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-json.properties deleted file mode 100644 index e8d44c429..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-json.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=el_json:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml-cluster.properties b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml-cluster.properties deleted file mode 100644 index 5a92f38d8..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml-cluster.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=el_xml:127.0.0.1:21810,127.0.0.1:21811,127.0.0.1:21812 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml.properties b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml.properties deleted file mode 100644 index e3a6e33db..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-xml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=el_xml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-yml.properties b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-yml.properties deleted file mode 100644 index 8022eb56f..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/application-yml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=el_yml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.json b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.json deleted file mode 100644 index e78b1e919..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flow": { - "chain": [ - { - "name": "chain1", - "value": "THEN(a, b, c);" - } - ] - } -} \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.xml deleted file mode 100644 index 049210cf4..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - THEN(a, b, c); - - \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.yml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.yml deleted file mode 100644 index 2b7bfd1dc..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/zookeeper/flow.yml +++ /dev/null @@ -1,4 +0,0 @@ -flow: - chain: - - name: chain1 - value: "THEN(a, b, c);" \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringTest.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringTest.java deleted file mode 100644 index 67ffd1646..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonELSpringTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/zookeeper/application-json.xml") -public class ZkNodeWithJsonELSpringTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.el.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void test() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c", response.getExecuteStepStr()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringTest.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringTest.java deleted file mode 100644 index 82fb82ceb..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为xml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/zookeeper/application-xml.xml") -public class ZkNodeWithXmlELSpringTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.el.xml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void test() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c", response.getExecuteStepStr()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringTest.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringTest.java deleted file mode 100644 index 2cdfcb493..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlELSpringTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/zookeeper/application-yml.xml") -public class ZkNodeWithYmlELSpringTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.el.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void test() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c", response.getExecuteStepStr()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java deleted file mode 100644 index f4fcf186d..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("a") -public class ACmp extends NodeComponent { - - @Override - public void process() { - System.out.println("ACmp executed!"); - } -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java deleted file mode 100644 index e621cd1a0..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("b") -public class BCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java deleted file mode 100644 index f428f348b..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("c") -public class CCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("CCmp executed!"); - } - -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-json.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-json.xml deleted file mode 100644 index 1a52574a8..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-json.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-xml.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-xml.xml deleted file mode 100644 index 0f52fdc9b..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-xml.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-yml.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-yml.xml deleted file mode 100644 index 05bb76d31..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/application-yml.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.json deleted file mode 100644 index f4ffa60ea..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flow": { - "chain": [ - { - "name": "chain1", - "value": "THEN(a,b,c)" - } - ] - } -} \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.xml deleted file mode 100644 index 0204879f9..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - THEN(a,b,c) - - \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.yml deleted file mode 100644 index f5bf8e28b..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/zookeeper/flow.el.yml +++ /dev/null @@ -1,5 +0,0 @@ -flow: - chain: - - name: chain1 - value: "THEN(a,b,c)" - diff --git a/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/pom.xml b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/pom.xml new file mode 100644 index 000000000..184f08915 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/pom.xml @@ -0,0 +1,67 @@ + + + + liteflow-testcase-el + com.yomahub + ${revision} + ../pom.xml + + 4.0.0 + + liteflow-testcase-el-zk-springboot + + + + com.yomahub + liteflow-spring-boot-starter + ${revision} + + + + com.yomahub + liteflow-rule-zk + ${revision} + test + + + + org.springframework.boot + spring-boot-starter-test + + + org.aspectj + aspectjweaver + test + + + org.apache.curator + curator-test + test + + + com.101tec + zkclient + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + + \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java new file mode 100644 index 000000000..64886670f --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java @@ -0,0 +1,20 @@ +package com.yomahub.liteflow.test; + +import com.yomahub.liteflow.flow.FlowBus; +import com.yomahub.liteflow.property.LiteflowConfigGetter; +import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner; +import com.yomahub.liteflow.spring.ComponentScanner; +import com.yomahub.liteflow.thread.ExecutorHelper; +import org.junit.AfterClass; + +public class BaseTest { + + @AfterClass + public static void cleanScanCache(){ + ComponentScanner.cleanCache(); + FlowBus.cleanCache(); + ExecutorHelper.loadInstance().clearExecutorServiceMap(); + SpiFactoryCleaner.clean(); + LiteflowConfigGetter.clean(); + } +} diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkClusterWithXmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkClusterWithXmlELSpringbootTest.java similarity index 96% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkClusterWithXmlELSpringbootTest.java rename to liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkClusterWithXmlELSpringbootTest.java index 52f9e8ce3..9d5ba3d86 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkClusterWithXmlELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkClusterWithXmlELSpringbootTest.java @@ -9,7 +9,6 @@ import org.I0Itec.zkclient.exception.ZkMarshallingError; import org.I0Itec.zkclient.serialize.ZkSerializer; import org.apache.curator.test.InstanceSpec; import org.apache.curator.test.TestingCluster; -import org.apache.curator.test.TestingServer; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -23,7 +22,6 @@ import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; /** * springboot环境下的zk cluster的测试 @@ -73,7 +71,7 @@ public class ZkClusterWithXmlELSpringbootTest extends BaseTest { Assert.assertTrue(response.isSuccess()); } -// @AfterClass + @AfterClass public static void tearDown() throws Exception { zkCluster.stop(); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringbootTest.java similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringbootTest.java rename to liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlELSpringbootTest.java diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java rename to liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java diff --git a/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml-cluster.properties b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml-cluster.properties new file mode 100644 index 000000000..377abc1ac --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml-cluster.properties @@ -0,0 +1 @@ +liteflow.rule-source-ext-data={"connectStr":"127.0.0.1:21810,127.0.0.1:21811,127.0.0.1:21812"} \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml.properties b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml.properties new file mode 100644 index 000000000..a1ca68fd0 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/application-xml.properties @@ -0,0 +1 @@ +liteflow.rule-source-ext-data={"connectStr":"127.0.0.1:21810"} \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/flow.xml similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/zookeeper/flow.xml rename to liteflow-testcase-el/liteflow-testcase-el-zk-springboot/src/test/resources/zookeeper/flow.xml diff --git a/liteflow-testcase-el/pom.xml b/liteflow-testcase-el/pom.xml index 5574f1226..ad5434740 100644 --- a/liteflow-testcase-el/pom.xml +++ b/liteflow-testcase-el/pom.xml @@ -21,5 +21,6 @@ liteflow-testcase-el-declare-springboot liteflow-testcase-el-script-groovy-springboot liteflow-testcase-el-script-qlexpress-springboot + liteflow-testcase-el-zk-springboot \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/pom.xml b/liteflow-testcase-old/liteflow-testcase-declare-springboot/pom.xml index cdc8b4bbe..709b54ff6 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/pom.xml +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/pom.xml @@ -29,24 +29,6 @@ aspectjweaver test - - org.apache.curator - curator-test - test - - - com.101tec - zkclient - test - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java deleted file mode 100644 index 109648467..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-json.properties") -@SpringBootTest(classes = ZkNodeWithJsonSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithJsonSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithJson() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java deleted file mode 100644 index 373db08cc..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为xml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-xml.properties") -@SpringBootTest(classes = ZkNodeWithXmlSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithXmlSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithXml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java deleted file mode 100644 index 21a754f19..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-yml.properties") -@SpringBootTest(classes = ZkNodeWithYmlSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithYmlSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithYml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java deleted file mode 100644 index 31ae50e37..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import org.springframework.stereotype.Component; - -@Component("a") -@LiteflowCmpDefine -public class ACmp{ - - @LiteflowMethod(LiteFlowMethodEnum.PROCESS) - public void process(NodeComponent bindCmp) { - System.out.println("ACmp executed!"); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java deleted file mode 100644 index 0599bc17f..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import org.springframework.stereotype.Component; - -@Component("b") -@LiteflowCmpDefine -public class BCmp{ - - @LiteflowMethod(LiteFlowMethodEnum.PROCESS) - public void process(NodeComponent bindCmp) { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java deleted file mode 100644 index cddcc3365..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import org.springframework.stereotype.Component; - -@Component("c") -@LiteflowCmpDefine -public class CCmp{ - - @LiteflowMethod(LiteFlowMethodEnum.PROCESS) - public void process(NodeComponent bindCmp) { - System.out.println("CCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-json.properties b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-json.properties deleted file mode 100644 index 50d6ddca7..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-json.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=json:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-xml.properties b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-xml.properties deleted file mode 100644 index e56e99757..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-xml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=xml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-yml.properties b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-yml.properties deleted file mode 100644 index 9c88b3fd3..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/application-yml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=yml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.json b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.json deleted file mode 100644 index 24615d628..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flow": { - "chain": [ - { - "name": "chain1", - "condition": [ - {"type": "then", "value": "a,b,c"} - ] - } - ] - } -} \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.xml b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.xml deleted file mode 100644 index 22870d94f..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.yml b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.yml deleted file mode 100644 index 3cdaced3e..000000000 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/resources/zookeeper/flow.yml +++ /dev/null @@ -1,6 +0,0 @@ -flow: - chain: - - name: chain1 - condition: - - type: then - value: 'a,b,c' diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/pom.xml b/liteflow-testcase-old/liteflow-testcase-nospring/pom.xml index 6346a3329..6216077a5 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/pom.xml +++ b/liteflow-testcase-old/liteflow-testcase-nospring/pom.xml @@ -28,24 +28,6 @@ junit test - - org.apache.curator - curator-test - test - - - com.101tec - zkclient - test - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java deleted file mode 100644 index 376d00aa0..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.core.FlowExecutorHolder; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.property.LiteflowConfig; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * 非spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -public class ZkNodeWithJsonTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - private static FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - - LiteflowConfig config = new LiteflowConfig(); - config.setRuleSource("json:127.0.0.1:21810"); - flowExecutor = FlowExecutorHolder.loadInstance(config); - } - - @Test - public void testZkNodeWithJson() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java deleted file mode 100644 index 3698bbaad..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.core.FlowExecutorHolder; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.property.LiteflowConfig; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * 非spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为xml文件 - * @author zendwang - * @since 2.5.0 - */ -public class ZkNodeWithXmlTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - private static FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - - LiteflowConfig config = new LiteflowConfig(); - config.setRuleSource("xml:127.0.0.1:21810"); - flowExecutor = FlowExecutorHolder.loadInstance(config); - } - - @Test - public void testZkNodeWithXml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java deleted file mode 100644 index 56d28ba55..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.core.FlowExecutorHolder; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.property.LiteflowConfig; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * 非spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -public class ZkNodeWithYmlTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - private static FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - - LiteflowConfig config = new LiteflowConfig(); - config.setRuleSource("yml:127.0.0.1:21810"); - flowExecutor = FlowExecutorHolder.loadInstance(config); - } - - @Test - public void testZkNodeWithYml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java deleted file mode 100644 index 9201a7b6b..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; - -public class ACmp extends NodeComponent { - - @Override - public void process() { - System.out.println("ACmp executed!"); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java deleted file mode 100644 index da6444f5f..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; - -public class BCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java deleted file mode 100644 index a4d7ed06b..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; - -public class CCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("CCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json deleted file mode 100644 index 097d548c5..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "flow": { - "nodes": { - "node": [ - { - "id": "a", - "class": "com.yomahub.liteflow.test.zookeeper.cmp.ACmp" - }, - { - "id": "b", - "class": "com.yomahub.liteflow.test.zookeeper.cmp.BCmp" - }, - { - "id": "c", - "class": "com.yomahub.liteflow.test.zookeeper.cmp.CCmp" - } - ] - }, - "chain": [ - { - "name": "chain1", - "condition": [ - {"type": "then", "value": "a,b,c"} - ] - } - ] - } -} \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml deleted file mode 100644 index 5edf60188..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml deleted file mode 100644 index 935c50bd5..000000000 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml +++ /dev/null @@ -1,14 +0,0 @@ -flow: - nodes: - node: - - id: a - class: com.yomahub.liteflow.test.zookeeper.cmp.ACmp - - id: b - class: com.yomahub.liteflow.test.zookeeper.cmp.BCmp - - id: c - class: com.yomahub.liteflow.test.zookeeper.cmp.CCmp - chain: - - name: chain1 - condition: - - type: then - value: 'a,b,c' diff --git a/liteflow-testcase-old/liteflow-testcase-script-groovy-springboot/pom.xml b/liteflow-testcase-old/liteflow-testcase-script-groovy-springboot/pom.xml index d3b3faf91..ab7e1afe0 100644 --- a/liteflow-testcase-old/liteflow-testcase-script-groovy-springboot/pom.xml +++ b/liteflow-testcase-old/liteflow-testcase-script-groovy-springboot/pom.xml @@ -28,24 +28,6 @@ aspectjweaver test - - org.apache.curator - curator-test - test - - - com.101tec - zkclient - test - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - com.yomahub liteflow-script-groovy diff --git a/liteflow-testcase-old/liteflow-testcase-script-qlexpress-springboot/pom.xml b/liteflow-testcase-old/liteflow-testcase-script-qlexpress-springboot/pom.xml index 0db21a15b..3a9255167 100644 --- a/liteflow-testcase-old/liteflow-testcase-script-qlexpress-springboot/pom.xml +++ b/liteflow-testcase-old/liteflow-testcase-script-qlexpress-springboot/pom.xml @@ -27,23 +27,6 @@ org.aspectj aspectjweaver - - org.apache.curator - curator-test - test - - - com.101tec - zkclient - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - com.yomahub liteflow-script-qlexpress diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/pom.xml b/liteflow-testcase-old/liteflow-testcase-springboot/pom.xml index ab3158c80..da3a69ca5 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/pom.xml +++ b/liteflow-testcase-old/liteflow-testcase-springboot/pom.xml @@ -27,22 +27,6 @@ org.aspectj aspectjweaver - - org.apache.curator - curator-test - - - com.101tec - zkclient - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java deleted file mode 100644 index 109648467..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-json.properties") -@SpringBootTest(classes = ZkNodeWithJsonSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithJsonSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithJson() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java deleted file mode 100644 index 373db08cc..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为xml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-xml.properties") -@SpringBootTest(classes = ZkNodeWithXmlSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithXmlSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithXml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java deleted file mode 100644 index 21a754f19..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -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.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * springboot环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/zookeeper/application-yml.properties") -@SpringBootTest(classes = ZkNodeWithYmlSpringbootTest.class) -@EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.zookeeper.cmp"}) -public class ZkNodeWithYmlSpringbootTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void testZkNodeWithYml() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java deleted file mode 100644 index f4fcf186d..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("a") -public class ACmp extends NodeComponent { - - @Override - public void process() { - System.out.println("ACmp executed!"); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java deleted file mode 100644 index e621cd1a0..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("b") -public class BCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java deleted file mode 100644 index f428f348b..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("c") -public class CCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("CCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-json.properties b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-json.properties deleted file mode 100644 index 50d6ddca7..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-json.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=json:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-xml.properties b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-xml.properties deleted file mode 100644 index e56e99757..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-xml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=xml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-yml.properties b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-yml.properties deleted file mode 100644 index 9c88b3fd3..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/application-yml.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=yml:127.0.0.1:21810 \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json deleted file mode 100644 index 24615d628..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flow": { - "chain": [ - { - "name": "chain1", - "condition": [ - {"type": "then", "value": "a,b,c"} - ] - } - ] - } -} \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.xml b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.xml deleted file mode 100644 index 22870d94f..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.yml b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.yml deleted file mode 100644 index 3cdaced3e..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.yml +++ /dev/null @@ -1,6 +0,0 @@ -flow: - chain: - - name: chain1 - condition: - - type: then - value: 'a,b,c' diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/pom.xml b/liteflow-testcase-old/liteflow-testcase-springnative/pom.xml index 7868de224..7cef82fa3 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/pom.xml +++ b/liteflow-testcase-old/liteflow-testcase-springnative/pom.xml @@ -41,22 +41,6 @@ junit test - - org.apache.curator - curator-test - - - com.101tec - zkclient - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - org.aspectj aspectjweaver diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java deleted file mode 100644 index 604619231..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为json文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/zookeeper/application-json.xml") -public class ZkNodeWithJsonSpringTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void test() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c", response.getExecuteStepStr()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java deleted file mode 100644 index cdbdc4ec8..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为xml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/zookeeper/application-xml.xml") -public class ZkNodeWithXmlSpringTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void test() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c", response.getExecuteStepStr()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java deleted file mode 100644 index 0d994c94b..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.yomahub.liteflow.test.zookeeper; - -import cn.hutool.core.io.resource.ResourceUtil; -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import com.yomahub.liteflow.slot.DefaultContext; -import com.yomahub.liteflow.test.BaseTest; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkMarshallingError; -import org.I0Itec.zkclient.serialize.ZkSerializer; -import org.apache.curator.test.TestingServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.nio.charset.Charset; -import java.util.concurrent.CountDownLatch; - -/** - * spring环境下的zk配置源功能测试 - * ZK节点存储数据的格式为yml文件 - * @author zendwang - * @since 2.5.0 - */ -@RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/zookeeper/application-yml.xml") -public class ZkNodeWithYmlSpringTest extends BaseTest { - - private static final String ZK_NODE_PATH = "/lite-flow/flow"; - - private static TestingServer zkServer; - - @Resource - private FlowExecutor flowExecutor; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - zkServer = new TestingServer(21810); - CountDownLatch latch = new CountDownLatch(1); - new Thread(() -> { - String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); - ZkClient zkClient = new ZkClient("127.0.0.1:21810"); - zkClient.setZkSerializer(new ZkSerializer() { - @Override - public byte[] serialize(final Object o) throws ZkMarshallingError { - return o.toString().getBytes(Charset.forName("UTF-8")); - } - - @Override - public Object deserialize(final byte[] bytes) throws ZkMarshallingError { - return new String(bytes, Charset.forName("UTF-8")); - } - }); - zkClient.createPersistent(ZK_NODE_PATH, true); - zkClient.writeData(ZK_NODE_PATH, data); - zkClient.close(); - latch.countDown(); - }).start(); - latch.await(); - } - - @Test - public void test() { - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c", response.getExecuteStepStr()); - } - - @AfterClass - public static void tearDown() throws Exception { - zkServer.stop(); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java deleted file mode 100644 index f4fcf186d..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("a") -public class ACmp extends NodeComponent { - - @Override - public void process() { - System.out.println("ACmp executed!"); - } -} diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java deleted file mode 100644 index e621cd1a0..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("b") -public class BCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java deleted file mode 100644 index f428f348b..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - *

Title: liteflow

- *

Description: 轻量级的组件式流程框架

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.zookeeper.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("c") -public class CCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("CCmp executed!"); - } - -} diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-json.xml b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-json.xml deleted file mode 100644 index 225524836..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-json.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-xml.xml b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-xml.xml deleted file mode 100644 index b9f633001..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-xml.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-yml.xml b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-yml.xml deleted file mode 100644 index b51092eaf..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/application-yml.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json deleted file mode 100644 index 24615d628..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "flow": { - "chain": [ - { - "name": "chain1", - "condition": [ - {"type": "then", "value": "a,b,c"} - ] - } - ] - } -} \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.xml b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.xml deleted file mode 100644 index 22870d94f..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.yml b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.yml deleted file mode 100644 index 3cdaced3e..000000000 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.yml +++ /dev/null @@ -1,6 +0,0 @@ -flow: - chain: - - name: chain1 - condition: - - type: then - value: 'a,b,c' diff --git a/pom.xml b/pom.xml index d00e30380..28a50e57d 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ - 2.8.6-BETA + 2.9.0 UTF-8 UTF-8 8 @@ -140,15 +140,11 @@ org.slf4j - provided - true org.apache.curator curator-recipes ${curator.version} - provided - true cn.hutool @@ -170,8 +166,6 @@ com.101tec zkclient ${zkclient.version} - provided - true @@ -331,6 +325,7 @@ liteflow-spring liteflow-testcase-old liteflow-testcase-el + liteflow-rule-zk