diff --git a/docs/guide_cn.md b/docs/guide_cn.md index 40620e3dc..b7ac353a8 100644 --- a/docs/guide_cn.md +++ b/docs/guide_cn.md @@ -4,7 +4,7 @@ liteflow需要你的项目使用maven ## 1.1依赖 ```xml - com.thebeastshop.liteflow + com.yomahub.liteflow liteflow ${liteFlow.version} @@ -19,11 +19,11 @@ liteflow需要你的项目使用maven - - - - - + + + + + @@ -74,8 +74,8 @@ Slot slot = executor.execute("demoChain", "arg"); ## 2.1流程配置可以省略的部分 流程配置中的`nodes`节点，可以不用配置了，支持spring的自动扫描方式。你需要在你的spring配置文件中定义 ```xml - - + + ``` 当然，你的组件节点也需要注册进spirng容器 @@ -93,7 +93,7 @@ public class AComponent extends NodeComponent ## 2.2spring中执行器的配置 ```xml - + /config/flow.xml @@ -111,7 +111,7 @@ liteFlow提供了liteflow-spring-boot-starter依赖包 ```xml - com.thebeastshop + com.yomahub liteflow-spring-boot-starter 2.1.0 @@ -138,7 +138,7 @@ liteFlow支持把配置放在zk集群中，并支持实时修改流程 ```xml - + 127.0.0.1:2181,127.0.0.1:2182,127.0.0.1:2183 @@ -175,10 +175,10 @@ public class TestCustomParser extends ClassXmlFlowParser { spring中需要改的地方还是执行器的配置，只需要在配置的路径地方放入自定义类的类路径即可 ```xml - + - com.thebeastshop.liteflow.test.TestCustomParser + com.yomahub.liteflow.test.TestCustomParser diff --git a/liteflow-core/pom.xml b/liteflow-core/pom.xml index 777e9b61a..ab2a01b9f 100644 --- a/liteflow-core/pom.xml +++ b/liteflow-core/pom.xml @@ -1,13 +1,13 @@  - com.thebeastshop + com.yomahub liteflow-core jar 4.0.0 - com.thebeastshop + com.yomahub liteflow 2.2.0-SNAPSHOT diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/core/FlowExecutor.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java similarity index 85% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/core/FlowExecutor.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java index f015dcf33..99fbb2d50 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/core/FlowExecutor.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java @@ -7,7 +7,7 @@ * @Date 2017-7-31 * @version 1.0 */ -package com.thebeastshop.liteflow.core; +package com.yomahub.liteflow.core; import java.text.MessageFormat; import java.util.List; @@ -20,24 +20,21 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.thebeastshop.liteflow.entity.config.Chain; -import com.thebeastshop.liteflow.entity.config.Condition; -import com.thebeastshop.liteflow.entity.config.Node; -import com.thebeastshop.liteflow.entity.config.ThenCondition; -import com.thebeastshop.liteflow.entity.config.WhenCondition; -import com.thebeastshop.liteflow.entity.data.DataBus; -import com.thebeastshop.liteflow.entity.data.DefaultSlot; -import com.thebeastshop.liteflow.entity.data.Slot; -import com.thebeastshop.liteflow.exception.ChainNotFoundException; -import com.thebeastshop.liteflow.exception.FlowExecutorNotInitException; -import com.thebeastshop.liteflow.exception.FlowSystemException; -import com.thebeastshop.liteflow.exception.NoAvailableSlotException; -import com.thebeastshop.liteflow.exception.ParseException; -import com.thebeastshop.liteflow.flow.FlowBus; -import com.thebeastshop.liteflow.parser.LocalXmlFlowParser; -import com.thebeastshop.liteflow.parser.XmlFlowParser; -import com.thebeastshop.liteflow.parser.ZookeeperXmlFlowParser; -import com.thebeastshop.liteflow.util.LOGOPrinter; +import com.yomahub.liteflow.entity.config.Chain; +import com.yomahub.liteflow.entity.config.Condition; +import com.yomahub.liteflow.entity.config.Node; +import com.yomahub.liteflow.entity.config.ThenCondition; +import com.yomahub.liteflow.entity.config.WhenCondition; +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.exception.ChainNotFoundException; +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; public class FlowExecutor { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/core/NodeComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeComponent.java similarity index 86% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/core/NodeComponent.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeComponent.java index a2d127bf1..b66c1d82a 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/core/NodeComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeComponent.java @@ -7,21 +7,21 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.core; +package com.yomahub.liteflow.core; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.thebeastshop.liteflow.entity.config.Node; -import com.thebeastshop.liteflow.entity.data.CmpStep; -import com.thebeastshop.liteflow.entity.data.CmpStepType; -import com.thebeastshop.liteflow.entity.data.DataBus; -import com.thebeastshop.liteflow.entity.data.Slot; -import com.thebeastshop.liteflow.entity.monitor.CompStatistics; -import com.thebeastshop.liteflow.flow.FlowBus; -import com.thebeastshop.liteflow.monitor.MonitorBus; +import com.yomahub.liteflow.entity.config.Node; +import com.yomahub.liteflow.entity.data.CmpStep; +import com.yomahub.liteflow.entity.data.CmpStepType; +import com.yomahub.liteflow.entity.data.DataBus; +import com.yomahub.liteflow.entity.data.Slot; +import com.yomahub.liteflow.entity.monitor.CompStatistics; +import com.yomahub.liteflow.flow.FlowBus; +import com.yomahub.liteflow.monitor.MonitorBus; public abstract class NodeComponent { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/core/NodeCondComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeCondComponent.java similarity index 94% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/core/NodeCondComponent.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeCondComponent.java index d91b7658d..0cba9c45a 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/core/NodeCondComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeCondComponent.java @@ -7,7 +7,7 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.core; +package com.yomahub.liteflow.core; import org.springframework.stereotype.Component; @@ -20,7 +20,7 @@ public abstract class NodeCondComponent extends NodeComponent { String nodeId = component.value(); this.getSlot().setCondResult(this.getClass().getName(), nodeId); } - + protected abstract Class processCond() throws Exception; } diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Chain.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Chain.java similarity index 93% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Chain.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Chain.java index bd28dcf5f..7afd3c83b 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Chain.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Chain.java @@ -7,16 +7,16 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.config; +package com.yomahub.liteflow.entity.config; import java.util.List; public class Chain { - + private String chainName; - + private List conditionList; - + public Chain(String chainName, List conditionList) { this.chainName = chainName; this.conditionList = conditionList; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Condition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Condition.java similarity index 90% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Condition.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Condition.java index 58e957e91..f67d41a57 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Condition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Condition.java @@ -7,14 +7,14 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.config; +package com.yomahub.liteflow.entity.config; import java.util.List; public class Condition { - + private List nodeList; - + public Condition(List nodeList) { this.nodeList = nodeList; } diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Node.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Node.java similarity index 90% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Node.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Node.java index f5be989b9..ce8081022 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/Node.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/Node.java @@ -7,27 +7,27 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.config; +package com.yomahub.liteflow.entity.config; import java.util.HashMap; import java.util.Map; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; public class Node { - + private String id; - + private String clazz; - + private NodeComponent instance; - + private Map condNodeMap = new HashMap(); - + public Node(){ - + } - + public Node(String id, String clazz, NodeComponent instance) { this.id = id; this.clazz = clazz; @@ -57,11 +57,11 @@ public class Node { public void setInstance(NodeComponent instance) { this.instance = instance; } - + public Node getCondNode(String nodeId){ return this.condNodeMap.get(nodeId); } - + public void setCondNode(String nodeId, Node condNode){ this.condNodeMap.put(nodeId, condNode); } diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/ThenCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/ThenCondition.java similarity index 87% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/ThenCondition.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/ThenCondition.java index d70862014..9d1614116 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/ThenCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/ThenCondition.java @@ -7,7 +7,7 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.config; +package com.yomahub.liteflow.entity.config; import java.util.List; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/WhenCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/WhenCondition.java similarity index 87% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/WhenCondition.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/WhenCondition.java index 137ea823f..61531fbb8 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/config/WhenCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/config/WhenCondition.java @@ -7,7 +7,7 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.config; +package com.yomahub.liteflow.entity.config; import java.util.List; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/AbsSlot.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/AbsSlot.java similarity index 95% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/AbsSlot.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/AbsSlot.java index b95c47321..85090601e 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/AbsSlot.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/AbsSlot.java @@ -7,13 +7,11 @@ * @Date 2017-8-3 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.data; +package com.yomahub.liteflow.entity.data; import java.util.ArrayDeque; -import java.util.ArrayList; import java.util.Deque; import java.util.Iterator; -import java.util.List; import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; @@ -21,93 +19,93 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("unchecked") public abstract class AbsSlot implements Slot{ - + private static final Logger LOG = LoggerFactory.getLogger(Slot.class); - + private final String REQUEST = "request"; - + private final String RESPONSE = "response"; - + private final String CHAINNAME = "chain_name"; - + private final String COND_NODE_PREFIX = "cond_"; - + private final String NODE_INPUT_PREFIX = "input_"; - + private final String NODE_OUTPUT_PREFIX = "output_"; - + private final String CHAIN_REQ_PREFIX = "chain_req_"; - + private final String REQUEST_ID = "req_id"; - + private Deque executeSteps = new ArrayDeque(); - + protected ConcurrentHashMap dataMap = new ConcurrentHashMap(); - + public T getInput(String nodeId){ return (T)dataMap.get(NODE_INPUT_PREFIX + nodeId); } - + public T getOutput(String nodeId){ return (T)dataMap.get(NODE_OUTPUT_PREFIX + nodeId); } - + public void setInput(String nodeId,T t){ dataMap.put(NODE_INPUT_PREFIX + nodeId, t); } - + public void setOutput(String nodeId,T t){ dataMap.put(NODE_OUTPUT_PREFIX + nodeId, t); } - + public T getRequestData(){ return (T)dataMap.get(REQUEST); } - + public void setRequestData(T t){ dataMap.put(REQUEST, t); } - + public T getResponseData(){ return (T)dataMap.get(RESPONSE); } - + public void setResponseData(T t){ dataMap.put(RESPONSE, t); } - + public T getChainReqData(String chainId) { return (T)dataMap.get(CHAIN_REQ_PREFIX + chainId); } - + public void setChainReqData(String chainId, T t) { dataMap.put(CHAIN_REQ_PREFIX + chainId, t); } - + public T getData(String key){ return (T)dataMap.get(key); } - + public void setData(String key, T t){ dataMap.put(key, t); } - + public void setCondResult(String key, T t){ dataMap.put(COND_NODE_PREFIX + key, t); } - + public T getCondResult(String key){ return (T)dataMap.get(COND_NODE_PREFIX + key); } - + public void setChainName(String chainName) { dataMap.put(CHAINNAME, chainName); } - + public String getChainName() { return (String)dataMap.get(CHAINNAME); } - + public void addStep(CmpStep step){ CmpStep lastStep = this.executeSteps.peekLast(); if(lastStep != null && lastStep.equals(step)) { @@ -116,7 +114,7 @@ public abstract class AbsSlot implements Slot{ this.executeSteps.add(step); } } - + public void printStep(){ StringBuffer str = new StringBuffer(); CmpStep cmpStep = null; @@ -129,12 +127,12 @@ public abstract class AbsSlot implements Slot{ } LOG.info("[{}]:CHAIN_NAME[{}]\n{}",getRequestId(),this.getChainName(),str.toString()); } - + @Override public void generateRequestId() { dataMap.put(REQUEST_ID, new Long(System.nanoTime()).toString()); } - + @Override public String getRequestId() { return (String)dataMap.get(REQUEST_ID); diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/CmpStep.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/CmpStep.java similarity index 95% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/CmpStep.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/CmpStep.java index 3076df018..c742e3d7a 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/CmpStep.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/CmpStep.java @@ -7,15 +7,15 @@ * @Date 2017-12-8 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.data; +package com.yomahub.liteflow.entity.data; import java.text.MessageFormat; public class CmpStep { private String nodeId; - + private CmpStepType stepType; - + public CmpStep(String nodeId, CmpStepType stepType) { this.nodeId = nodeId; this.stepType = stepType; @@ -36,7 +36,7 @@ public class CmpStep { public void setStepType(CmpStepType stepType) { this.stepType = stepType; } - + @Override public String toString() { if(stepType.equals(CmpStepType.SINGLE)) { @@ -44,10 +44,10 @@ public class CmpStep { }else { return MessageFormat.format("{0}({1})", nodeId,stepType); } - - + + } - + @Override public boolean equals(Object obj) { if (obj == null) { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/CmpStepType.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/CmpStepType.java similarity index 85% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/CmpStepType.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/CmpStepType.java index 29e3b0524..76673b6fa 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/CmpStepType.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/CmpStepType.java @@ -7,7 +7,7 @@ * @Date 2017-12-8 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.data; +package com.yomahub.liteflow.entity.data; public enum CmpStepType { START, diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/DataBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/DataBus.java similarity index 95% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/DataBus.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/DataBus.java index d0e483796..0e16472ef 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/DataBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/DataBus.java @@ -7,7 +7,7 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.data; +package com.yomahub.liteflow.entity.data; import java.util.concurrent.atomic.AtomicInteger; @@ -15,15 +15,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class DataBus { - + private static final Logger LOG = LoggerFactory.getLogger(DataBus.class); - + public static final int SLOT_SIZE = 1024; - + public static AtomicInteger OCCUPY_COUNT = new AtomicInteger(0); - + private static Slot[] slots = new Slot[SLOT_SIZE]; - + public synchronized static int offerSlot(Class slotClazz){ try{ for(int i = 0; i < slots.length; i++){ @@ -39,12 +39,12 @@ public class DataBus { } return -1; } - + @SuppressWarnings("unchecked") public static T getSlot(int slotIndex){ return (T)slots[slotIndex]; } - + public static void releaseSlot(int slotIndex){ if(slots[slotIndex] != null){ LOG.info("[{}]:slot[{}] released",slots[slotIndex].getRequestId(),slotIndex); diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/DefaultSlot.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/DefaultSlot.java similarity index 84% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/DefaultSlot.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/DefaultSlot.java index 2d30e8a10..d633d97fa 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/DefaultSlot.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/DefaultSlot.java @@ -7,7 +7,7 @@ * @Date 2017-12-4 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.data; +package com.yomahub.liteflow.entity.data; public class DefaultSlot extends AbsSlot { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/Slot.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/Slot.java similarity index 92% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/Slot.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/Slot.java index 7b9913406..56d257027 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/data/Slot.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/Slot.java @@ -7,46 +7,46 @@ * @Date 2017-12-4 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.data; +package com.yomahub.liteflow.entity.data; public interface Slot { public T getInput(String nodeId); - + public T getOutput(String nodeId); - + public void setInput(String nodeId,T t); - + public void setOutput(String nodeId,T t); - + public T getRequestData(); - + public void setRequestData(T t); - + public T getResponseData(); - + public void setChainReqData(String chainId, T t); - + public T getChainReqData(String chainId); - + public void setResponseData(T t); - + public T getData(String key); - + public void setData(String key, T t); - + public void setCondResult(String key, T t); - + public T getCondResult(String key); - + public void addStep(CmpStep step); - + public void printStep(); - + public void generateRequestId(); - + public String getRequestId(); - + public void setChainName(String chainName); - + public String getChainName(); } diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/monitor/CompStatistics.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/monitor/CompStatistics.java similarity index 93% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/monitor/CompStatistics.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/entity/monitor/CompStatistics.java index 62313a1e5..aa7f96313 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/entity/monitor/CompStatistics.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/monitor/CompStatistics.java @@ -7,14 +7,14 @@ * @Date 2017-8-4 * @version 1.0 */ -package com.thebeastshop.liteflow.entity.monitor; +package com.yomahub.liteflow.entity.monitor; public class CompStatistics { - + private String componentClazzName; - + private long timeSpent; - + private long memorySpent; public String getComponentClazzName() { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ChainNotFoundException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/ChainNotFoundException.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ChainNotFoundException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/exception/ChainNotFoundException.java index 05ec01fb3..06d87be48 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ChainNotFoundException.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/ChainNotFoundException.java @@ -1,9 +1,9 @@ -package com.thebeastshop.liteflow.exception; +package com.yomahub.liteflow.exception; public class ChainNotFoundException extends RuntimeException { private static final long serialVersionUID = 1L; - + /** 异常信息 */ private String message; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ComponentNotAccessException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/ComponentNotAccessException.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ComponentNotAccessException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/exception/ComponentNotAccessException.java index bcc118ee4..d7d6c8836 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ComponentNotAccessException.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/ComponentNotAccessException.java @@ -1,9 +1,9 @@ -package com.thebeastshop.liteflow.exception; +package com.yomahub.liteflow.exception; public class ComponentNotAccessException extends RuntimeException { private static final long serialVersionUID = 1L; - + /** 异常信息 */ private String message; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/FlowExecutorNotInitException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/FlowExecutorNotInitException.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/FlowExecutorNotInitException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/exception/FlowExecutorNotInitException.java index 40fb8d781..24c1dbcf5 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/FlowExecutorNotInitException.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/FlowExecutorNotInitException.java @@ -1,9 +1,9 @@ -package com.thebeastshop.liteflow.exception; +package com.yomahub.liteflow.exception; public class FlowExecutorNotInitException extends RuntimeException { private static final long serialVersionUID = 1L; - + /** 异常信息 */ private String message; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/FlowSystemException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/FlowSystemException.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/FlowSystemException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/exception/FlowSystemException.java index 6789c2c51..400e0c5d5 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/FlowSystemException.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/FlowSystemException.java @@ -1,9 +1,9 @@ -package com.thebeastshop.liteflow.exception; +package com.yomahub.liteflow.exception; public class FlowSystemException extends RuntimeException { private static final long serialVersionUID = 1L; - + /** 异常信息 */ private String message; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/NoAvailableSlotException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NoAvailableSlotException.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/NoAvailableSlotException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/exception/NoAvailableSlotException.java index beda393da..a4ae9162e 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/NoAvailableSlotException.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NoAvailableSlotException.java @@ -1,9 +1,9 @@ -package com.thebeastshop.liteflow.exception; +package com.yomahub.liteflow.exception; public class NoAvailableSlotException extends RuntimeException { private static final long serialVersionUID = 1L; - + /** 异常信息 */ private String message; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ParseException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/ParseException.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ParseException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/exception/ParseException.java index 99917bb13..f0b2ac3c6 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/exception/ParseException.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/ParseException.java @@ -1,9 +1,9 @@ -package com.thebeastshop.liteflow.exception; +package com.yomahub.liteflow.exception; public class ParseException extends RuntimeException { private static final long serialVersionUID = 1L; - + /** 异常信息 */ private String message; diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/flow/FlowBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/flow/FlowBus.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java index 7ca8ccb09..8cd660266 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/flow/FlowBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java @@ -7,15 +7,15 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.flow; +package com.yomahub.liteflow.flow; import java.util.HashMap; import java.util.Map; import org.apache.commons.collections4.MapUtils; -import com.thebeastshop.liteflow.entity.config.Chain; -import com.thebeastshop.liteflow.entity.config.Node; +import com.yomahub.liteflow.entity.config.Chain; +import com.yomahub.liteflow.entity.config.Node; public class FlowBus { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/monitor/MonitorBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/monitor/MonitorBus.java similarity index 93% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/monitor/MonitorBus.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/monitor/MonitorBus.java index 2e73c1dfb..f1a780c7a 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/monitor/MonitorBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/monitor/MonitorBus.java @@ -7,7 +7,7 @@ * @Date 2017-8-4 * @version 1.0 */ -package com.thebeastshop.liteflow.monitor; +package com.yomahub.liteflow.monitor; import java.math.BigDecimal; import java.math.RoundingMode; @@ -23,13 +23,12 @@ import java.util.Map.Entry; import java.util.Timer; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.thebeastshop.liteflow.entity.data.DataBus; -import com.thebeastshop.liteflow.entity.monitor.CompStatistics; -import com.thebeastshop.liteflow.util.LimitQueue; +import com.yomahub.liteflow.entity.data.DataBus; +import com.yomahub.liteflow.entity.monitor.CompStatistics; +import com.yomahub.liteflow.util.LimitQueue; public class MonitorBus { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/ClassXmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ClassXmlFlowParser.java similarity index 83% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/ClassXmlFlowParser.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/parser/ClassXmlFlowParser.java index 692b47e03..f1e6484b7 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/ClassXmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ClassXmlFlowParser.java @@ -1,4 +1,4 @@ -package com.thebeastshop.liteflow.parser; +package com.yomahub.liteflow.parser; public abstract class ClassXmlFlowParser extends XmlFlowParser { @Override @@ -6,6 +6,6 @@ public abstract class ClassXmlFlowParser extends XmlFlowParser { String content = parseCustom(); parse(content); } - + public abstract String parseCustom(); } diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/LocalXmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalXmlFlowParser.java similarity index 83% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/LocalXmlFlowParser.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalXmlFlowParser.java index a8a929bf0..eb1fd6311 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/LocalXmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalXmlFlowParser.java @@ -7,14 +7,14 @@ * @Date 2017-7-28 * @version 1.0 */ -package com.thebeastshop.liteflow.parser; +package com.yomahub.liteflow.parser; -import com.thebeastshop.liteflow.util.IOUtil; +import com.yomahub.liteflow.util.IOUtil; public class LocalXmlFlowParser extends XmlFlowParser{ private final String ENCODING_FORMAT = "UTF-8"; - + public void parseMain(String rulePath) throws Exception { String ruleContent = IOUtil.read(rulePath, ENCODING_FORMAT); parse(ruleContent); diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/RegexEntity.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/RegexEntity.java similarity index 92% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/RegexEntity.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/parser/RegexEntity.java index 55ffd84ee..b812aa8eb 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/RegexEntity.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/RegexEntity.java @@ -1,11 +1,11 @@ -package com.thebeastshop.liteflow.parser; +package com.yomahub.liteflow.parser; import java.util.Arrays; public class RegexEntity { - + private String condNode; - + private String[] realNodeArray; public String getCondNode() { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/XmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/XmlFlowParser.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java index f415d7a6d..0f67649d3 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/XmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java @@ -1,4 +1,4 @@ -package com.thebeastshop.liteflow.parser; +package com.yomahub.liteflow.parser; import java.util.ArrayList; import java.util.Iterator; @@ -13,15 +13,15 @@ import org.dom4j.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.config.Chain; -import com.thebeastshop.liteflow.entity.config.Condition; -import com.thebeastshop.liteflow.entity.config.Node; -import com.thebeastshop.liteflow.entity.config.ThenCondition; -import com.thebeastshop.liteflow.entity.config.WhenCondition; -import com.thebeastshop.liteflow.flow.FlowBus; -import com.thebeastshop.liteflow.spring.ComponentScaner; -import com.thebeastshop.liteflow.util.Dom4JReader; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.entity.config.Chain; +import com.yomahub.liteflow.entity.config.Condition; +import com.yomahub.liteflow.entity.config.Node; +import com.yomahub.liteflow.entity.config.ThenCondition; +import com.yomahub.liteflow.entity.config.WhenCondition; +import com.yomahub.liteflow.flow.FlowBus; +import com.yomahub.liteflow.spring.ComponentScaner; +import com.yomahub.liteflow.util.Dom4JReader; public abstract class XmlFlowParser { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/ZookeeperXmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperXmlFlowParser.java similarity index 91% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/ZookeeperXmlFlowParser.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperXmlFlowParser.java index 047aca383..1f4af04e3 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/parser/ZookeeperXmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperXmlFlowParser.java @@ -1,4 +1,4 @@ -package com.thebeastshop.liteflow.parser; +package com.yomahub.liteflow.parser; import java.text.MessageFormat; @@ -10,18 +10,18 @@ import org.apache.curator.framework.recipes.cache.NodeCacheListener; import org.apache.curator.retry.RetryNTimes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.thebeastshop.liteflow.exception.ParseException; +import com.yomahub.liteflow.exception.ParseException; public class ZookeeperXmlFlowParser extends XmlFlowParser{ - + private static final Logger LOG = LoggerFactory.getLogger(ZookeeperXmlFlowParser.class); - + private String nodePath = "/lite-flow/flow"; - + public ZookeeperXmlFlowParser() { - + } - + public ZookeeperXmlFlowParser(String node) { nodePath = node; } @@ -33,21 +33,21 @@ public class ZookeeperXmlFlowParser extends XmlFlowParser{ new RetryNTimes(10, 5000) ); client.start(); - + if (client.checkExists().forPath(nodePath) == null) { client.create().creatingParentsIfNeeded().forPath(nodePath, "".getBytes()); } - + String content = new String(client.getData().forPath(nodePath)); - - + + if(StringUtils.isBlank(content)) { String error = MessageFormat.format("the node[{0}] value is empty", nodePath); throw new ParseException(error); } parse(content); - - + + final NodeCache cache = new NodeCache(client,nodePath); cache.start(); diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/spring/ComponentScaner.java b/liteflow-core/src/main/java/com/yomahub/liteflow/spring/ComponentScaner.java similarity index 88% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/spring/ComponentScaner.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/spring/ComponentScaner.java index 6cf4e6944..d3b64c65e 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/spring/ComponentScaner.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/spring/ComponentScaner.java @@ -7,7 +7,7 @@ * @Date 2017-11-23 * @version 1.0 */ -package com.thebeastshop.liteflow.spring; +package com.yomahub.liteflow.spring; import java.util.HashMap; import java.util.Map; @@ -17,9 +17,8 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.Ordered; import org.springframework.core.PriorityOrdered; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.config.Node; -import com.thebeastshop.liteflow.util.LOGOPrinter; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.util.LOGOPrinter; public class ComponentScaner implements BeanPostProcessor, PriorityOrdered { diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/Dom4JReader.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/Dom4JReader.java similarity index 98% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/util/Dom4JReader.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/util/Dom4JReader.java index 7c1f458ae..80ae7be77 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/Dom4JReader.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/Dom4JReader.java @@ -1,4 +1,4 @@ -package com.thebeastshop.liteflow.util; +package com.yomahub.liteflow.util; import java.io.File; import java.io.FileInputStream; @@ -16,9 +16,9 @@ import org.dom4j.io.SAXReader; import org.xml.sax.InputSource; public class Dom4JReader { - + private static final String ENCODING_FORMAT = "UTF-8"; - + public static Document getDocument(String text) throws DocumentException { return DocumentHelper.parseText(text); } @@ -114,4 +114,4 @@ public class Dom4JReader { return saxReader.read(url); } -} \ No newline at end of file +} diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/IOUtil.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/IOUtil.java similarity index 95% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/util/IOUtil.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/util/IOUtil.java index 09c612b56..15b35bacc 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/IOUtil.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/IOUtil.java @@ -1,4 +1,4 @@ -package com.thebeastshop.liteflow.util; +package com.yomahub.liteflow.util; import java.io.FileInputStream; import java.io.InputStream; @@ -26,4 +26,4 @@ public class IOUtil { return content; } -} \ No newline at end of file +} diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/LOGOPrinter.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java similarity index 96% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/util/LOGOPrinter.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java index 1bc27212f..cc16e83b2 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/LOGOPrinter.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java @@ -1,12 +1,12 @@ -package com.thebeastshop.liteflow.util; +package com.yomahub.liteflow.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LOGOPrinter { - + private static final Logger LOG = LoggerFactory.getLogger(LOGOPrinter.class); - + public static void print() { StringBuilder str = new StringBuilder("\n"); str.append("================================================================================================\n"); diff --git a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/LimitQueue.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LimitQueue.java similarity index 98% rename from liteflow-core/src/main/java/com/thebeastshop/liteflow/util/LimitQueue.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/util/LimitQueue.java index 3bea33f8f..9e137d587 100644 --- a/liteflow-core/src/main/java/com/thebeastshop/liteflow/util/LimitQueue.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LimitQueue.java @@ -7,7 +7,7 @@ * @Date 2017-8-4 * @version 1.0 */ -package com.thebeastshop.liteflow.util; +package com.yomahub.liteflow.util; import java.util.Collection; import java.util.Iterator; diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/TestMain.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/TestMain.java deleted file mode 100644 index 98c0d0c8a..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/TestMain.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-7-27 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test; - -import java.util.Arrays; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.entity.data.Slot; - -/** - * 这是编程式引用liteflow - */ -public class TestMain { - public static void main(String[] args) throws Exception { - final FlowExecutor executor = new FlowExecutor(); - executor.setRulePath(Arrays.asList(new String[]{"config/flow.xml"})); - executor.init(); - - Slot slot = executor.execute("chain1", "it's a request"); - System.out.println(slot); - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/TestWithSpringMain.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/TestWithSpringMain.java deleted file mode 100644 index 553cf4533..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/TestWithSpringMain.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.thebeastshop.liteflow.test; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.annotation.Resource; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.entity.data.Slot; - - -/** - * 此示例演示了如何在spring中用liteflow - * 如果是springboot请参考flowtest - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "classpath:spring-test.xml" }) -public class TestWithSpringMain { - - @Resource(name="flowExecutor") - private FlowExecutor flowExecutor; - - @Test - public void test1() throws Exception { - Slot slot = flowExecutor.execute("chain1", "it's a request"); - System.out.println(slot); - System.out.println("done!"); - System.in.read(); - } - - @Test - public void test2() throws Exception { - try { - Slot slot = flowExecutor.execute("chain3", "it's a request"); - System.out.println(slot); - System.in.read(); - }catch(Exception e) { - e.printStackTrace(); - } - - } - - @Test - public void test3() throws Exception { - try { - while(true) { - Slot slot = flowExecutor.execute("chain3", "it's a request"); - Thread.sleep(2000); - } - }catch(Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/AComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/AComponent.java deleted file mode 100644 index 177ad20f9..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/AComponent.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("a") -public class AComponent extends NodeComponent { - - @Override - public void process() { - String str = this.getSlot().getRequestData(); - System.out.println(str); - System.out.println("Acomponent executed!"); - - this.getSlot().setOutput(this.getNodeId(), "A component output"); - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/BComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/BComponent.java deleted file mode 100644 index be2b80c74..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/BComponent.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("b") -public class BComponent extends NodeComponent { - - @Override - public void process() { - try { - Thread.sleep(400L); - String[] temp = new String[1000]; - } catch (InterruptedException e) { - e.printStackTrace(); - } - System.out.println("Bcomponent executed!"); - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/CComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/CComponent.java deleted file mode 100644 index 25420668e..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/CComponent.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("c") -public class CComponent extends NodeComponent { - - @Override - public void process() { - try { - String[] temp = new String[4000]; - Thread.sleep(300L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - System.out.println("Ccomponent executed!"); - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/CondComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/CondComponent.java deleted file mode 100644 index 1b39b1cf0..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/CondComponent.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - *

Title: litis

- *

Description: redis的全方位开发运维平台

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email 47483522@qq.com - * @Date 2017-11-28 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; - -@Component("cond") -public class CondComponent extends NodeCondComponent { - - @Override - protected Class processCond() throws Exception { - return BComponent.class; - } -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/DComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/DComponent.java deleted file mode 100644 index 18d7b277c..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/DComponent.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.Slot; - -@Component("d") -public class DComponent extends NodeComponent { - - @Override - public void process() { - try { - Slot slot = this.getSlot(); - String e = slot.getOutput("e"); - if(e == null){ - System.out.println(slot); - } - System.out.println("D:" + slot.getOutput("e")); - - String[] temp = new String[1400]; - Thread.sleep(450L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - System.out.println("Dcomponent executed!"); - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/EComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/EComponent.java deleted file mode 100644 index 1ceb6e439..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/EComponent.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("e") -public class EComponent extends NodeComponent { - - @Override - public void process() { - try { - Thread.sleep(120L); - System.out.println("E:" + this.getSlot().getOutput("a")); - this.getSlot().setOutput(this.getNodeId(), "E component output"); - } catch (InterruptedException e) { - e.printStackTrace(); - } - System.out.println("Eomponent executed!"); - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/FComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/FComponent.java deleted file mode 100644 index 710a3284f..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/FComponent.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("f") -public class FComponent extends NodeComponent { - - @Override - public void process() { - try { - String[] temp = new String[400]; - Thread.sleep(40L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - System.out.println("Fcomponent executed!"); - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/GComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/GComponent.java deleted file mode 100644 index fec1169aa..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/GComponent.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("g") -public class GComponent extends NodeComponent { - - @Override - public void process() { - System.out.println("Gcomponent executed!"); - this.getSlot().setResponseData("i am a response"); - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/HComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/HComponent.java deleted file mode 100644 index 0b928b319..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/HComponent.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.DefaultSlot; - -@Component("h") -public class HComponent extends NodeComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - public void process() { - System.out.println("Hcomponent executed!"); - try{ - flowExecutor.invoke("strategy1",3, DefaultSlot.class, this.getSlotIndex()); - }catch (Exception e){ - e.printStackTrace(); - } - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M1Component.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M1Component.java deleted file mode 100644 index 9efbb153f..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M1Component.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("m1") -public class M1Component extends NodeComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - public void process() { - System.out.println("m1 component executed!"); - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M2Component.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M2Component.java deleted file mode 100644 index 96a6bf906..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M2Component.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("m2") -public class M2Component extends NodeComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - public void process() { - System.out.println("m2 component executed!"); - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M3Component.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M3Component.java deleted file mode 100644 index 58ab3e06d..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/M3Component.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.DefaultSlot; - -@Component("m3") -public class M3Component extends NodeComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - public void process() { - System.out.println("m3 component executed!"); - try{ - flowExecutor.invoke("strategy2",10, DefaultSlot.class, this.getSlotIndex()); - }catch (Exception e){ - e.printStackTrace(); - } - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/MComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/MComponent.java deleted file mode 100644 index 4846a4730..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/MComponent.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; - -@Component("m") -public class MComponent extends NodeCondComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - protected Class processCond() throws Exception { - System.out.println("m conponent executed"); - Integer flag = this.getSlot().getChainReqData("strategy1"); - if(flag == 1) { - return M1Component.class; - }else if(flag == 2){ - return M2Component.class; - }else { - return M3Component.class; - } - - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/P1Component.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/P1Component.java deleted file mode 100644 index c0f1a0c00..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/P1Component.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("p1") -public class P1Component extends NodeComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - public void process() { - System.out.println("p1 component executed!"); - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/P2Component.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/P2Component.java deleted file mode 100644 index d60947c16..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/P2Component.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; - -@Component("p2") -public class P2Component extends NodeComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - public void process() { - System.out.println("p2 component executed!"); - } - -} diff --git a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/PComponent.java b/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/PComponent.java deleted file mode 100644 index d4f962bff..000000000 --- a/liteflow-core/src/test/java/com/thebeastshop/liteflow/test/component/PComponent.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - *

Title: liteFlow

- *

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

- *

Copyright: Copyright (c) 2017

- * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2017-8-1 - * @version 1.0 - */ -package com.thebeastshop.liteflow.test.component; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; - -@Component("p") -public class PComponent extends NodeCondComponent { - - @Resource - private FlowExecutor flowExecutor; - - @Override - protected Class processCond() throws Exception { - System.out.println("p conponent executed"); - Integer flag = this.getSlot().getChainReqData("strategy2"); - if(flag == 10) { - return P1Component.class; - }else { - return P2Component.class; - } - - } - -} diff --git a/liteflow-core/src/test/resources/config/flow.xml b/liteflow-core/src/test/resources/config/flow.xml deleted file mode 100644 index 25f111ce6..000000000 --- a/liteflow-core/src/test/resources/config/flow.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-core/src/test/resources/log4j.xml b/liteflow-core/src/test/resources/log4j.xml deleted file mode 100644 index 0783f0b66..000000000 --- a/liteflow-core/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-core/src/test/resources/spring-test.xml b/liteflow-core/src/test/resources/spring-test.xml deleted file mode 100644 index 26ff8018a..000000000 --- a/liteflow-core/src/test/resources/spring-test.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - config/flow.xml - - - - - - - - - - \ No newline at end of file diff --git a/liteflow-spring-boot-starter/pom.xml b/liteflow-spring-boot-starter/pom.xml index 84128fee3..7eed419a7 100644 --- a/liteflow-spring-boot-starter/pom.xml +++ b/liteflow-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> liteflow - com.thebeastshop + com.yomahub 2.2.0-SNAPSHOT 4.0.0 @@ -13,7 +13,7 @@ - com.thebeastshop + com.yomahub liteflow-core ${project.parent.version} diff --git a/liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowAutoConfiguration.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowAutoConfiguration.java similarity index 85% rename from liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowAutoConfiguration.java rename to liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowAutoConfiguration.java index 7fccef113..0d40237fa 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowAutoConfiguration.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowAutoConfiguration.java @@ -1,8 +1,8 @@ -package com.thebeastshop.liteflow.springboot; +package com.yomahub.liteflow.springboot; import com.google.common.collect.Lists; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.spring.ComponentScaner; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.spring.ComponentScaner; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowExecutorInit.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorInit.java similarity index 76% rename from liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowExecutorInit.java rename to liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorInit.java index 30c504323..4d422dcf1 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowExecutorInit.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorInit.java @@ -1,6 +1,6 @@ -package com.thebeastshop.liteflow.springboot; +package com.yomahub.liteflow.springboot; -import com.thebeastshop.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.FlowExecutor; import org.springframework.beans.factory.InitializingBean; import javax.annotation.Resource; diff --git a/liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowProperty.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java similarity index 89% rename from liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowProperty.java rename to liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java index c97115e64..e0c148356 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/thebeastshop/liteflow/springboot/LiteflowProperty.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java @@ -1,4 +1,4 @@ -package com.thebeastshop.liteflow.springboot; +package com.yomahub.liteflow.springboot; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories b/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories index 06a512b98..c580d8db2 100644 --- a/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,6 +1,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.thebeastshop.liteflow.springboot.LiteflowProperty,\ - com.thebeastshop.liteflow.springboot.LiteflowAutoConfiguration,\ - com.thebeastshop.liteflow.springboot.LiteflowExecutorInit + com.yomahub.liteflow.springboot.LiteflowProperty,\ + com.yomahub.liteflow.springboot.LiteflowAutoConfiguration,\ + com.yomahub.liteflow.springboot.LiteflowExecutorInit diff --git a/liteflow-test-spring/pom.xml b/liteflow-test-spring/pom.xml index b15c3e545..78fef5c29 100644 --- a/liteflow-test-spring/pom.xml +++ b/liteflow-test-spring/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> liteflow - com.thebeastshop + com.yomahub 2.2.0-SNAPSHOT 4.0.0 @@ -38,7 +38,7 @@ true - com.thebeastshop + com.yomahub liteflow-core ${project.parent.version} diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/Runner.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/Runner.java similarity index 83% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/Runner.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/Runner.java index 577b1726b..f154ad352 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/Runner.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/Runner.java @@ -1,7 +1,7 @@ -package com.thebeastshop.flowtest; +package com.yomahub.flowtest; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.entity.data.Slot; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.entity.data.Slot; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/AComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/AComponent.java similarity index 85% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/AComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/AComponent.java index 1f04db03b..b3da25f97 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/AComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/AComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("a") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/BComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/BComponent.java similarity index 84% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/BComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/BComponent.java index 8b70dba67..eac170a9d 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/BComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/BComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("b") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/CComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/CComponent.java similarity index 84% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/CComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/CComponent.java index 0d52e06b4..1e30eaf88 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/CComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/CComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("c") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/CondComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/CondComponent.java similarity index 73% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/CondComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/CondComponent.java index d7819b327..18637c646 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/CondComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/CondComponent.java @@ -6,10 +6,10 @@ * @email 47483522@qq.com * @Date 2017-11-28 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeCondComponent; import org.springframework.stereotype.Component; @Component("cond") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/DComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/DComponent.java similarity index 82% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/DComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/DComponent.java index 13e131a04..6cafdfa04 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/DComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/DComponent.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.Slot; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.entity.data.Slot; import org.springframework.stereotype.Component; @Component("d") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/EComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/EComponent.java similarity index 86% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/EComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/EComponent.java index c56f0c69d..80d51f637 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/EComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/EComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("e") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/FComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/FComponent.java similarity index 84% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/FComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/FComponent.java index 68af66e62..42fdb1c39 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/FComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/FComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("f") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/GComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/GComponent.java similarity index 82% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/GComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/GComponent.java index 044a2c07e..d3970a31b 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/GComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/GComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("g") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/HComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/HComponent.java similarity index 75% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/HComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/HComponent.java index 5db50e918..ec5582482 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/HComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/HComponent.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.entity.data.DefaultSlot; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M1Component.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M1Component.java similarity index 77% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M1Component.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M1Component.java index c48ff1a7a..200881c10 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M1Component.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M1Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M2Component.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M2Component.java similarity index 77% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M2Component.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M2Component.java index 5e9f491cc..3a46b0228 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M2Component.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M2Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M3Component.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M3Component.java similarity index 75% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M3Component.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M3Component.java index a742fe0f6..01fa36ceb 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M3Component.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/M3Component.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.entity.data.DefaultSlot; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/MComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/MComponent.java similarity index 78% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/MComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/MComponent.java index 1e85233e9..2957177f0 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/MComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/MComponent.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeCondComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/P1Component.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/P1Component.java similarity index 77% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/P1Component.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/P1Component.java index c244fc1da..0699bc743 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/P1Component.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/P1Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/P2Component.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/P2Component.java similarity index 77% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/P2Component.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/P2Component.java index 13c17bcc0..0c55aa9a3 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/P2Component.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/P2Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/PComponent.java b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/PComponent.java similarity index 77% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/PComponent.java rename to liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/PComponent.java index 565f0c555..ea2201e57 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/PComponent.java +++ b/liteflow-test-spring/src/main/java/com/yomahub/flowtest/components/PComponent.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeCondComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/resources/applicationContext.xml b/liteflow-test-spring/src/main/resources/applicationContext.xml index 531efac34..4a1ba551c 100644 --- a/liteflow-test-spring/src/main/resources/applicationContext.xml +++ b/liteflow-test-spring/src/main/resources/applicationContext.xml @@ -7,11 +7,11 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> - + - + - + config/flow.xml diff --git a/liteflow-test-spring/src/main/resources/config/flow.xml b/liteflow-test-spring/src/main/resources/config/flow.xml index e072affaf..a53247ed5 100644 --- a/liteflow-test-spring/src/main/resources/config/flow.xml +++ b/liteflow-test-spring/src/main/resources/config/flow.xml @@ -2,14 +2,14 @@ diff --git a/liteflow-test-springboot/pom.xml b/liteflow-test-springboot/pom.xml index 2a650880c..b5fb1e8ca 100644 --- a/liteflow-test-springboot/pom.xml +++ b/liteflow-test-springboot/pom.xml @@ -4,10 +4,9 @@ 4.0.0 liteflow - com.thebeastshop + com.yomahub 2.2.0-SNAPSHOT - com.thebeastshop liteflow-test-springboot 1.0.0 Demo project for Spring Boot @@ -36,7 +35,7 @@ - com.thebeastshop + com.yomahub liteflow-spring-boot-starter ${project.parent.version} diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/FlowtestApplication.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/FlowtestApplication.java similarity index 91% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/FlowtestApplication.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/FlowtestApplication.java index e2d0755a4..fe9062afb 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/FlowtestApplication.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/FlowtestApplication.java @@ -1,4 +1,4 @@ -package com.thebeastshop.flowtest; +package com.yomahub.flowtest; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/TestFlow.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/TestFlow.java similarity index 76% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/TestFlow.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/TestFlow.java index 92e28ea3c..11ead6667 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/TestFlow.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/TestFlow.java @@ -1,7 +1,7 @@ -package com.thebeastshop.flowtest; +package com.yomahub.flowtest; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.entity.data.Slot; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.entity.data.Slot; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/AComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/AComponent.java similarity index 85% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/AComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/AComponent.java index 1f04db03b..b3da25f97 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/AComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/AComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("a") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/BComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/BComponent.java similarity index 84% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/BComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/BComponent.java index 8b70dba67..eac170a9d 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/BComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/BComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("b") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/CComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/CComponent.java similarity index 84% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/CComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/CComponent.java index 0d52e06b4..1e30eaf88 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/CComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/CComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("c") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/CondComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/CondComponent.java similarity index 73% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/CondComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/CondComponent.java index d7819b327..18637c646 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/CondComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/CondComponent.java @@ -6,10 +6,10 @@ * @email 47483522@qq.com * @Date 2017-11-28 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeCondComponent; import org.springframework.stereotype.Component; @Component("cond") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/DComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/DComponent.java similarity index 82% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/DComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/DComponent.java index 13e131a04..6cafdfa04 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/DComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/DComponent.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.Slot; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.entity.data.Slot; import org.springframework.stereotype.Component; @Component("d") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/EComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/EComponent.java similarity index 86% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/EComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/EComponent.java index c56f0c69d..80d51f637 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/EComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/EComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("e") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/FComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/FComponent.java similarity index 84% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/FComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/FComponent.java index 68af66e62..42fdb1c39 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/FComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/FComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("f") diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/GComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/GComponent.java similarity index 82% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/GComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/GComponent.java index 044a2c07e..d3970a31b 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/GComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/GComponent.java @@ -7,9 +7,9 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("g") diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/HComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/HComponent.java similarity index 75% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/HComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/HComponent.java index 5db50e918..ec5582482 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/HComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/HComponent.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.entity.data.DefaultSlot; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M1Component.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M1Component.java similarity index 77% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M1Component.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M1Component.java index c48ff1a7a..200881c10 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/M1Component.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M1Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M2Component.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M2Component.java similarity index 77% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M2Component.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M2Component.java index 5e9f491cc..3a46b0228 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M2Component.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M2Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M3Component.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M3Component.java similarity index 75% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M3Component.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M3Component.java index a742fe0f6..01fa36ceb 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/M3Component.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/M3Component.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.entity.data.DefaultSlot; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/MComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/MComponent.java similarity index 78% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/MComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/MComponent.java index 1e85233e9..2957177f0 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/MComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/MComponent.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeCondComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/P1Component.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/P1Component.java similarity index 77% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/P1Component.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/P1Component.java index c244fc1da..0699bc743 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/P1Component.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/P1Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/P2Component.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/P2Component.java similarity index 77% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/P2Component.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/P2Component.java index 13c17bcc0..0c55aa9a3 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/components/P2Component.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/P2Component.java @@ -7,10 +7,10 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/PComponent.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/PComponent.java similarity index 77% rename from liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/PComponent.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/PComponent.java index 565f0c555..ea2201e57 100644 --- a/liteflow-test-spring/src/main/java/com/thebeastshop/flowtest/components/PComponent.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/components/PComponent.java @@ -7,11 +7,11 @@ * @Date 2017-8-1 * @version 1.0 */ -package com.thebeastshop.flowtest.components; +package com.yomahub.flowtest.components; -import com.thebeastshop.liteflow.core.FlowExecutor; -import com.thebeastshop.liteflow.core.NodeComponent; -import com.thebeastshop.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeCondComponent; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/curator/CuratorTest.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest.java similarity index 98% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/curator/CuratorTest.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest.java index 9804a5d78..64aab60bd 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/curator/CuratorTest.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest.java @@ -1,4 +1,4 @@ -package com.thebeastshop.flowtest.curator; +package com.yomahub.flowtest.curator; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/curator/CuratorTest2.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest2.java similarity index 98% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/curator/CuratorTest2.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest2.java index cb3c2a9a4..c2673117e 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/curator/CuratorTest2.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/curator/CuratorTest2.java @@ -1,4 +1,4 @@ -package com.thebeastshop.flowtest.curator; +package com.yomahub.flowtest.curator; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/regex/RegexTest.java b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/regex/RegexTest.java similarity index 93% rename from liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/regex/RegexTest.java rename to liteflow-test-springboot/src/main/java/com/yomahub/flowtest/regex/RegexTest.java index 5d1ab825f..7e4a60f3c 100644 --- a/liteflow-test-springboot/src/main/java/com/thebeastshop/flowtest/regex/RegexTest.java +++ b/liteflow-test-springboot/src/main/java/com/yomahub/flowtest/regex/RegexTest.java @@ -1,4 +1,4 @@ -package com.thebeastshop.flowtest.regex; +package com.yomahub.flowtest.regex; import java.util.ArrayList; import java.util.List; diff --git a/liteflow-test-springboot/src/main/resources/application.xml b/liteflow-test-springboot/src/main/resources/application.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/liteflow-test-springboot/src/main/resources/config/flow.xml b/liteflow-test-springboot/src/main/resources/config/flow.xml index e072affaf..a53247ed5 100644 --- a/liteflow-test-springboot/src/main/resources/config/flow.xml +++ b/liteflow-test-springboot/src/main/resources/config/flow.xml @@ -2,14 +2,14 @@ diff --git a/liteflow-test-springboot/src/test/java/com/thebeastshop/flowtest/FlowtestApplicationTests.java b/liteflow-test-springboot/src/test/java/com/yomahub/flowtest/FlowtestApplicationTests.java similarity index 90% rename from liteflow-test-springboot/src/test/java/com/thebeastshop/flowtest/FlowtestApplicationTests.java rename to liteflow-test-springboot/src/test/java/com/yomahub/flowtest/FlowtestApplicationTests.java index 97c0a42f1..bd48a6c74 100644 --- a/liteflow-test-springboot/src/test/java/com/thebeastshop/flowtest/FlowtestApplicationTests.java +++ b/liteflow-test-springboot/src/test/java/com/yomahub/flowtest/FlowtestApplicationTests.java @@ -1,4 +1,4 @@ -package com.thebeastshop.flowtest; +package com.yomahub.flowtest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/pom.xml b/pom.xml index 206181c27..0564c19ec 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@  - com.thebeastshop + com.yomahub liteflow pom 4.0.0