diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java index 25bfb884..eacbbd36 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/ElRegexUtil.java @@ -19,7 +19,7 @@ public class ElRegexUtil { private static final String REGEX_COMMENT = "(? - {3}=THEN(a,b); - {4}=j; + {{3}}=THEN(a,b); + {{4}}=j; - {3}=THEN(a,b); - {4}=THEN(a,b).id("j"); + {{3}}=THEN(a,b); + {{4}}=THEN(a,b).id("j"); - THEN(a, b, {0}, {1}) + THEN(a, b, {{0}}, {{1}}) - {0}=IF(c, d, e); - {1}=SWITCH(f).to(j,k); + {{0}}=IF(c, d, e); + {{1}}=SWITCH(f).to(j,k); - {0}=THEN(a,b,{3}); - {1}=SWITCH(f).to({4},k); + {{0}}=THEN(a,b,{{3}}); + {{1}}=SWITCH(f).to({{4}},k); - THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain}) + THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}}) - {_pre} = THEN(a,b); - {mainChain}=THEN(a,b); - {subChain1}=THEN(j,k); - {subChain2}=IF(c, d, e); - {end_chain}=SWITCH(f).to(j,k); + {{_pre}} = THEN(a,b); + {{mainChain}}=THEN(a,b); + {{subChain1}}=THEN(j,k); + {{subChain2}}=IF(c, d, e); + {{end_chain}}=SWITCH(f).to(j,k); \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml index e1ec5e50..10bea73e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml @@ -2,22 +2,22 @@ flow: chain: - id: implB extends: base2 - value: "{3}=THEN(a,b);\n {4}=j;" + value: "{{3}}=THEN(a,b);\n {{4}}=j;" - id: implC extends: base2 - value: "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + value: "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" - id: base abstract: true - value: "THEN(a, b, {0}, {1});" + value: "THEN(a, b, {{0}}, {{1}});" - id: implA extends: base - value: "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + value: "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" - id: base2 extends: base abstract: true - value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + value: "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" - id: base3 - value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})" + value: "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}})" - id: implD extends: base3 - value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + value: "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json index d6faf3c6..2d9e3767 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json @@ -4,37 +4,35 @@ { "id": "implB", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=j;" + "value": "{{3}}=THEN(a,b);\n {{4}}=j;" }, { "id": "implC", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + "value": "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" }, { "id": "base", - "abstract": true, - "value": "THEN(a, b, {0}, {1});" + "value": "THEN(a, b, {{0}}, {{1}});" }, { "id": "implA", "extends": "base", - "value": "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + "value": "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" }, { "id": "base2", "extends": "base", - "abstract": true, - "value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + "value": "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" }, { "id": "base3", - "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});" + "value": "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}});" }, { "id": "implD", "extends": "base3", - "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + "value": "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" } ] } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml index a5cfb055..55d1a0ea 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml @@ -1,38 +1,38 @@ - {3}=THEN(a,b); - {4}=j; + {{3}}=THEN(a,b); + {{4}}=j; - {3}=THEN(a,b); - {4}=THEN(a,b).id("j"); + {{3}} = THEN(a,b); + {{4}}=THEN(a,b).id("j"); - - THEN(a, b, {0}, {1}) + + THEN(a, b, {{0}}, {{1}}) - {0}=IF(c, d, e); - {1}=SWITCH(f).to(j,k); + {{0}}=IF(c, d, e); + {{1}}=SWITCH(f).to(j,k); - - {0}=THEN(a,b,{3}); - {1}=SWITCH(f).to({4},k); + + {{0}}=THEN(a,b,{{3}}); + {{1}}=SWITCH(f).to({{4}},k); + - THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain}) + THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}}) - {_pre} = THEN(a,b); - {mainChain}=THEN(a,b); - {subChain1}=THEN(j,k); - {subChain2}=IF(c, d, e); - {end_chain}=SWITCH(f).to(j,k); + {{_pre}} = THEN(a,b); + {{mainChain}}=THEN(a,b); + {{subChain1}}=THEN(j,k); + {{subChain2}}=IF(c, d, e); + {{end_chain}}=SWITCH(f).to(j,k); - \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml index e1ec5e50..d2f80dce 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml @@ -2,22 +2,20 @@ flow: chain: - id: implB extends: base2 - value: "{3}=THEN(a,b);\n {4}=j;" + value: "{{3}}=THEN(a,b);\n {{4}}=j;" - id: implC extends: base2 - value: "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + value: "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" - id: base - abstract: true - value: "THEN(a, b, {0}, {1});" + value: "THEN(a, b, {{0}}, {{1}});" - id: implA extends: base - value: "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + value: "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" - id: base2 extends: base - abstract: true - value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + value: "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" - id: base3 - value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})" + value: "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}})" - id: implD extends: base3 - value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + value: "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json index 8be75915..86c99f5a 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json @@ -40,37 +40,37 @@ { "id": "implB", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=j;" + "value": "{{3}}=THEN(a,b);\n {{4}}=j;" }, { "id": "implC", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + "value": "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" }, { "id": "base", "abstract": true, - "value": "THEN(a, b, {0}, {1});" + "value": "THEN(a, b, {{0}}, {{1}});" }, { "id": "implA", "extends": "base", - "value": "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + "value": "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" }, { "id": "base2", "extends": "base", "abstract": true, - "value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + "value": "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" }, { "id": "base3", - "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});" + "value": "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}});" }, { "id": "implD", "extends": "base3", - "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + "value": "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" } ] } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml index 7b11ef48..050266eb 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml @@ -12,38 +12,38 @@ - {3}=THEN(a,b); - {4}=j; + {{3}}=THEN(a,b); + {{4}}=j; - {3}=THEN(a,b); - {4}=THEN(a,b).id("j"); + {{3}}=THEN(a,b); + {{4}}=THEN(a,b).id("j"); - THEN(a, b, {0}, {1}) + THEN(a, b, {{0}}, {{1}}) - {0}=IF(c, d, e); - {1}=SWITCH(f).to(j,k); + {{0}}=IF(c, d, e); + {{1}}=SWITCH(f).to(j,k); - {0}=THEN(a,b,{3}); - {1}=SWITCH(f).to({4},k); + {{0}}=THEN(a,b,{{3}}); + {{1}}=SWITCH(f).to({{4}},k); - THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain}) + THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}}) - {_pre} = THEN(a,b); - {mainChain}=THEN(a,b); - {subChain1}=THEN(j,k); - {subChain2}=IF(c, d, e); - {end_chain}=SWITCH(f).to(j,k); + {{_pre}} = THEN(a,b); + {{mainChain}}=THEN(a,b); + {{subChain1}}=THEN(j,k); + {{subChain2}}=IF(c, d, e); + {{end_chain}}=SWITCH(f).to(j,k); \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml index 41c52e57..02485eb0 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml @@ -20,23 +20,23 @@ flow: chain: - id: implB extends: base2 - value: "{3}=THEN(a,b);\n {4}=j;" + value: "{{3}}=THEN(a,b);\n {{4}}=j;" - id: implC extends: base2 - value: "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + value: "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" - id: base abstract: true - value: "THEN(a, b, {0}, {1});" + value: "THEN(a, b, {{0}}, {{1}});" - id: implA extends: base - value: "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + value: "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" - id: base2 extends: base abstract: true - value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + value: "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" - id: base3 - value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})" + value: "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}})" - id: implD extends: base3 - value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + value: "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json index 3dda6313..2d9e3767 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json @@ -4,35 +4,35 @@ { "id": "implB", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=j;" + "value": "{{3}}=THEN(a,b);\n {{4}}=j;" }, { "id": "implC", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + "value": "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" }, { "id": "base", - "value": "THEN(a, b, {0}, {1});" + "value": "THEN(a, b, {{0}}, {{1}});" }, { "id": "implA", "extends": "base", - "value": "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + "value": "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" }, { "id": "base2", "extends": "base", - "value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + "value": "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" }, { "id": "base3", - "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});" + "value": "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}});" }, { "id": "implD", "extends": "base3", - "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + "value": "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" } ] } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.xml index d8dd470c..55d1a0ea 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.xml @@ -1,38 +1,38 @@ - {3}=THEN(a,b); - {4}=j; + {{3}}=THEN(a,b); + {{4}}=j; - {3} = THEN(a,b); - {4}=THEN(a,b).id("j"); + {{3}} = THEN(a,b); + {{4}}=THEN(a,b).id("j"); - THEN(a, b, {0}, {1}) + THEN(a, b, {{0}}, {{1}}) - {0}=IF(c, d, e); - {1}=SWITCH(f).to(j,k); + {{0}}=IF(c, d, e); + {{1}}=SWITCH(f).to(j,k); - {0}=THEN(a,b,{3}); - {1}=SWITCH(f).to({4},k); + {{0}}=THEN(a,b,{{3}}); + {{1}}=SWITCH(f).to({{4}},k); - THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain}) + THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}}) - {_pre} = THEN(a,b); - {mainChain}=THEN(a,b); - {subChain1}=THEN(j,k); - {subChain2}=IF(c, d, e); - {end_chain}=SWITCH(f).to(j,k); + {{_pre}} = THEN(a,b); + {{mainChain}}=THEN(a,b); + {{subChain1}}=THEN(j,k); + {{subChain2}}=IF(c, d, e); + {{end_chain}}=SWITCH(f).to(j,k); \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml index 3a9fa147..d2f80dce 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml @@ -2,20 +2,20 @@ flow: chain: - id: implB extends: base2 - value: "{3}=THEN(a,b);\n {4}=j;" + value: "{{3}}=THEN(a,b);\n {{4}}=j;" - id: implC extends: base2 - value: "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + value: "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" - id: base - value: "THEN(a, b, {0}, {1});" + value: "THEN(a, b, {{0}}, {{1}});" - id: implA extends: base - value: "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + value: "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" - id: base2 extends: base - value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + value: "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" - id: base3 - value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})" + value: "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}})" - id: implD extends: base3 - value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + value: "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json index d6faf3c6..74d3a584 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json @@ -4,37 +4,37 @@ { "id": "implB", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=j;" + "value": "{{3}}=THEN(a,b);\n {{4}}=j;" }, { "id": "implC", "extends": "base2", - "value": "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + "value": "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" }, { "id": "base", "abstract": true, - "value": "THEN(a, b, {0}, {1});" + "value": "THEN(a, b, {{0}}, {{1}});" }, { "id": "implA", "extends": "base", - "value": "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + "value": "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" }, { "id": "base2", "extends": "base", "abstract": true, - "value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + "value": "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" }, { "id": "base3", - "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});" + "value": "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}});" }, { "id": "implD", "extends": "base3", - "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + "value": "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);" } ] } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml index e75c61b3..199a1286 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml @@ -1,39 +1,39 @@ - {3}=THEN(a,b); - {4}=j; + {{3}}=THEN(a,b); + {{4}}=j; - {3}=THEN(a,b); - {4}=THEN(a,b).id("j"); + {{3}}=THEN(a,b); + {{4}}=THEN(a,b).id("j"); - THEN(a, b, {0}, {1}) + THEN(a, b, {{0}}, {{1}}) - {0}=IF(c, d, e); - {1}=SWITCH(f).to(j,k); + {{0}}=IF(c, d, e); + {{1}}=SWITCH(f).to(j,k); - {0}=THEN(a,b,{3}); - {1}=SWITCH(f).to({4},k); + {{0}}=THEN(a,b,{{3}}); + {{1}}=SWITCH(f).to({{4}},k); - THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain}) + THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}}) - {_pre} = THEN(a,b); - {mainChain}=THEN(a,b); - {subChain1}=THEN(j,k); - {subChain2}=IF(c, d, e); - {end_chain}=SWITCH(f).to(j,k); + {{_pre}} = THEN(a,b); + {{mainChain}}=THEN(a,b); + {{subChain1}}=THEN(j,k); + {{subChain2}}=IF(c, d, e); + {{end_chain}}=SWITCH(f).to(j,k); diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml index e1ec5e50..10bea73e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml @@ -2,22 +2,22 @@ flow: chain: - id: implB extends: base2 - value: "{3}=THEN(a,b);\n {4}=j;" + value: "{{3}}=THEN(a,b);\n {{4}}=j;" - id: implC extends: base2 - value: "{3}=THEN(a,b);\n {4}=THEN(a,b).id(\"j\");" + value: "{{3}}=THEN(a,b);\n {{4}}=THEN(a,b).id(\"j\");" - id: base abstract: true - value: "THEN(a, b, {0}, {1});" + value: "THEN(a, b, {{0}}, {{1}});" - id: implA extends: base - value: "{0}=IF(c, d, e);\n {1}=SWITCH(f).to(j,k);" + value: "{{0}}=IF(c, d, e);\n {{1}}=SWITCH(f).to(j,k);" - id: base2 extends: base abstract: true - value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);" + value: "{{0}}=THEN(a,b,{{3}});\n {{1}}=SWITCH(f).to({{4}},k);" - id: base3 - value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})" + value: "THEN({{_pre}},{{mainChain}}, {{subChain1}},{{subChain2}},{{end_chain}})" - id: implD extends: base3 - value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);" + value: "{{_pre}} = THEN(a,b);\n {{mainChain}}=THEN(a,b);\n{{subChain1}}=THEN(j,k);\n{{subChain2}}=IF(c, d, e);\n{{end_chain}}=SWITCH(f).to(j,k);"