From 7e80d798fe21e037a4ba85b5701b6e3222e18ea5 Mon Sep 17 00:00:00 2001 From: zendwang Date: Wed, 24 Mar 2021 10:03:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96getChain=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yomahub/liteflow/flow/FlowBus.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java index 99883ff9e..2578c90fd 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java @@ -7,22 +7,24 @@ */ package com.yomahub.liteflow.flow; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.collections4.MapUtils; - import com.yomahub.liteflow.entity.flow.Chain; import com.yomahub.liteflow.entity.flow.Node; +import org.apache.commons.collections4.MapUtils; + +import java.util.HashMap; +import java.util.Map; public class FlowBus { private static Map chainMap = new HashMap<>(); private static Map nodeMap = new HashMap<>(); - + + private FlowBus() { + } + public static Chain getChain(String id) throws Exception{ - if(chainMap == null || chainMap.isEmpty()){ + if(MapUtils.isEmpty(chainMap)){ throw new Exception("please config the rule first"); } return chainMap.get(id); From 020e854f6d047c0723a3bd7c35a01ecbdcd23d03 Mon Sep 17 00:00:00 2001 From: zendwang Date: Wed, 24 Mar 2021 10:04:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yomahub/liteflow/core/FlowExecutor.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) 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 3e4160876..8243c7ccf 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 @@ -7,33 +7,30 @@ */ package com.yomahub.liteflow.core; -import java.text.MessageFormat; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.google.common.collect.Lists; -import com.yomahub.liteflow.exception.ConfigErrorException; -import com.yomahub.liteflow.property.LiteflowConfig; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.yomahub.liteflow.entity.flow.Chain; -import com.yomahub.liteflow.entity.flow.Node; import com.yomahub.liteflow.entity.data.DataBus; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.Slot; +import com.yomahub.liteflow.entity.flow.Chain; import com.yomahub.liteflow.exception.ChainNotFoundException; +import com.yomahub.liteflow.exception.ConfigErrorException; import com.yomahub.liteflow.exception.FlowExecutorNotInitException; import com.yomahub.liteflow.exception.NoAvailableSlotException; import com.yomahub.liteflow.flow.FlowBus; import com.yomahub.liteflow.parser.LocalXmlFlowParser; import com.yomahub.liteflow.parser.XmlFlowParser; import com.yomahub.liteflow.parser.ZookeeperXmlFlowParser; +import com.yomahub.liteflow.property.LiteflowConfig; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.text.MessageFormat; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class FlowExecutor { @@ -152,6 +149,7 @@ public class FlowExecutor { //执行chain chain.execute(slotIndex); }catch(Exception e){ + LOG.error("[{}]:chain[{}] execute error on slot[{}]",slot.getRequestId(),chain.getChainName(),slotIndex); slot.setSuccess(false); slot.setErrorMsg(e.getMessage()); }finally{ From 2af36b6a748f315fb5c2a80df39ab24f2928c9f5 Mon Sep 17 00:00:00 2001 From: zendwang Date: Wed, 24 Mar 2021 10:21:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yomahub/liteflow/core/FlowExecutor.java | 23 ++++++++++--------- .../com/yomahub/liteflow/flow/FlowBus.java | 9 ++++---- 2 files changed, 17 insertions(+), 15 deletions(-) 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 8243c7ccf..8208db2ae 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 @@ -7,30 +7,31 @@ */ package com.yomahub.liteflow.core; +import java.text.MessageFormat; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.google.common.collect.Lists; +import com.yomahub.liteflow.exception.ConfigErrorException; +import com.yomahub.liteflow.property.LiteflowConfig; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.yomahub.liteflow.entity.flow.Chain; import com.yomahub.liteflow.entity.data.DataBus; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.Slot; -import com.yomahub.liteflow.entity.flow.Chain; import com.yomahub.liteflow.exception.ChainNotFoundException; -import com.yomahub.liteflow.exception.ConfigErrorException; import com.yomahub.liteflow.exception.FlowExecutorNotInitException; import com.yomahub.liteflow.exception.NoAvailableSlotException; import com.yomahub.liteflow.flow.FlowBus; import com.yomahub.liteflow.parser.LocalXmlFlowParser; import com.yomahub.liteflow.parser.XmlFlowParser; import com.yomahub.liteflow.parser.ZookeeperXmlFlowParser; -import com.yomahub.liteflow.property.LiteflowConfig; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.text.MessageFormat; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class FlowExecutor { diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java index 2578c90fd..acc1d2566 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java @@ -7,13 +7,14 @@ */ package com.yomahub.liteflow.flow; -import com.yomahub.liteflow.entity.flow.Chain; -import com.yomahub.liteflow.entity.flow.Node; -import org.apache.commons.collections4.MapUtils; - import java.util.HashMap; import java.util.Map; +import org.apache.commons.collections4.MapUtils; + +import com.yomahub.liteflow.entity.flow.Chain; +import com.yomahub.liteflow.entity.flow.Node; + public class FlowBus { private static Map chainMap = new HashMap<>(); From 299effdc67676a0ce5f9409ce02b1c1c4caa3d86 Mon Sep 17 00:00:00 2001 From: zendwang Date: Wed, 24 Mar 2021 10:29:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yomahub/liteflow/core/FlowExecutor.java | 8 ++++---- .../src/main/java/com/yomahub/liteflow/flow/FlowBus.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 8208db2ae..68f1fa860 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 @@ -149,12 +149,12 @@ public class FlowExecutor { try { //执行chain chain.execute(slotIndex); - }catch(Exception e){ - LOG.error("[{}]:chain[{}] execute error on slot[{}]",slot.getRequestId(),chain.getChainName(),slotIndex); + } catch (Exception e) { + LOG.error("[{}]:chain[{}] execute error on slot[{}]", slot.getRequestId(), chain.getChainName(), slotIndex); slot.setSuccess(false); slot.setErrorMsg(e.getMessage()); - }finally{ - if(!isInnerChain) { + } finally { + if (!isInnerChain) { slot.printStep(); DataBus.releaseSlot(slotIndex); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java index acc1d2566..c5a198313 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java @@ -25,7 +25,7 @@ public class FlowBus { } public static Chain getChain(String id) throws Exception{ - if(MapUtils.isEmpty(chainMap)){ + if (MapUtils.isEmpty(chainMap)) { throw new Exception("please config the rule first"); } return chainMap.get(id); From fc418269a7a714aae46922b36c60388a2d780fe1 Mon Sep 17 00:00:00 2001 From: zendwang Date: Wed, 24 Mar 2021 10:32:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yomahub/liteflow/core/FlowExecutor.java | 2 +- .../src/main/java/com/yomahub/liteflow/flow/FlowBus.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 68f1fa860..4a0828414 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 @@ -147,7 +147,7 @@ public class FlowExecutor { } try { - //执行chain + // 执行chain chain.execute(slotIndex); } catch (Exception e) { LOG.error("[{}]:chain[{}] execute error on slot[{}]", slot.getRequestId(), chain.getChainName(), slotIndex); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java index c5a198313..b12076296 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java @@ -24,7 +24,7 @@ public class FlowBus { private FlowBus() { } - public static Chain getChain(String id) throws Exception{ + public static Chain getChain(String id) throws Exception { if (MapUtils.isEmpty(chainMap)) { throw new Exception("please config the rule first"); }