From c1785f297c327bf179fc949100b8ed95d8cf61e7 Mon Sep 17 00:00:00 2001 From: gezuao <673843192@qq.com> Date: Wed, 11 Oct 2023 17:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=A1=B9=E7=9B=AE=E5=AF=B9hu?= =?UTF-8?q?tool.jsonutil=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liteflow-el-builder/pom.xml | 10 +++++----- .../com/yomahub/liteflow/builder/el/AndELWrapper.java | 8 ++++---- .../yomahub/liteflow/builder/el/CatchELWrapper.java | 8 ++++---- .../yomahub/liteflow/builder/el/FinallyELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/ForELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/IfELWrapper.java | 8 ++++---- .../yomahub/liteflow/builder/el/IteratorELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/LoopELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/NodeELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/NotELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/OrELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/PreELWrapper.java | 8 ++++---- .../yomahub/liteflow/builder/el/SwitchELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/ThenELWrapper.java | 8 ++++---- .../com/yomahub/liteflow/builder/el/WhenELWrapper.java | 8 ++++---- .../yomahub/liteflow/builder/el/WhileELWrapper.java | 8 ++++---- .../liteflow/test/builder/ThenELBuilderTest.java | 4 ++-- .../liteflow/test/builder/WhenELBuilderTest.java | 4 ++-- pom.xml | 6 ------ 19 files changed, 69 insertions(+), 75 deletions(-) diff --git a/liteflow-el-builder/pom.xml b/liteflow-el-builder/pom.xml index a40b152ed..4b5fa9fe6 100644 --- a/liteflow-el-builder/pom.xml +++ b/liteflow-el-builder/pom.xml @@ -15,14 +15,14 @@ + + com.yomahub + liteflow-core + ${revision} + cn.hutool hutool-core - - - cn.hutool - hutool-json - \ No newline at end of file diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/AndELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/AndELWrapper.java index acdd1a0ca..d0bd6e217 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/AndELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/AndELWrapper.java @@ -1,6 +1,6 @@ package com.yomahub.liteflow.builder.el; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -40,7 +40,7 @@ public class AndELWrapper extends ELWrapper{ @Override public AndELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -49,7 +49,7 @@ public class AndELWrapper extends ELWrapper{ public AndELWrapper data(String dataName, String jsonString) { // 校验字符串符合Json格式 try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -60,7 +60,7 @@ public class AndELWrapper extends ELWrapper{ @Override public AndELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/CatchELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/CatchELWrapper.java index 037be35c1..11a9b5226 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/CatchELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/CatchELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -42,7 +42,7 @@ public class CatchELWrapper extends ELWrapper{ @Override public CatchELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -50,7 +50,7 @@ public class CatchELWrapper extends ELWrapper{ @Override public CatchELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -61,7 +61,7 @@ public class CatchELWrapper extends ELWrapper{ @Override public CatchELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/FinallyELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/FinallyELWrapper.java index 0c1b00cfc..b23a1f564 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/FinallyELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/FinallyELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -33,7 +33,7 @@ public class FinallyELWrapper extends ELWrapper{ @Override public FinallyELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -41,7 +41,7 @@ public class FinallyELWrapper extends ELWrapper{ @Override public FinallyELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -52,7 +52,7 @@ public class FinallyELWrapper extends ELWrapper{ @Override public FinallyELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ForELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ForELWrapper.java index a981ad0c7..210540263 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ForELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ForELWrapper.java @@ -1,6 +1,6 @@ package com.yomahub.liteflow.builder.el; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -57,7 +57,7 @@ public class ForELWrapper extends LoopELWrapper{ @Override public ForELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -65,7 +65,7 @@ public class ForELWrapper extends LoopELWrapper{ @Override public ForELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -76,7 +76,7 @@ public class ForELWrapper extends LoopELWrapper{ @Override public ForELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IfELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IfELWrapper.java index d133f3567..f5bfbd0a8 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IfELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IfELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -220,7 +220,7 @@ public class IfELWrapper extends ELWrapper{ @Override public IfELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -228,7 +228,7 @@ public class IfELWrapper extends ELWrapper{ @Override public IfELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -239,7 +239,7 @@ public class IfELWrapper extends ELWrapper{ @Override public IfELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IteratorELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IteratorELWrapper.java index b51afaaf4..5ab3efa42 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IteratorELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/IteratorELWrapper.java @@ -1,6 +1,6 @@ package com.yomahub.liteflow.builder.el; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -45,7 +45,7 @@ public class IteratorELWrapper extends LoopELWrapper{ @Override public IteratorELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -53,7 +53,7 @@ public class IteratorELWrapper extends LoopELWrapper{ @Override public IteratorELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -64,7 +64,7 @@ public class IteratorELWrapper extends LoopELWrapper{ @Override public IteratorELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/LoopELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/LoopELWrapper.java index d2ec5f598..3095eba1a 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/LoopELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/LoopELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -57,7 +57,7 @@ public abstract class LoopELWrapper extends ELWrapper{ @Override public LoopELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -65,7 +65,7 @@ public abstract class LoopELWrapper extends ELWrapper{ @Override public LoopELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -76,7 +76,7 @@ public abstract class LoopELWrapper extends ELWrapper{ @Override public LoopELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NodeELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NodeELWrapper.java index 9b7e037e3..aefd9a003 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NodeELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NodeELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -59,7 +59,7 @@ public class NodeELWrapper extends ELWrapper { @Override public NodeELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -67,7 +67,7 @@ public class NodeELWrapper extends ELWrapper { @Override public NodeELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -78,7 +78,7 @@ public class NodeELWrapper extends ELWrapper { @Override public NodeELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NotELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NotELWrapper.java index 0c35e69f5..58229a784 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NotELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/NotELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -33,7 +33,7 @@ public class NotELWrapper extends ELWrapper{ @Override public NotELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -41,7 +41,7 @@ public class NotELWrapper extends ELWrapper{ @Override public NotELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -52,7 +52,7 @@ public class NotELWrapper extends ELWrapper{ @Override public NotELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/OrELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/OrELWrapper.java index 0add7ca52..c7dbb89c1 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/OrELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/OrELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -41,7 +41,7 @@ public class OrELWrapper extends ELWrapper{ @Override public OrELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -49,7 +49,7 @@ public class OrELWrapper extends ELWrapper{ @Override public OrELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -60,7 +60,7 @@ public class OrELWrapper extends ELWrapper{ @Override public OrELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/PreELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/PreELWrapper.java index 7adabd080..781c38c66 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/PreELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/PreELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -33,7 +33,7 @@ public class PreELWrapper extends ELWrapper{ @Override public PreELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -41,7 +41,7 @@ public class PreELWrapper extends ELWrapper{ @Override public PreELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -52,7 +52,7 @@ public class PreELWrapper extends ELWrapper{ @Override public PreELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/SwitchELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/SwitchELWrapper.java index 5a177c306..c9f03d840 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/SwitchELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/SwitchELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -52,7 +52,7 @@ public class SwitchELWrapper extends ELWrapper{ @Override public SwitchELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -60,7 +60,7 @@ public class SwitchELWrapper extends ELWrapper{ @Override public SwitchELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -71,7 +71,7 @@ public class SwitchELWrapper extends ELWrapper{ @Override public SwitchELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ThenELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ThenELWrapper.java index f7d84ab7a..89aa8409f 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ThenELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ThenELWrapper.java @@ -1,7 +1,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.ArrayList; import java.util.List; @@ -78,7 +78,7 @@ public class ThenELWrapper extends ELWrapper { // data关键字的约束：允许以Bean、jsonString、map类型输入数据，必须包含dataName参数。 @Override public ThenELWrapper data(String dataName, Object javaBean) { - setData(JSONUtil.toJsonStr(javaBean)); + setData(JsonUtil.toJsonString(javaBean)); setDataName(dataName); return this; } @@ -86,7 +86,7 @@ public class ThenELWrapper extends ELWrapper { @Override public ThenELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -97,7 +97,7 @@ public class ThenELWrapper extends ELWrapper { @Override public ThenELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhenELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhenELWrapper.java index 4f1f87074..7994e80f6 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhenELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhenELWrapper.java @@ -2,7 +2,7 @@ package com.yomahub.liteflow.builder.el; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.*; @@ -71,7 +71,7 @@ public class WhenELWrapper extends ELWrapper { @Override public WhenELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -79,7 +79,7 @@ public class WhenELWrapper extends ELWrapper { @Override public WhenELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -90,7 +90,7 @@ public class WhenELWrapper extends ELWrapper { @Override public WhenELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhileELWrapper.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhileELWrapper.java index c74aef482..e90b13a0d 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhileELWrapper.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/WhileELWrapper.java @@ -1,6 +1,6 @@ package com.yomahub.liteflow.builder.el; -import cn.hutool.json.JSONUtil; +import com.yomahub.liteflow.util.JsonUtil; import java.util.Map; @@ -52,7 +52,7 @@ public class WhileELWrapper extends LoopELWrapper{ @Override public WhileELWrapper data(String dataName, Object object) { - setData(JSONUtil.toJsonStr(object)); + setData(JsonUtil.toJsonString(object)); setDataName(dataName); return this; } @@ -60,7 +60,7 @@ public class WhileELWrapper extends LoopELWrapper{ @Override public WhileELWrapper data(String dataName, String jsonString) { try { - JSONUtil.parseObj(jsonString); + JsonUtil.parseObject(jsonString); } catch (Exception e){ throw new RuntimeException("字符串不符合Json格式！"); } @@ -71,7 +71,7 @@ public class WhileELWrapper extends LoopELWrapper{ @Override public WhileELWrapper data(String dataName, Map jsonMap) { - setData(JSONUtil.toJsonStr(jsonMap)); + setData(JsonUtil.toJsonString(jsonMap)); setDataName(dataName); return this; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java index 2be57929a..ae9446189 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java @@ -1,8 +1,8 @@ package com.yomahub.liteflow.test.builder; -import cn.hutool.json.JSONUtil; import com.yomahub.liteflow.builder.el.ELBus; import com.yomahub.liteflow.test.BaseTest; +import com.yomahub.liteflow.util.JsonUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -111,7 +111,7 @@ public class ThenELBuilderTest extends BaseTest { Map name2Value = new HashMap(); name2Value.put("name", "zhangsan"); name2Value.put("age", 18); - System.out.println(JSONUtil.toJsonStr(name2Value)); + System.out.println(JsonUtil.toJsonString(name2Value)); Assertions.assertEquals(ELBus.then("a", ELBus.then("b").then("c").id("this is a id")).tag("this is a tag").then("d").data("thenData", name2Value).pre("p").finallyOpt("f").toEL(), "thenData = '{\"name\":\"zhangsan\",\"age\":18}';\nTHEN(PRE(node(\"p\")),node(\"a\"),THEN(node(\"b\"),node(\"c\")).id(\"this is a id\"),node(\"d\"),FINALLY(node(\"f\"))).tag(\"this is a tag\").data(thenData)"); System.out.println("thenData = '{\"name\":\"zhangsan\",\"age\":18}';\nTHEN(PRE(node(\"p\")),node(\"a\"),THEN(node(\"b\"),node(\"c\")).id(\"this is a id\"),node(\"d\"),FINALLY(node(\"f\"))).tag(\"this is a tag\").data(thenData)"); diff --git a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/WhenELBuilderTest.java b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/WhenELBuilderTest.java index 0695d9a0a..574769737 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/WhenELBuilderTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/WhenELBuilderTest.java @@ -1,8 +1,8 @@ package com.yomahub.liteflow.test.builder; -import cn.hutool.json.JSONUtil; import com.yomahub.liteflow.builder.el.ELBus; import com.yomahub.liteflow.test.BaseTest; +import com.yomahub.liteflow.util.JsonUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -118,7 +118,7 @@ public class WhenELBuilderTest extends BaseTest { Map name2Value = new HashMap(); name2Value.put("name", "zhangsan"); name2Value.put("age", 18); - System.out.println(JSONUtil.toJsonStr(name2Value)); + System.out.println(JsonUtil.toJsonString(name2Value)); String actualStr = "whenData = '{\"name\":\"zhangsan\",\"age\":18}';\nWHEN(node(\"a\"),WHEN(node(\"b\"),node(\"c\")).id(\"this is a id\").data(whenData),node(\"d\")).tag(\"this is a tag\")"; Assertions.assertEquals(ELBus.when("a", ELBus.when("b").when("c").data("whenData", name2Value).id("this is a id")).when("d").tag("this is a tag").toEL(false), actualStr); diff --git a/pom.xml b/pom.xml index 20948e0fe..c736ec756 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ 5.3.0 5.8.2 5.8.11 - 5.8.11 2.12.3 5.1.0 0.10 @@ -176,11 +175,6 @@ hutool-core ${hutool-core.version} - - cn.hutool - hutool-json - ${hutool-json.version} - com.alibaba transmittable-thread-local