caseMap = new HashMap<>(8);
for (Element subElement : subElements) {
String elementName = ElementUtils.getName(subElement);
this.allowed(elementName);
- ElementDefinition currentDef;
+ ElementDefinition currentDef = new ElementDefinition();
+ ElementUtils.build(currentDef, subElement);
+ currentDef.setIdentifier(super.getIdentifier(subElement, context));
+ currentDef.setExecute(subElement.getAttribute(ParseConstants.EXECUTE));
+ currentDef.setContext(context);
+ super.parseExtensionAttributes(subElement, currentDef);
+
+ String when = subElement.getAttribute(ParseConstants.WHEN);
if (Objects.equals(elementName, ParseConstants.CASE)) {
- String when = subElement.getAttribute(ParseConstants.WHEN);
AssertUtil.notBlank(when, "branch condition is blank");
-
- currentDef = new ElementDefinition();
- ElementDefinition.build(currentDef, subElement);
- currentDef.setIdentifier(super.getIdentifier(subElement, context));
- super.parseExtensionAttributes(subElement, currentDef);
- caseList.add(currentDef);
+ caseMap.put(when, currentDef);
} else {
- currentDef = new ElementDefinition();
- ElementDefinition.build(currentDef, subElement);
- currentDef.setIdentifier(super.getIdentifier(subElement, context));
- chooseDefinition.setChooseDefaultRef(currentDef);
- super.parseExtensionAttributes(subElement, currentDef);
+ chooseDefinition.setDefaultDef(currentDef);
}
String type = subElement.getAttribute(ParseConstants.EXECUTE);
if (AuxiliaryUtils.isNotBlank(type)) {
- currentDef.setContext(context);
continue;
}
// Wrap sub elements as pipeline.
- ElementDefinition def = parseSubElements(subElement, context);
+ ComponentDefinition def = parseSubElements(subElement, context);
if (elementName.equals(ParseConstants.CASE)) {
- caseList.remove(currentDef);
- def.setWhen(subElement.getAttribute(ParseConstants.WHEN));
- caseList.add(def);
+ caseMap.put(when, def);
} else {
- chooseDefinition.setChooseDefaultRef(def);
+ chooseDefinition.setDefaultDef(def);
}
}
- chooseDefinition.setChooseCaseList(caseList);
+ chooseDefinition.setCaseMap(caseMap);
super.parseExtensionAttributes(element, chooseDefinition);
context.register(chooseDefinition);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
index 27b1918..1cdbd2f 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
@@ -20,14 +20,15 @@ public class ComponentElementParser extends AbstractElementParser {
@Override
public void doParse(Element element, ParserContext context) {
ElementDefinition elementDefinition = new ElementDefinition();
- ElementDefinition.build(elementDefinition, element);
+ ElementUtils.build(elementDefinition, element);
elementDefinition.setIdentifier(super.getIdentifier(element, context));
+ elementDefinition.setExecute(element.getAttribute(ParseConstants.EXECUTE));
String subprocess = element.getAttribute(ParseConstants.SUBPROCESS);
if (AuxiliaryUtils.isNotBlank(subprocess)) {
PipelineComponentDefinition def = new PipelineComponentDefinition();
- ElementDefinition.build(def, element);
+ ElementUtils.build(def, element);
def.setIdentifier(super.getIdentifier(element, context));
def.setPipeline(subprocess);
// @since 1.0.9, diff nested pipeline tag and ref.
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java
index dc71361..aee9550 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java
@@ -1,7 +1,7 @@
package org.smartboot.flow.core.parser;
import org.smartboot.flow.core.FlowEngine;
-import org.smartboot.flow.core.parser.definition.ElementDefinition;
+import org.smartboot.flow.core.parser.definition.FlowDefinition;
import org.smartboot.flow.core.util.AssertUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -81,7 +81,7 @@ public class DefaultParser implements Parser {
if (assemble) {
this.visitor = new BuilderDefinitionVisitor(useCache, objectCreator);
- context.getRegistered().forEach(ElementDefinition::validate);
+ context.getRegistered().forEach(FlowDefinition::validate);
context.getRegistered().forEach(p -> visitor.visit(p));
}
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java
index 47ef807..8229231 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java
@@ -4,9 +4,11 @@ import org.smartboot.flow.core.parser.definition.AdapterDefinition;
import org.smartboot.flow.core.parser.definition.ChooseDefinition;
import org.smartboot.flow.core.parser.definition.ElementDefinition;
import org.smartboot.flow.core.parser.definition.EngineDefinition;
+import org.smartboot.flow.core.parser.definition.FlowDefinition;
import org.smartboot.flow.core.parser.definition.IfElementDefinition;
import org.smartboot.flow.core.parser.definition.PipelineComponentDefinition;
import org.smartboot.flow.core.parser.definition.PipelineDefinition;
+import org.smartboot.flow.core.parser.definition.ScriptDefinition;
/**
* @author qinluo
@@ -16,11 +18,14 @@ import org.smartboot.flow.core.parser.definition.PipelineDefinition;
public interface DefinitionVisitor {
/**
- * Visit element definition.
+ * Init visitor with parse ctx.
*
- * @param ed element definition.
+ * @param ctx ctx.
+ * @since 1.0.4
*/
- void visit(ElementDefinition ed);
+ default void init(ParserContext ctx) {
+
+ }
/**
* Visit engine element.
@@ -36,25 +41,56 @@ public interface DefinitionVisitor {
*/
void visit(PipelineDefinition ed);
- void visit(PipelineComponentDefinition ed);
- void visitBasic(ElementDefinition ed);
+ /**
+ * Visit element definition.
+ *
+ * @param ed element definition.
+ */
+ void visit(FlowDefinition ed);
+
+ /**
+ * Visit adapter definition
+ *
+ * @param adapterDefinition def
+ */
+ void visit(AdapterDefinition adapterDefinition);
+
+ /**
+ * Visit subprocess definition.
+ *
+ * @param ed subprocess def.
+ */
+ void visit(PipelineComponentDefinition ed);
+ /**
+ * Visit if branch definition.
+ *
+ * @param ed if def.
+ */
void visit(IfElementDefinition ed);
+ /**
+ * Visit choose branch definition.
+ *
+ * @param ed ed.
+ */
void visit(ChooseDefinition ed);
- void visit(AdapterDefinition adapterDefinition);
-
/**
- * Init visitor with parse ctx.
+ * Visit basic component.
*
- * @param ctx ctx.
- * @since 1.0.4
+ * @param ed basic component.
*/
- default void init(ParserContext ctx) {
+ void visit(ElementDefinition ed);
- }
+ /**
+ * Visit script definition.
+ *
+ * @since 1.1.0
+ * @param ed script definition
+ */
+ void visit(ScriptDefinition ed);
/**
* Return rollback script name of name.
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java
index 7c4be16..90fea8b 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java
@@ -2,6 +2,7 @@ package org.smartboot.flow.core.parser;
import org.smartboot.flow.core.attribute.AttributeHolder;
import org.smartboot.flow.core.attribute.Attributes;
+import org.smartboot.flow.core.parser.definition.ComponentDefinition;
import org.smartboot.flow.core.util.AuxiliaryUtils;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -98,4 +99,10 @@ public final class ElementUtils {
}
return localName;
}
+
+ public static void build(ComponentDefinition definition, Element element) {
+ definition.setName(AuxiliaryUtils.or(element.getAttribute(ParseConstants.NAME), null));
+ // Extra well-known attributes.
+ definition.getAttributes().addAll(ElementUtils.extraAttributes(element));
+ }
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/EngineElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/EngineElementParser.java
index 7ee8ab0..6e45e1a 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/EngineElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/EngineElementParser.java
@@ -7,7 +7,6 @@ import org.w3c.dom.Element;
/**
* Parse engine tag.
- *
*
*
*
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExtensionAttrParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExtensionAttrParser.java
index b310606..c514876 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExtensionAttrParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExtensionAttrParser.java
@@ -11,7 +11,6 @@ public interface ExtensionAttrParser {
/**
* Returns extension attribute prefix.
- *
* for example: prefix = preexecute
*
* {@code
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java
index 4bd4a8e..f3c539e 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java
@@ -1,5 +1,6 @@
package org.smartboot.flow.core.parser;
+import org.smartboot.flow.core.parser.definition.ComponentDefinition;
import org.smartboot.flow.core.parser.definition.ElementDefinition;
import org.smartboot.flow.core.parser.definition.IfElementDefinition;
import org.smartboot.flow.core.util.AssertUtil;
@@ -35,37 +36,33 @@ public class IfElementParser extends AbstractElementParser {
AssertUtil.notBlank(test, "attribute [test] cannot be null");
IfElementDefinition ifDef = new IfElementDefinition();
- ElementDefinition.build(ifDef, element);
-
ifDef.setIdentifier(super.getIdentifier(element, context));
- ifDef.setTest(element.getAttribute(ParseConstants.TEST));
+ ifDef.setTest(test);
+ ElementUtils.build(ifDef, element);
List elementList = ElementUtils.subElements(element);
AssertUtil.isTrue(elementList.size() != 0, "[if] childNodes can't be null");
AssertUtil.isTrue(elementList.size() <= 2, "[if] childNodes only then and else");
- ElementDefinition elseDef = null;
- ElementDefinition thenDef = null;
+ ComponentDefinition elseDef = null;
+ ComponentDefinition thenDef = null;
for (Element subElement : elementList) {
// 标签名
String elementName = ElementUtils.getName(subElement);
this.allowed(elementName);
+ ElementDefinition basicDef = new ElementDefinition();
+ ElementUtils.build(basicDef, subElement);
+ basicDef.setIdentifier(super.getIdentifier(subElement, context));
+ basicDef.setContext(context);
+ basicDef.setExecute(subElement.getAttribute(ParseConstants.EXECUTE));
+ super.parseExtensionAttributes(subElement, basicDef);
+
if (Objects.equals(elementName, ParseConstants.ELSE)) {
- ElementDefinition elseDefinition = new ElementDefinition();
- ElementDefinition.build(elseDefinition, subElement);
- elseDefinition.setIdentifier(super.getIdentifier(subElement, context));
- elseDefinition.setContext(context);
- elseDef = elseDefinition;
- super.parseExtensionAttributes(subElement, elseDef);
+ elseDef = basicDef;
} else {
- ElementDefinition thenDefinition = new ElementDefinition();
- ElementDefinition.build(thenDefinition, subElement);
- thenDefinition.setIdentifier(super.getIdentifier(subElement, context));
- thenDefinition.setContext(context);
- thenDef = thenDefinition;
- super.parseExtensionAttributes(subElement, thenDef);
+ thenDef = basicDef;
}
String type = subElement.getAttribute(ParseConstants.EXECUTE);
@@ -74,7 +71,7 @@ public class IfElementParser extends AbstractElementParser {
}
// Wrap sub elements as pipeline.
- ElementDefinition def = parseSubElements(subElement, context);
+ ComponentDefinition def = parseSubElements(subElement, context);
if (Objects.equals(elementName, ParseConstants.ELSE)) {
elseDef = def;
} else if (Objects.equals(elementName, ParseConstants.THEN)) {
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParseConstants.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParseConstants.java
index 2e2cec6..1221986 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParseConstants.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParseConstants.java
@@ -38,6 +38,11 @@ public interface ParseConstants {
String THREAD = "threadpool.";
+ /**
+ * Execute binding attrs.
+ */
+ String EXECUTE_BINDING = "execute.";
+
static boolean isBuiltin(String attribute) {
return Objects.equals(EXECUTE, attribute)
|| Objects.equals(WHEN, attribute)
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParserContext.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParserContext.java
index 0671609..86930d6 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParserContext.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ParserContext.java
@@ -2,7 +2,7 @@ package org.smartboot.flow.core.parser;
import org.smartboot.flow.core.DefaultIdentifierManager;
import org.smartboot.flow.core.IdentifierManager;
-import org.smartboot.flow.core.parser.definition.ElementDefinition;
+import org.smartboot.flow.core.parser.definition.FlowDefinition;
import org.smartboot.flow.core.util.AssertUtil;
import org.w3c.dom.Element;
@@ -35,7 +35,7 @@ public class ParserContext {
private final ElementParserRegistry parserRegistry = ElementParserRegistry.getInstance();
/** Registered Element definitions */
- private final Map registered = new ConcurrentHashMap<>();
+ private final Map registered = new ConcurrentHashMap<>();
private final Map generatedIdentifiers = new ConcurrentHashMap<>();
private IdentifierManager identifierManager = new DefaultIdentifierManager();
@@ -62,18 +62,18 @@ public class ParserContext {
this.identifierManager = identifierManager;
}
- public void register(ElementDefinition ed) {
- ElementDefinition elementDefinition = registered.get(ed.getIdentifier());
+ public void register(FlowDefinition ed) {
+ FlowDefinition elementDefinition = registered.get(ed.getIdentifier());
AssertUtil.assertNull(elementDefinition, "definition " + ed.getIdentifier() + " already exist");
ed.setContext(this);
registered.put(ed.getIdentifier(), ed);
}
- public ElementDefinition getRegistered(String name) {
+ public FlowDefinition getRegistered(String name) {
return registered.get(name);
}
- public List getRegistered() {
+ public List getRegistered() {
return new ArrayList<>(registered.values());
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/PipelineElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/PipelineElementParser.java
index 0de84fb..6dc5263 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/PipelineElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/PipelineElementParser.java
@@ -1,6 +1,6 @@
package org.smartboot.flow.core.parser;
-import org.smartboot.flow.core.parser.definition.ElementDefinition;
+import org.smartboot.flow.core.parser.definition.ComponentDefinition;
import org.smartboot.flow.core.parser.definition.PipelineDefinition;
import org.smartboot.flow.core.util.AssertUtil;
import org.w3c.dom.Element;
@@ -10,7 +10,6 @@ import java.util.List;
/**
* Parse pipeline tag.
- *
*
*
*
@@ -40,9 +39,8 @@ public class PipelineElementParser extends AbstractElementParser {
definition.setName(identifier);
definition.setIdentifier(identifier);
- definition.getAttributes().addAll(ElementUtils.extraAttributes(element));
- List subDefinitions = new ArrayList<>();
+ List subDefinitions = new ArrayList<>();
for (Element sub : elements) {
subDefinitions.add(parseSubElement(sub, context));
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptElementParser.java
index a992f93..269fff9 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptElementParser.java
@@ -9,7 +9,7 @@ import org.w3c.dom.Element;
*
* @author qinluo
* @date 2022-11-15 13:00:59
- * @since 1.0.0
+ * @since 1.0.3
*/
public class ScriptElementParser extends AbstractElementParser {
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoader.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoader.java
index a6f9619..aea89ee 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoader.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoader.java
@@ -8,16 +8,16 @@ import org.smartboot.flow.core.util.AuxiliaryUtils;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.net.URL;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.HashSet;
import java.util.Set;
/**
* @author qinluo
* @date 2023/3/11 21:53
- * @since 1.0.0
+ * @since 1.0.8
*/
public class ScriptLoader {
@@ -157,7 +157,7 @@ public class ScriptLoader {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
byte[] buffer = new byte[4096];
int n;
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+ BufferedInputStream bis = new BufferedInputStream(Files.newInputStream(file.toPath()));
while ((n = bis.read(buffer, 0, buffer.length)) != -1) {
bos.write(buffer, 0, n);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoaderParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoaderParser.java
index 4b98566..87c7960 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoaderParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ScriptLoaderParser.java
@@ -7,7 +7,7 @@ import org.w3c.dom.Element;
/**
* @author qinluo
* @date 2023/3/12 23:57
- * @since 1.0.0
+ * @since 1.0.8
*/
public class ScriptLoaderParser extends AbstractElementParser {
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ThreadPoolCreator.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ThreadPoolCreator.java
index f10489a..078d97b 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ThreadPoolCreator.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ThreadPoolCreator.java
@@ -12,7 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* @author qinluo
* @date 2023/3/19 14:02
- * @since 1.0.0
+ * @since 1.0.8
*/
public class ThreadPoolCreator {
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/AdapterDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/AdapterDefinition.java
index 6a91dc0..0c46b25 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/AdapterDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/AdapterDefinition.java
@@ -12,13 +12,13 @@ import org.smartboot.flow.core.util.AssertUtil;
*/
public class AdapterDefinition extends ElementDefinition {
- private ElementDefinition pipelineElement;
+ private ComponentDefinition pipelineElement;
- public ElementDefinition getPipelineElement() {
+ public ComponentDefinition getPipelineElement() {
return this.pipelineElement;
}
- public void setPipelineElement(ElementDefinition pipelineElement) {
+ public void setPipelineElement(ComponentDefinition pipelineElement) {
this.pipelineElement = pipelineElement;
}
@@ -34,7 +34,7 @@ public class AdapterDefinition extends ElementDefinition {
}
@Override
- protected void visit0(DefinitionVisitor visitor) {
+ public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
}
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ChooseDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ChooseDefinition.java
index 4676ca3..dbe79ea 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ChooseDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ChooseDefinition.java
@@ -4,47 +4,47 @@ import org.smartboot.flow.core.component.ChooseComponent;
import org.smartboot.flow.core.parser.DefinitionVisitor;
import org.smartboot.flow.core.util.AssertUtil;
-import java.util.List;
+import java.util.Map;
/**
* @author huqiang
* @since 2022/11/16 15:29
*/
-public class ChooseDefinition extends ElementDefinition {
+public class ChooseDefinition extends ConditionDefinition {
- private ElementDefinition chooseDefaultRef;
+ private ComponentDefinition defaultDef;
- private List chooseCaseList;
+ private Map caseMap;
- public ElementDefinition getChooseDefaultRef() {
- return this.chooseDefaultRef;
+ public ComponentDefinition getDefaultDef() {
+ return this.defaultDef;
}
- public void setChooseDefaultRef(ElementDefinition chooseDefaultRef) {
- this.chooseDefaultRef = chooseDefaultRef;
+ public void setDefaultDef(ComponentDefinition chooseDefaultRef) {
+ this.defaultDef = chooseDefaultRef;
}
- public List getChooseCaseList() {
- return this.chooseCaseList;
+ public Map getCaseMap() {
+ return this.caseMap;
}
- public void setChooseCaseList(List chooseCaseList) {
- this.chooseCaseList = chooseCaseList;
+ public void setCaseMap(Map caseMap) {
+ this.caseMap = caseMap;
}
@Override
public void validate() {
- AssertUtil.notNull(chooseCaseList, "choose branch is empty");
- AssertUtil.isTrue(chooseCaseList.size() > 0, "choose branch is empty");
- chooseCaseList.forEach(ElementDefinition::validate);
+ AssertUtil.notNull(caseMap, "choose branch is empty");
+ AssertUtil.isTrue(caseMap.size() > 0, "choose branch is empty");
+ caseMap.forEach((k ,v) -> v.validate());
- if (chooseDefaultRef != null) {
- chooseDefaultRef.validate();
+ if (defaultDef != null) {
+ defaultDef.validate();
}
}
@Override
- public void visit0(DefinitionVisitor visitor) {
+ public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ComponentDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ComponentDefinition.java
new file mode 100644
index 0000000..e243f22
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ComponentDefinition.java
@@ -0,0 +1,28 @@
+package org.smartboot.flow.core.parser.definition;
+
+import org.smartboot.flow.core.ExtensionAttribute;
+import org.smartboot.flow.core.attribute.AttributeHolder;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 10:33
+ * @since 1.0.0
+ */
+public abstract class ComponentDefinition extends FlowDefinition {
+
+ private final List attributes = new ArrayList<>();
+ private final Map attributeMap = new HashMap<>(0);
+
+ public List getAttributes() {
+ return attributes;
+ }
+
+ public Map getAttributeMap() {
+ return attributeMap;
+ }
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ConditionDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ConditionDefinition.java
new file mode 100644
index 0000000..fccd14e
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ConditionDefinition.java
@@ -0,0 +1,19 @@
+package org.smartboot.flow.core.parser.definition;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 10:27
+ * @since 1.0.0
+ */
+public abstract class ConditionDefinition extends ComponentDefinition {
+
+ private String test;
+
+ public String getTest() {
+ return test;
+ }
+
+ public void setTest(String test) {
+ this.test = test;
+ }
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java
index 4cd5313..e559ed3 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java
@@ -1,69 +1,27 @@
package org.smartboot.flow.core.parser.definition;
-import org.smartboot.flow.core.ExtensionAttribute;
-import org.smartboot.flow.core.Validator;
-import org.smartboot.flow.core.common.Uniqueness;
-import org.smartboot.flow.core.attribute.AttributeHolder;
import org.smartboot.flow.core.executable.ExecutableAdapter;
import org.smartboot.flow.core.parser.DefinitionVisitor;
-import org.smartboot.flow.core.parser.ElementUtils;
-import org.smartboot.flow.core.parser.ParseConstants;
-import org.smartboot.flow.core.parser.ParserContext;
-import org.smartboot.flow.core.util.AuxiliaryUtils;
-import org.w3c.dom.Element;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @author qinluo
* @date 2022-11-15 13:00:20
* @since 1.0.0
*/
-public class ElementDefinition extends Uniqueness implements Validator {
+public class ElementDefinition extends ComponentDefinition {
- protected String name;
private String execute;
- private String test;
- private String when;
- protected ParserContext context;
- private final List attributes = new ArrayList<>();
- private final Map attributeMap = new HashMap<>(0);
-
- protected volatile boolean visitCalled = false;
@Override
- public void validate() {
-
- }
-
- public void visit(DefinitionVisitor visitor) {
- if (this.visitCalled) {
- return;
- }
-
- this.visitCalled = true;
- this.visit0(visitor);
- }
-
- protected void visit0(DefinitionVisitor visitor) {
- visitor.visitBasic(this);
+ public void doVisit(DefinitionVisitor visitor) {
+ visitor.visit(this);
}
+ @Override
public Class resolveType() {
return ExecutableAdapter.class;
}
- public static void build(ElementDefinition definition, Element element) {
- definition.setName(AuxiliaryUtils.or(element.getAttribute(ParseConstants.NAME), null));
- definition.setExecute(AuxiliaryUtils.or(element.getAttribute(ParseConstants.EXECUTE), null));
- definition.setWhen(AuxiliaryUtils.or(element.getAttribute(ParseConstants.WHEN), null));
- // Extra well-known attributes.
- definition.getAttributes().addAll(ElementUtils.extraAttributes(element));
- }
-
public String getExecute() {
return execute;
}
@@ -71,44 +29,4 @@ public class ElementDefinition extends Uniqueness implements Validator {
public void setExecute(String execute) {
this.execute = execute;
}
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public List getAttributes() {
- return attributes;
- }
-
- public String getTest() {
- return test;
- }
-
- public void setTest(String test) {
- this.test = test;
- }
-
- public String getWhen() {
- return when;
- }
-
- public void setWhen(String when) {
- this.when = when;
- }
-
- public ParserContext getContext() {
- return context;
- }
-
- public void setContext(ParserContext context) {
- this.context = context;
- }
-
- public Map getAttributeMap() {
- return attributeMap;
- }
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/EngineDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/EngineDefinition.java
index 0466c06..02158f6 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/EngineDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/EngineDefinition.java
@@ -13,13 +13,12 @@ import java.util.List;
* @date 2022-11-16 12:35:02
* @since 1.0.0
*/
-public class EngineDefinition extends ElementDefinition {
+public class EngineDefinition extends FlowDefinition {
/**
* pipeline name.
*/
private String pipeline;
-
private final List threadpools = new ArrayList<>();
private String exceptionHandler;
@@ -51,7 +50,7 @@ public class EngineDefinition extends ElementDefinition {
}
@Override
- public void visit0(DefinitionVisitor visitor) {
+ public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/FlowDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/FlowDefinition.java
new file mode 100644
index 0000000..efa37cc
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/FlowDefinition.java
@@ -0,0 +1,68 @@
+package org.smartboot.flow.core.parser.definition;
+
+
+import org.smartboot.flow.core.Validator;
+import org.smartboot.flow.core.common.Uniqueness;
+import org.smartboot.flow.core.parser.DefinitionVisitor;
+import org.smartboot.flow.core.parser.ParserContext;
+
+/**
+ * 所有定义抽象类
+ *
+ * @author qinluo
+ * @date 2023-06-17 10:16:02
+ * @since 1.1.0
+ */
+public abstract class FlowDefinition extends Uniqueness implements Validator {
+
+ /**
+ * Avoid cycle invoke.
+ */
+ protected volatile boolean visitCalled = false;
+ protected String name;
+ protected ParserContext context;
+
+ @Override
+ public void validate() {
+
+ }
+
+ public void visit(DefinitionVisitor visitor) {
+ if (this.visitCalled) {
+ return;
+ }
+
+ this.visitCalled = true;
+ this.doVisit(visitor);
+ }
+
+ /**
+ * Execute visit by subclass.
+ *
+ * @param visitor visitor.
+ */
+ public abstract void doVisit(DefinitionVisitor visitor);
+
+ /**
+ * 返回当前定义class type.
+ *
+ * @return class type.
+ */
+ public abstract Class resolveType();
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public ParserContext getContext() {
+ return context;
+ }
+
+ public void setContext(ParserContext context) {
+ this.context = context;
+ }
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/IfElementDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/IfElementDefinition.java
index 455b091..0e62cd7 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/IfElementDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/IfElementDefinition.java
@@ -8,25 +8,25 @@ import org.smartboot.flow.core.util.AssertUtil;
* @author huqiang
* @since 2022/11/16 15:30
*/
-public class IfElementDefinition extends ElementDefinition {
+public class IfElementDefinition extends ConditionDefinition {
- private ElementDefinition ifThenRef;
+ private ComponentDefinition ifThenRef;
- private ElementDefinition ifElseRef;
+ private ComponentDefinition ifElseRef;
- public ElementDefinition getIfThenRef() {
+ public ComponentDefinition getIfThenRef() {
return this.ifThenRef;
}
- public void setIfThenRef(ElementDefinition ifThenRef) {
+ public void setIfThenRef(ComponentDefinition ifThenRef) {
this.ifThenRef = ifThenRef;
}
- public ElementDefinition getIfElseRef() {
+ public ComponentDefinition getIfElseRef() {
return this.ifElseRef;
}
- public void setIfElseRef(ElementDefinition ifElseRef) {
+ public void setIfElseRef(ComponentDefinition ifElseRef) {
this.ifElseRef = ifElseRef;
}
@@ -42,7 +42,7 @@ public class IfElementDefinition extends ElementDefinition {
}
@Override
- public void visit0(DefinitionVisitor visitor) {
+ public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java
index 0423138..63b31d8 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java
@@ -32,7 +32,7 @@ public class PipelineComponentDefinition extends ElementDefinition {
}
@Override
- public void visit0(DefinitionVisitor visitor) {
+ public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineDefinition.java
index 438ef39..a21b423 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineDefinition.java
@@ -11,15 +11,15 @@ import java.util.List;
* @date 2022-11-16 12:40:46
* @since 1.0.0
*/
-public class PipelineDefinition extends ElementDefinition {
+public class PipelineDefinition extends FlowDefinition {
- private List children;
+ private List children;
- public List getChildren() {
+ public List getChildren() {
return children;
}
- public void setChildren(List children) {
+ public void setChildren(List children) {
this.children = children;
}
@@ -31,7 +31,7 @@ public class PipelineDefinition extends ElementDefinition {
}
@Override
- public void visit0(DefinitionVisitor visitor) {
+ public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ScriptDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ScriptDefinition.java
index d31bac2..1472b6f 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ScriptDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ScriptDefinition.java
@@ -11,7 +11,7 @@ import org.smartboot.flow.core.util.AuxiliaryUtils;
* @date 2022-11-15 13:00:20
* @since 1.0.0
*/
-public class ScriptDefinition extends ElementDefinition {
+public class ScriptDefinition extends FlowDefinition {
private String type;
private String script;
@@ -55,7 +55,7 @@ public class ScriptDefinition extends ElementDefinition {
}
@Override
- protected void visit0(DefinitionVisitor visitor) {
+ public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/visitor/ExecutableVisitor.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/visitor/ExecutableVisitor.java
index 66f57d6..362b75e 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/visitor/ExecutableVisitor.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/visitor/ExecutableVisitor.java
@@ -2,6 +2,8 @@ package org.smartboot.flow.core.visitor;
import org.smartboot.flow.core.executable.Executable;
+import java.util.Map;
+
/**
* @author qinluo
* @date 2022-11-13 22:34:58
@@ -27,4 +29,16 @@ public class ExecutableVisitor {
delegate.visitSource(executable);
}
}
+
+ /**
+ * Visit binding attributes that starts with execute.
+ *
+ * @since 1.1.0
+ * @param attrs binding attributes.
+ */
+ public void visitBindingAttrs(Map attrs) {
+ if (delegate != null) {
+ delegate.visitBindingAttrs(attrs);
+ }
+ }
}
diff --git a/smart-flow-core/src/main/resources/smart-flow-1.0.1.xsd b/smart-flow-core/src/main/resources/smart-flow-1.0.1.xsd
index f4aba09..0e38d95 100644
--- a/smart-flow-core/src/main/resources/smart-flow-1.0.1.xsd
+++ b/smart-flow-core/src/main/resources/smart-flow-1.0.1.xsd
@@ -223,7 +223,11 @@
-
+
+
+
+
+
diff --git a/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlEngineVisitor.java b/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlEngineVisitor.java
index 110c828..d10a4fa 100644
--- a/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlEngineVisitor.java
+++ b/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlEngineVisitor.java
@@ -68,7 +68,7 @@ public class XmlEngineVisitor extends EngineVisitor {
if (scripts != null && scripts.size() > 0) {
scripts.forEach((k, v) -> content.append("\n\t"));
+ .append("\">").append("").append(""));
}
content.append("\n").append(END).append("\n");
diff --git a/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java b/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
index ca833f3..5e96e06 100644
--- a/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
+++ b/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
@@ -8,8 +8,11 @@ import org.smartboot.flow.core.parser.ParserContext;
import org.smartboot.flow.core.parser.ThreadPoolCreator;
import org.smartboot.flow.core.parser.definition.AdapterDefinition;
import org.smartboot.flow.core.parser.definition.ChooseDefinition;
+import org.smartboot.flow.core.parser.definition.ComponentDefinition;
+import org.smartboot.flow.core.parser.definition.ConditionDefinition;
import org.smartboot.flow.core.parser.definition.ElementDefinition;
import org.smartboot.flow.core.parser.definition.EngineDefinition;
+import org.smartboot.flow.core.parser.definition.FlowDefinition;
import org.smartboot.flow.core.parser.definition.IfElementDefinition;
import org.smartboot.flow.core.parser.definition.PipelineComponentDefinition;
import org.smartboot.flow.core.parser.definition.PipelineDefinition;
@@ -31,6 +34,7 @@ import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.factory.support.RootBeanDefinition;
import java.util.List;
+import java.util.Map;
/**
* @author qinluo
@@ -69,37 +73,36 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
}
@Override
- public void visit(ElementDefinition ed) {
- if (ed instanceof ScriptDefinition) {
- ScriptDefinition sed = (ScriptDefinition)ed;
- Class javaType = sed.getJavaType();
- // Maybe a ref.
- if (javaType == null) {
- BeanDefinition beanDefinition = register.getBeanDefinition(sed.getName());
- AssertUtil.notNull(beanDefinition, "Could not found ScriptExecutor " + sed.getName() + " in spring container");
- String beanClassName = beanDefinition.getBeanClassName();
- Class defJavaType = AuxiliaryUtils.asClass(beanClassName);
- AssertUtil.notNull(defJavaType, "bean " + sed.getName() + " javaType must be subclass of ScriptExecutor");
- AssertUtil.isTrue(ScriptExecutor.class.isAssignableFrom(defJavaType), "bean " + sed.getName() + " javaType must be subclass of ScriptExecutor");
-
- // Register script content.
- beanDefinition.getPropertyValues().add("script", sed.getScript());
-
- if (AuxiliaryUtils.isNotBlank(sed.getName())) {
- beanDefinition.getPropertyValues().add("name", sed.getName());
- }
- } else {
- RootBeanDefinition definition = asSpringDefinition(ed);
- PropertyValue script = new PropertyValue("script", sed.getScript());
- definition.getPropertyValues().addPropertyValue(script);
- register.registerBeanDefinition(ed.getIdentifier(), definition, true);
+ public void visit(ScriptDefinition sed) {
+ Class javaType = sed.getJavaType();
+ // Maybe a ref.
+ if (javaType == null) {
+ BeanDefinition beanDefinition = register.getBeanDefinition(sed.getName());
+ AssertUtil.notNull(beanDefinition, "Could not found ScriptExecutor " + sed.getName() + " in spring container");
+ String beanClassName = beanDefinition.getBeanClassName();
+ Class defJavaType = AuxiliaryUtils.asClass(beanClassName);
+ AssertUtil.notNull(defJavaType, "bean " + sed.getName() + " javaType must be subclass of ScriptExecutor");
+ AssertUtil.isTrue(ScriptExecutor.class.isAssignableFrom(defJavaType), "bean " + sed.getName() + " javaType must be subclass of ScriptExecutor");
+
+ // Register script content.
+ beanDefinition.getPropertyValues().add("script", sed.getScript());
+
+ if (AuxiliaryUtils.isNotBlank(sed.getName())) {
+ beanDefinition.getPropertyValues().add("name", sed.getName());
}
-
} else {
- ed.visit(this);
+ RootBeanDefinition definition = asSpringDefinition(sed);
+ PropertyValue script = new PropertyValue("script", sed.getScript());
+ definition.getPropertyValues().addPropertyValue(script);
+ register.registerBeanDefinition(sed.getIdentifier(), definition, true);
}
}
+ @Override
+ public void visit(FlowDefinition ed) {
+ ed.visit(this);
+ }
+
@Override
public void visit(EngineDefinition ed) {
RootBeanDefinition definition = asSpringDefinition(ed);
@@ -135,7 +138,7 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
ed.getChildren().forEach(p -> p.visit(this));
- for (ElementDefinition elementDef : ed.getChildren()) {
+ for (ComponentDefinition elementDef : ed.getChildren()) {
// Fire sub visit.
elementDef.visit(this);
@@ -163,7 +166,7 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
register.registerBeanDefinition(ed.getIdentifier(), definition);
}
- private void appendAttributes(ElementDefinition ed, RootBeanDefinition definition) {
+ private void appendAttributes(ComponentDefinition ed, RootBeanDefinition definition) {
List attributes = ed.getAttributes();
AttributeValueResolver resolver = AttributeValueResolver.getInstance();
@@ -194,7 +197,7 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
}
@Override
- public void visitBasic(ElementDefinition ed) {
+ public void visit(ElementDefinition ed) {
RootBeanDefinition definition = asSpringDefinition(ed);
String execute = ed.getExecute();
@@ -280,20 +283,20 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
processCondition(ed, definition);
ManagedMap managedMap = new ManagedMap<>();
- List chooseCaseList = ed.getChooseCaseList();
- for (ElementDefinition caseDef : chooseCaseList) {
- caseDef.visit(this);
- BeanDefinition beanDefinition = register.getBeanDefinition(caseDef.getIdentifier());
- AssertUtil.notNull(beanDefinition, "case " + caseDef.getWhen() + " " + ed.getChooseDefaultRef().getIdentifier() + " not exist");
- managedMap.put(caseDef.getWhen(), beanDefinition);
+ Map caseMap = ed.getCaseMap();
+ for (Map.Entry entry : caseMap.entrySet()) {
+ entry.getValue().visit(this);
+ BeanDefinition beanDefinition = register.getBeanDefinition(entry.getValue().getIdentifier());
+ AssertUtil.notNull(beanDefinition, "case " + entry.getKey() + " " + ed.getDefaultDef().getIdentifier() + " not exist");
+ managedMap.put(entry.getKey(), beanDefinition);
}
definition.getPropertyValues().add("branches", managedMap);
- if (ed.getChooseDefaultRef() != null) {
- ed.getChooseDefaultRef().visit(this);
- BeanDefinition beanDefinition = register.getBeanDefinition(ed.getChooseDefaultRef().getIdentifier());
- AssertUtil.notNull(beanDefinition, ed.getChooseDefaultRef().getIdentifier() + " not exist");
+ if (ed.getDefaultDef() != null) {
+ ed.getDefaultDef().visit(this);
+ BeanDefinition beanDefinition = register.getBeanDefinition(ed.getDefaultDef().getIdentifier());
+ AssertUtil.notNull(beanDefinition, ed.getDefaultDef().getIdentifier() + " not exist");
definition.getPropertyValues().add("defaultBranch", beanDefinition);
}
@@ -301,7 +304,7 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
register.registerBeanDefinition(ed.getIdentifier(), definition);
}
- private void processCondition(ElementDefinition ed, RootBeanDefinition definition) {
+ private void processCondition(ConditionDefinition ed, RootBeanDefinition definition) {
String test = ed.getTest();
if (AuxiliaryUtils.isType(test)) {
@@ -346,7 +349,7 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
}
- private RootBeanDefinition asSpringDefinition(ElementDefinition ed) {
+ private RootBeanDefinition asSpringDefinition(FlowDefinition ed) {
RootBeanDefinition definition = new RootBeanDefinition();
PropertyValue name = new PropertyValue("name", ed.getName());
definition.setBeanClass(ed.resolveType());
--
Gitee
From 48386aa63f14a7e5b32cc7ad1947587732f3aed1 Mon Sep 17 00:00:00 2001
From: qinluo <1558642210@qq.com>
Date: Sat, 17 Jun 2023 12:11:56 +0800
Subject: [PATCH 07/22] =?UTF-8?q?qinluo:=20=20=20=20=20=20-=20=E6=96=B9?=
=?UTF-8?q?=E6=B3=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../core/parser/BuilderDefinitionVisitor.java | 5 -----
.../flow/core/parser/DefinitionVisitor.java | 15 ++++++++-------
.../spring/extension/BeanDefinitionVisitor.java | 5 -----
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
index 5214423..b7ae241 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
@@ -71,11 +71,6 @@ public class BuilderDefinitionVisitor implements DefinitionVisitor {
scriptExecutors.put(sed.getIdentifier(), scriptExecutor);
}
- @Override
- public void visit(FlowDefinition ed) {
- ed.visit(this);
- }
-
@Override
public void visit(PipelineDefinition ed) {
PipelineBuilder pipelineBuilder = namedPipelines.get(ed.getIdentifier());
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java
index 8229231..b9e439e 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefinitionVisitor.java
@@ -28,26 +28,27 @@ public interface DefinitionVisitor {
}
/**
- * Visit engine element.
+ * Visit element definition.
*
* @param ed element definition.
*/
- void visit(EngineDefinition ed);
+ default void visit(FlowDefinition ed) {
+ ed.visit(this);
+ }
/**
- * Visit pipeline element
+ * Visit engine element.
*
* @param ed element definition.
*/
- void visit(PipelineDefinition ed);
-
+ void visit(EngineDefinition ed);
/**
- * Visit element definition.
+ * Visit pipeline element
*
* @param ed element definition.
*/
- void visit(FlowDefinition ed);
+ void visit(PipelineDefinition ed);
/**
* Visit adapter definition
diff --git a/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java b/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
index 5e96e06..dd31b3a 100644
--- a/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
+++ b/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
@@ -98,11 +98,6 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
}
}
- @Override
- public void visit(FlowDefinition ed) {
- ed.visit(this);
- }
-
@Override
public void visit(EngineDefinition ed) {
RootBeanDefinition definition = asSpringDefinition(ed);
--
Gitee
From 4a827f7b6f9062ee1562b6b4fafc6d105c526988 Mon Sep 17 00:00:00 2001
From: qinluo <1558642210@qq.com>
Date: Sat, 17 Jun 2023 16:20:22 +0800
Subject: [PATCH 08/22] =?UTF-8?q?qinluo:=20=20=20=20=20=20-=20executable?=
=?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../attribute/AttributeValueResolver.java | 15 ++-
.../core/parser/BuilderDefinitionVisitor.java | 42 ++++++-
.../flow/core/parser/ChooseElementParser.java | 1 +
.../core/parser/ComponentElementParser.java | 1 +
.../flow/core/parser/ElementUtils.java | 4 +
.../flow/core/parser/IfElementParser.java | 1 +
.../flow/core/parser/ReflectionUtils.java | 107 ++++++++++++++++++
.../parser/definition/ElementDefinition.java | 15 +++
.../PipelineComponentDefinition.java | 2 +-
.../flow/helper/view/XmlComponentVisitor.java | 16 +++
.../extension/BeanDefinitionVisitor.java | 25 +++-
11 files changed, 220 insertions(+), 9 deletions(-)
create mode 100644 smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ReflectionUtils.java
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
index 2bb68d3..34bcf2d 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
@@ -30,21 +30,20 @@ public class AttributeValueResolver {
return INSTANCE;
}
- public Object resolve(Attributes attribute, Object value) {
+ public Object resolve(Class accepted, Object value) {
if (value == null) {
return null;
}
- if (attribute.accept(value)) {
+ if (accepted.isInstance(value)) {
return value;
}
- Class accepted = attribute.accept;
// Must as string
String strValue = String.valueOf(value);
// For string
- if (attribute.accept(strValue)) {
+ if (accepted == String.class) {
return strValue;
}
@@ -99,11 +98,15 @@ public class AttributeValueResolver {
// for classname.
try {
- return objectCreator.create(strValue, attribute.accept,true);
+ return objectCreator.create(strValue, accepted,true);
} catch (Exception ignored) {
// Maybe not a class.
}
- throw new FlowException("Can't not resolve attribute [" + attribute.getName() + "] value with " + value);
+ throw new FlowException("Can't not resolve [" + accepted + "] value with " + value);
+ }
+
+ public Object resolve(Attributes attribute, Object value) {
+ return resolve(attribute.accept, value);
}
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
index b7ae241..615b14e 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
@@ -1,5 +1,7 @@
package org.smartboot.flow.core.parser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.smartboot.flow.core.Adapter;
import org.smartboot.flow.core.Condition;
import org.smartboot.flow.core.FlowEngine;
@@ -15,6 +17,7 @@ import org.smartboot.flow.core.component.ChooseComponent;
import org.smartboot.flow.core.component.Component;
import org.smartboot.flow.core.component.PipelineComponent;
import org.smartboot.flow.core.exception.ExceptionHandler;
+import org.smartboot.flow.core.executable.DecorateExecutable;
import org.smartboot.flow.core.executable.Executable;
import org.smartboot.flow.core.parser.definition.AdapterDefinition;
import org.smartboot.flow.core.parser.definition.ChooseDefinition;
@@ -33,10 +36,13 @@ import org.smartboot.flow.core.script.ScriptExecutor;
import org.smartboot.flow.core.util.AssertUtil;
import org.smartboot.flow.core.util.AuxiliaryUtils;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
/**
* @author qinluo
@@ -46,6 +52,8 @@ import java.util.concurrent.ConcurrentHashMap;
@SuppressWarnings({"rawtypes", "unchecked"})
public class BuilderDefinitionVisitor implements DefinitionVisitor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(BuilderDefinitionVisitor.class);
+
private final Map> namedComponents = new ConcurrentHashMap<>();
private final Map assembledPipelines = new ConcurrentHashMap<>();
private final Map> namedPipelines = new ConcurrentHashMap<>();
@@ -161,7 +169,7 @@ public class BuilderDefinitionVisitor implements DefinitionVisitor {
} else if (ed.getContext().getRegistered(ed.getExecute()) instanceof ScriptDefinition) {
executable = new ScriptExecutable();
ScriptExecutor scriptExecutor = getScriptExecutor(ed.getExecute(), ed.getContext());
- AssertUtil.notNull(scriptExecutor, "script executor is null");
+ AssertUtil.notNull(scriptExecutor, "script executor " + ed.getExecute() + " is null");
((ScriptExecutable)executable).setScriptExecutor(scriptExecutor);
String rollback = getRollbackScriptName(ed.getExecute());
@@ -175,6 +183,8 @@ public class BuilderDefinitionVisitor implements DefinitionVisitor {
}
AssertUtil.notNull(executable, "executable " + executable + " is null");
+ executable = decorateIfNecessary(executable, ed);
+
Component component = Builders.executable()
.executable(executable)
.withResolver(valueResolver)
@@ -184,6 +194,36 @@ public class BuilderDefinitionVisitor implements DefinitionVisitor {
namedComponents.put(ed.getIdentifier(), component);
}
+ private Executable decorateIfNecessary(Executable executable, ElementDefinition ed) {
+ if (ed.getBindingAttrs().size() == 0) {
+ return executable;
+ }
+
+ DecorateExecutable decorate = new DecorateExecutable();
+ decorate.setDelegate(executable);
+ decorate.setBindingAttrs(ed.getBindingAttrs().stream().collect(Collectors.toMap(ElementAttr::getName, ElementAttr::getValue)));
+
+ // binding attributes.
+ for (ElementAttr attr : ed.getBindingAttrs()) {
+ String fieldName = attr.getName().substring(ParseConstants.EXECUTE_BINDING.length());
+ Method m = ReflectionUtils.lookUpMethod(executable.getClass(), fieldName);
+ if (m != null) {
+ Object value = valueResolver.resolve(m.getParameterTypes()[0], attr.getValue());
+ ReflectionUtils.invokeMethod(executable, m, new Object[] { value });
+ continue;
+ }
+ Field f = ReflectionUtils.lookupField(executable.getClass(), fieldName);
+ if (f != null) {
+ Object value = valueResolver.resolve(f.getType(), attr.getValue());
+ ReflectionUtils.setField(executable, f, value);
+ continue;
+ }
+ LOGGER.warn("field {} of value {} failed to set in executable {}", attr.getName(), attr.getValue(), executable.getClass().getName());
+ }
+
+ return decorate;
+ }
+
private T newInstance(String type, Class expectType) {
return objectCreator.create(type, expectType, useCache);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ChooseElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ChooseElementParser.java
index 82b64fe..dfa102b 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ChooseElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ChooseElementParser.java
@@ -53,6 +53,7 @@ public class ChooseElementParser extends AbstractElementParser{
currentDef.setIdentifier(super.getIdentifier(subElement, context));
currentDef.setExecute(subElement.getAttribute(ParseConstants.EXECUTE));
currentDef.setContext(context);
+ currentDef.getBindingAttrs().addAll(ElementUtils.extraAttributes(element, ParseConstants.EXECUTE_BINDING));
super.parseExtensionAttributes(subElement, currentDef);
String when = subElement.getAttribute(ParseConstants.WHEN);
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
index 1cdbd2f..6f3aeec 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
@@ -24,6 +24,7 @@ public class ComponentElementParser extends AbstractElementParser {
elementDefinition.setIdentifier(super.getIdentifier(element, context));
elementDefinition.setExecute(element.getAttribute(ParseConstants.EXECUTE));
+ elementDefinition.getBindingAttrs().addAll(ElementUtils.extraAttributes(element, ParseConstants.EXECUTE_BINDING));
String subprocess = element.getAttribute(ParseConstants.SUBPROCESS);
if (AuxiliaryUtils.isNotBlank(subprocess)) {
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java
index 90fea8b..56dbfaf 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ElementUtils.java
@@ -43,6 +43,10 @@ public final class ElementUtils {
return holders;
}
+ public static List extraAttributes(Element element, String prefix) {
+ return extraAttributes(element, new PrefixAttributeAcceptor(prefix));
+ }
+
/**
* Extra prefix attributes
*/
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java
index f3c539e..f3d9bf1 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/IfElementParser.java
@@ -54,6 +54,7 @@ public class IfElementParser extends AbstractElementParser {
ElementDefinition basicDef = new ElementDefinition();
ElementUtils.build(basicDef, subElement);
+ basicDef.getBindingAttrs().addAll(ElementUtils.extraAttributes(element, ParseConstants.EXECUTE_BINDING));
basicDef.setIdentifier(super.getIdentifier(subElement, context));
basicDef.setContext(context);
basicDef.setExecute(subElement.getAttribute(ParseConstants.EXECUTE));
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ReflectionUtils.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ReflectionUtils.java
new file mode 100644
index 0000000..459c295
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ReflectionUtils.java
@@ -0,0 +1,107 @@
+package org.smartboot.flow.core.parser;
+
+import org.smartboot.flow.core.exception.FlowException;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Stack;
+import java.util.stream.Collectors;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 12:20
+ * @since 1.0.0
+ */
+public class ReflectionUtils {
+
+ private static final String SETTER_PREFIX = "set";
+
+ public static Method lookUpMethod(Class type, String fieldName) {
+ String methodName = SETTER_PREFIX + fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+ List> classes = collectAllSuperClassAndInterfaces(type);
+
+ for (Class clazz : classes) {
+ Method[] declaredMethods = clazz.getDeclaredMethods();
+ for (Method m : declaredMethods) {
+ if (Objects.equals(m.getName(), methodName) && m.getParameterCount() == 1) {
+ return m;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static Field lookupField(Class type, String fieldName) {
+ List> classes = collectAllSuperClassAndInterfaces(type);
+
+ for (Class clazz : classes) {
+ Field[] declaredFields = clazz.getDeclaredFields();
+ for (Field f : declaredFields) {
+ if (Objects.equals(f.getName(), fieldName)) {
+ return f;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static List> collectAllSuperClassAndInterfaces(Class type) {
+ List> classes = new ArrayList<>(8);
+ if (type == null) {
+ return classes;
+ }
+
+ Class st = type;
+
+ // Collect super class.
+ while (st != null && st != Object.class) {
+ classes.add(st);
+ st = st.getSuperclass();
+ }
+
+ // Collect interfaces.
+ Stack> stack = new Stack<>();
+ stack.add(type);
+
+ while (!stack.isEmpty()) {
+ st = stack.pop();
+ Class[] interfaces = st.getInterfaces();
+ classes.addAll(Arrays.asList(interfaces));
+ stack.addAll(Arrays.asList(interfaces));
+ }
+
+ return classes.stream().distinct().collect(Collectors.toList());
+ }
+
+ public static void invokeMethod(Object target, Method m, Object[] args) {
+ if (target == null || m == null || args == null) {
+ return;
+ }
+
+ try {
+ m.setAccessible(true);
+ m.invoke(target, args);
+ } catch (Exception e) {
+ throw new FlowException("invoke method failed", e);
+ }
+ }
+
+ public static void setField(Object target, Field f, Object value) {
+ if (target == null || f == null || value == null) {
+ return;
+ }
+
+ try {
+ f.setAccessible(true);
+ f.set(target, value);
+ } catch (Exception e) {
+ throw new FlowException("invoke field failed", e);
+ }
+ }
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java
index e559ed3..25eb83d 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/ElementDefinition.java
@@ -2,6 +2,10 @@ package org.smartboot.flow.core.parser.definition;
import org.smartboot.flow.core.executable.ExecutableAdapter;
import org.smartboot.flow.core.parser.DefinitionVisitor;
+import org.smartboot.flow.core.parser.ElementAttr;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* @author qinluo
@@ -12,6 +16,13 @@ public class ElementDefinition extends ComponentDefinition {
private String execute;
+ /**
+ * Attributes that starts with {@link org.smartboot.flow.core.parser.ParseConstants#EXECUTE_BINDING}
+ *
+ * @since 1.1.0
+ */
+ private final List bindingAttrs = new ArrayList<>(0);
+
@Override
public void doVisit(DefinitionVisitor visitor) {
visitor.visit(this);
@@ -29,4 +40,8 @@ public class ElementDefinition extends ComponentDefinition {
public void setExecute(String execute) {
this.execute = execute;
}
+
+ public List getBindingAttrs() {
+ return bindingAttrs;
+ }
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java
index 63b31d8..12c3d8e 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/definition/PipelineComponentDefinition.java
@@ -9,7 +9,7 @@ import org.smartboot.flow.core.util.AssertUtil;
* @date 2022-11-16 13:10:17
* @since 1.0.0
*/
-public class PipelineComponentDefinition extends ElementDefinition {
+public class PipelineComponentDefinition extends ComponentDefinition {
/**
* pipeline name.
diff --git a/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java b/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java
index f0ecfe6..b99c77e 100644
--- a/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java
+++ b/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java
@@ -16,8 +16,10 @@ import org.smartboot.flow.core.visitor.ExecutableVisitor;
import org.smartboot.flow.core.visitor.PipelineVisitor;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -43,6 +45,7 @@ public class XmlComponentVisitor extends ComponentVisitor {
private String rollbackScriptType;
private boolean referencedPipeline;
+ private Map bindingAttrs = new HashMap<>(0);
private List extensionAttributes = new ArrayList<>(0);
public XmlComponentVisitor(ComponentType type, String name, String ignoredDescribe) {
@@ -111,6 +114,14 @@ public class XmlComponentVisitor extends ComponentVisitor {
}
});
}
+
+ this.bindingAttrs.forEach((k ,v) -> {
+ content.append("\n");
+ AuxiliaryUtils.appendTab(content, numbersOfTab + 1);
+ if (appended.add(k)) {
+ content.append(k).append("=\"").append(v).append("\" ");
+ }
+ });
}
private String processValue(Object value) {
@@ -240,6 +251,11 @@ public class XmlComponentVisitor extends ComponentVisitor {
private class XmlExecutableVisitor extends ExecutableVisitor {
+ @Override
+ public void visitBindingAttrs(Map attrs) {
+ XmlComponentVisitor.this.bindingAttrs = attrs;
+ }
+
@Override
public void visitSource(Executable executable) {
if (executable instanceof ScriptExecutable) {
diff --git a/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java b/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
index dd31b3a..aea7d2a 100644
--- a/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
+++ b/smart-flow-spring-extension/src/main/java/org/smartboot/flow/spring/extension/BeanDefinitionVisitor.java
@@ -3,7 +3,10 @@ package org.smartboot.flow.spring.extension;
import org.smartboot.flow.core.attribute.AttributeHolder;
import org.smartboot.flow.core.attribute.AttributeValueResolver;
import org.smartboot.flow.core.attribute.Attributes;
+import org.smartboot.flow.core.executable.DecorateExecutable;
import org.smartboot.flow.core.parser.DefinitionVisitor;
+import org.smartboot.flow.core.parser.ElementAttr;
+import org.smartboot.flow.core.parser.ParseConstants;
import org.smartboot.flow.core.parser.ParserContext;
import org.smartboot.flow.core.parser.ThreadPoolCreator;
import org.smartboot.flow.core.parser.definition.AdapterDefinition;
@@ -35,6 +38,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author qinluo
@@ -191,6 +195,25 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
}
}
+ private RootBeanDefinition decorateIfNecessary(RootBeanDefinition originDef, ElementDefinition ed) {
+ if (ed.getBindingAttrs().size() == 0) {
+ return originDef;
+ }
+
+ RootBeanDefinition decorateDef = new RootBeanDefinition();
+ decorateDef.setBeanClass(DecorateExecutable.class);
+ decorateDef.getPropertyValues().add("delegate", originDef);
+ decorateDef.getPropertyValues().add("bindingAttrs", ed.getBindingAttrs().stream().collect(Collectors.toMap(ElementAttr::getName, ElementAttr::getValue)));
+
+ // binding attributes.
+ for (ElementAttr attr : ed.getBindingAttrs()) {
+ String fieldName = attr.getName().substring(ParseConstants.EXECUTE_BINDING.length());
+ originDef.getPropertyValues().add(fieldName, attr.getValue());
+ }
+
+ return decorateDef;
+ }
+
@Override
public void visit(ElementDefinition ed) {
RootBeanDefinition definition = asSpringDefinition(ed);
@@ -200,7 +223,7 @@ public class BeanDefinitionVisitor implements DefinitionVisitor, BeanFactoryAwar
if (AuxiliaryUtils.isType(execute)) {
RootBeanDefinition conditionDef = new RootBeanDefinition();
conditionDef.setBeanClassName(execute);
- definition.getPropertyValues().add("executable", conditionDef);
+ definition.getPropertyValues().add("executable", decorateIfNecessary(conditionDef, ed));
} else if (ed.getContext().getRegistered(execute) instanceof ScriptDefinition) {
ed.getContext().getRegistered(execute).visit(this);
BeanDefinition beanDefinition = register.getBeanDefinition(execute);
--
Gitee
From 6318b268da4219ffbb6ace3de8dde87bb5295d38 Mon Sep 17 00:00:00 2001
From: qinluo <1558642210@qq.com>
Date: Sat, 17 Jun 2023 16:26:05 +0800
Subject: [PATCH 09/22] =?UTF-8?q?qinluo:=20=20=20=20=20=20-=20=E6=8F=90?=
=?UTF-8?q?=E4=BE=9B=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=A3=E6=9E=90=E5=AF=B9?=
=?UTF-8?q?=E8=B1=A1=E5=8F=A3=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../flow/core/parser/BuilderDefinitionVisitor.java | 4 ++--
.../org/smartboot/flow/core/parser/DefaultParser.java | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
index 615b14e..ca3007e 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
@@ -65,10 +65,10 @@ public class BuilderDefinitionVisitor implements DefinitionVisitor {
private final boolean useCache;
private final AttributeValueResolver valueResolver;
- public BuilderDefinitionVisitor(boolean useCache, ObjectCreator objectCreator) {
+ public BuilderDefinitionVisitor(boolean useCache, ObjectCreator objectCreator, AttributeValueResolver resolver) {
this.useCache = useCache;
this.objectCreator = objectCreator;
- this.valueResolver = new AttributeValueResolver(objectCreator);
+ this.valueResolver = resolver;
}
@Override
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java
index aee9550..790e20b 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/DefaultParser.java
@@ -1,6 +1,7 @@
package org.smartboot.flow.core.parser;
import org.smartboot.flow.core.FlowEngine;
+import org.smartboot.flow.core.attribute.AttributeValueResolver;
import org.smartboot.flow.core.parser.definition.FlowDefinition;
import org.smartboot.flow.core.util.AssertUtil;
import org.w3c.dom.Document;
@@ -32,6 +33,7 @@ public class DefaultParser implements Parser {
private BuilderDefinitionVisitor visitor;
private final ParserContext context = new ParserContext();
private ObjectCreator objectCreator = DefaultObjectCreator.getInstance();
+ private AttributeValueResolver resolver = null;
private boolean assemble = true;
private final ScriptLoader scriptLoader = new ScriptLoader();
@@ -80,7 +82,7 @@ public class DefaultParser implements Parser {
scriptLoader.load(context);
if (assemble) {
- this.visitor = new BuilderDefinitionVisitor(useCache, objectCreator);
+ this.visitor = new BuilderDefinitionVisitor(useCache, objectCreator, resolver != null ? resolver : new AttributeValueResolver(objectCreator));
context.getRegistered().forEach(FlowDefinition::validate);
context.getRegistered().forEach(p -> visitor.visit(p));
}
@@ -120,6 +122,10 @@ public class DefaultParser implements Parser {
this.objectCreator = objectCreator;
}
+ public void setAttributeValueResolver(AttributeValueResolver resolver) {
+ this.resolver = resolver;
+ }
+
public ParserContext getCtx() {
return context;
}
--
Gitee
From 9a71220591fc074b4e9ca36140f20b8c22e7f356 Mon Sep 17 00:00:00 2001
From: qinluo <1558642210@qq.com>
Date: Sat, 17 Jun 2023 16:36:04 +0800
Subject: [PATCH 10/22] qinluo: - ignore
---
.../smartboot/flow/core/attribute/AttributeValueResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
index 34bcf2d..e6daf28 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
@@ -19,7 +19,7 @@ public class AttributeValueResolver {
private static final AttributeValueResolver INSTANCE = new AttributeValueResolver();
private ObjectCreator objectCreator = DefaultObjectCreator.getInstance();
- private AttributeValueResolver() {
+ public AttributeValueResolver() {
}
public AttributeValueResolver(ObjectCreator objectCreator) {
--
Gitee
From 6c78477612e7f51b0b5e9ef660c6de6bfa2972ad Mon Sep 17 00:00:00 2001
From: qinluo <1558642210@qq.com>
Date: Sun, 18 Jun 2023 01:10:11 +0800
Subject: [PATCH 11/22] =?UTF-8?q?qinluo:=20=20=20=20=20=20-=20=E5=8F=AF?=
=?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E6=94=AF=E6=8C=81=E7=9F=AD=E8=AF=AD?=
=?UTF-8?q?=20=20=20=20=20=20-=20attributeResolver=E4=BC=98=E5=8C=96=20=20?=
=?UTF-8?q?=20=20=20=20-=20=E6=89=A9=E5=B1=95=E6=8F=92=E4=BB=B6=20?=
=?UTF-8?q?=E5=8F=8D=E5=B0=84=E6=89=A7=E8=A1=8C=E5=99=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 1 +
.../flow/admin/g6/G6ComponentVisitor.java | 6 +
.../smartboot/flow/core/EngineContext.java | 20 ++
.../attribute/AttributeValueResolver.java | 18 +-
.../core/parser/BuilderDefinitionVisitor.java | 6 +-
.../core/parser/ComponentElementParser.java | 5 +
.../core/parser/ExecutableTypeDetector.java | 92 +++++++
.../flow/core/util/MethodMatcher.java | 19 ++
.../{parser => util}/ReflectionUtils.java | 43 +++-
.../flow/helper/view/XmlComponentVisitor.java | 6 +
smart-flow-plugin/pom.xml | 32 +++
.../smart-flow-enhance-plugin/pom.xml | 34 +++
.../LocalVariableMethodVisitor.java | 50 ++++
.../plugin/executable/MethodDescriptor.java | 48 ++++
.../executable/MethodDescriptorUtils.java | 62 +++++
.../smartboot/plugin/executable/Param.java | 23 ++
.../executable/ParameterNameClassVisitor.java | 109 +++++++++
.../plugin/executable/ReflectExecutable.java | 229 ++++++++++++++++++
.../plugin/resovler/MultipleResolver.java | 37 +++
.../plugin/resovler/SystemEnvResolver.java | 16 ++
.../resovler/SystemPropertyResolver.java | 16 ++
.../META-INF/smart-flow-executable-type | 3 +
.../extension/BeanDefinitionVisitor.java | 30 ++-
23 files changed, 892 insertions(+), 13 deletions(-)
create mode 100644 smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExecutableTypeDetector.java
create mode 100644 smart-flow-core/src/main/java/org/smartboot/flow/core/util/MethodMatcher.java
rename smart-flow-core/src/main/java/org/smartboot/flow/core/{parser => util}/ReflectionUtils.java (68%)
create mode 100644 smart-flow-plugin/pom.xml
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/pom.xml
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/LocalVariableMethodVisitor.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptor.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptorUtils.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/Param.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ParameterNameClassVisitor.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ReflectExecutable.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/resovler/MultipleResolver.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/resovler/SystemEnvResolver.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/resovler/SystemPropertyResolver.java
create mode 100644 smart-flow-plugin/smart-flow-enhance-plugin/src/main/resources/META-INF/smart-flow-executable-type
diff --git a/pom.xml b/pom.xml
index a3693d0..c9e0106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
smart-flow-springboot-starter
smart-flow-helper
smart-flow-admin
+ smart-flow-plugin
diff --git a/smart-flow-admin/src/main/java/org/smartboot/smart/flow/admin/g6/G6ComponentVisitor.java b/smart-flow-admin/src/main/java/org/smartboot/smart/flow/admin/g6/G6ComponentVisitor.java
index a695b78..ef84adb 100644
--- a/smart-flow-admin/src/main/java/org/smartboot/smart/flow/admin/g6/G6ComponentVisitor.java
+++ b/smart-flow-admin/src/main/java/org/smartboot/smart/flow/admin/g6/G6ComponentVisitor.java
@@ -6,6 +6,7 @@ import org.smartboot.flow.core.attribute.AttributeHolder;
import org.smartboot.flow.core.attribute.Attributes;
import org.smartboot.flow.core.common.ComponentType;
import org.smartboot.flow.core.executable.Executable;
+import org.smartboot.flow.core.parser.ExecutableTypeDetector;
import org.smartboot.flow.core.script.ScriptCondition;
import org.smartboot.flow.core.script.ScriptExecutable;
import org.smartboot.flow.core.script.ScriptExecutor;
@@ -460,6 +461,11 @@ public class G6ComponentVisitor extends ComponentVisitor {
G6ComponentVisitor.this.rollbackScriptType = rollbackExecutor.getType();
G6ComponentVisitor.this.rollbackScript = rollbackExecutor.getScript();
}
+ } else {
+ String phrase = ExecutableTypeDetector.get().getPhrase(executable.getClass());
+ if (AuxiliaryUtils.isNotBlank(phrase)) {
+ G6ComponentVisitor.this.executable = phrase;
+ }
}
}
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java
index 3673c01..2a98a35 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/EngineContext.java
@@ -7,6 +7,7 @@ import org.smartboot.flow.core.invoker.Invoker;
import org.smartboot.flow.core.trace.Tracer;
import java.io.Serializable;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
@@ -277,6 +278,25 @@ public class EngineContext{
}
}
+ /**
+ * Returns all extension in copy.
+ *
+ * @since 1.1.0
+ * @return all extension
+ */
+ public Map, Object> getAllExt() {
+ Map, Object> copied = new HashMap<>(extensions.size());
+ extensions.forEach((k, v) -> {
+ if (v == Value.NULL) {
+ return;
+ }
+
+ copied.put(k, v.val);
+ });
+
+ return copied;
+ }
+
@SuppressWarnings("unchecked")
public P getExt(Key
key) {
Value value = extensions.get(key);
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
index e6daf28..263267a 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/attribute/AttributeValueResolver.java
@@ -26,16 +26,32 @@ public class AttributeValueResolver {
this.objectCreator = objectCreator;
}
+ public void setObjectCreator(ObjectCreator objectCreator) {
+ this.objectCreator = objectCreator;
+ }
+
+ public ObjectCreator getObjectCreator() {
+ return objectCreator;
+ }
+
public static AttributeValueResolver getInstance() {
return INSTANCE;
}
+ protected Object earlyResolve(String value) {
+ return value;
+ }
+
public Object resolve(Class accepted, Object value) {
if (value == null) {
return null;
}
- if (accepted.isInstance(value)) {
+ if (value instanceof String) {
+ value = earlyResolve((String)value);
+ }
+
+ if (accepted.isInstance(value) && accepted != Object.class) {
return value;
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
index ca3007e..cf4ec14 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/BuilderDefinitionVisitor.java
@@ -35,6 +35,7 @@ import org.smartboot.flow.core.script.ScriptExecutable;
import org.smartboot.flow.core.script.ScriptExecutor;
import org.smartboot.flow.core.util.AssertUtil;
import org.smartboot.flow.core.util.AuxiliaryUtils;
+import org.smartboot.flow.core.util.ReflectionUtils;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -53,6 +54,7 @@ import java.util.stream.Collectors;
public class BuilderDefinitionVisitor implements DefinitionVisitor {
private static final Logger LOGGER = LoggerFactory.getLogger(BuilderDefinitionVisitor.class);
+ private static final String SETTER_PREFIX = "set";
private final Map> namedComponents = new ConcurrentHashMap<>();
private final Map assembledPipelines = new ConcurrentHashMap<>();
@@ -206,7 +208,9 @@ public class BuilderDefinitionVisitor implements DefinitionVisitor {
// binding attributes.
for (ElementAttr attr : ed.getBindingAttrs()) {
String fieldName = attr.getName().substring(ParseConstants.EXECUTE_BINDING.length());
- Method m = ReflectionUtils.lookUpMethod(executable.getClass(), fieldName);
+ String methodName = SETTER_PREFIX + fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+
+ Method m = ReflectionUtils.lookUpMethod(executable.getClass(), methodName, (method) -> method.getParameterCount() == 1);
if (m != null) {
Object value = valueResolver.resolve(m.getParameterTypes()[0], attr.getValue());
ReflectionUtils.invokeMethod(executable, m, new Object[] { value });
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
index 6f3aeec..43df0f8 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ComponentElementParser.java
@@ -40,6 +40,11 @@ public class ComponentElementParser extends AbstractElementParser {
}
AssertUtil.notBlank(elementDefinition.getExecute(), "attribute [execute] cannot be null");
+ Class javaType = ExecutableTypeDetector.get().getJavaType(elementDefinition.getExecute());
+ if (javaType != null) {
+ elementDefinition.setExecute(javaType.getName());
+ }
+
super.parseExtensionAttributes(element, elementDefinition);
context.register(elementDefinition);
}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExecutableTypeDetector.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExecutableTypeDetector.java
new file mode 100644
index 0000000..4ef83d3
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ExecutableTypeDetector.java
@@ -0,0 +1,92 @@
+package org.smartboot.flow.core.parser;
+
+import org.smartboot.flow.core.exception.FlowException;
+import org.smartboot.flow.core.executable.Executable;
+import org.smartboot.flow.core.util.AssertUtil;
+import org.smartboot.flow.core.util.AuxiliaryUtils;
+
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author qinluo
+ * @date 2022/11/28 19:41
+ * @since 1.1.0
+ */
+public class ExecutableTypeDetector {
+
+ /**
+ * The phrase for {@link org.smartboot.flow.core.executable.Executable} location.
+ */
+ private static final String LOCATION = "META-INF/smart-flow-executable-type";
+
+ /**
+ * The stored phrase for {@link org.smartboot.flow.core.executable.Executable}
+ */
+ private final Map> javaTypes = new ConcurrentHashMap<>();
+
+ /**
+ * The singleton instance for detector.
+ */
+ private static final ExecutableTypeDetector DETECTOR = new ExecutableTypeDetector();
+
+ public static ExecutableTypeDetector get() {
+ return DETECTOR;
+ }
+
+ private ExecutableTypeDetector() {
+ try {
+ Enumeration resources = this.getClass().getClassLoader().getResources(LOCATION);
+ while (resources.hasMoreElements()) {
+ URL url = resources.nextElement();
+
+ // phrase files must be properties.
+ Properties properties = new Properties();
+ properties.load(url.openStream());
+
+ // key : phrase, value: full java classname.
+ Set keys = properties.stringPropertyNames();
+ for (String key : keys) {
+ AssertUtil.notBlank(key, "executable key must not be blank");
+ String type = properties.getProperty(key);
+ AssertUtil.notBlank(type, "executable " + key + " type must not be blank");
+ Class javaType = AuxiliaryUtils.asClass(type);
+ AssertUtil.notNull(javaType, "executable " + key + " type must be a javaType");
+ AssertUtil.isTrue(Executable.class.isAssignableFrom(javaType), "executable " + key + " type must be a subclass of Executable");
+ AssertUtil.isTrue(Executable.class != (javaType), "executable " + key + " type must be a subclass of Executable");
+ javaTypes.put(key.toLowerCase(), javaType);
+ }
+ }
+ } catch (Exception e) {
+ throw new FlowException(e);
+ }
+
+ }
+
+ public Class getJavaType(String type) {
+ AssertUtil.notBlank(type, "type must not blank");
+ return javaTypes.get(type.trim().toLowerCase());
+ }
+
+ public void register(String phrase, Class javaType) {
+ AssertUtil.notBlank(phrase, "phrase must not blank");
+ AssertUtil.notNull(javaType, "type must be null");
+ AssertUtil.isTrue(Executable.class.isAssignableFrom(javaType), "type must be a subclass of Executable");
+ AssertUtil.isTrue(Executable.class != (javaType), "type must be a subclass of Executable");
+ javaTypes.put(phrase, javaType);
+ }
+
+ public String getPhrase(Class type) {
+ AssertUtil.notNull(type, "type must not null");
+ for (Map.Entry> entry : javaTypes.entrySet()) {
+ if (entry.getValue() == type) {
+ return entry.getKey();
+ }
+ }
+ return null;
+ }
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/util/MethodMatcher.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/util/MethodMatcher.java
new file mode 100644
index 0000000..402fc2e
--- /dev/null
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/util/MethodMatcher.java
@@ -0,0 +1,19 @@
+package org.smartboot.flow.core.util;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 19:32
+ * @since 1.0.0
+ */
+public interface MethodMatcher {
+
+ /**
+ * Match method.
+ *
+ * @param m method
+ * @return matched
+ */
+ boolean match(Method m);
+}
diff --git a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ReflectionUtils.java b/smart-flow-core/src/main/java/org/smartboot/flow/core/util/ReflectionUtils.java
similarity index 68%
rename from smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ReflectionUtils.java
rename to smart-flow-core/src/main/java/org/smartboot/flow/core/util/ReflectionUtils.java
index 459c295..fde94bf 100644
--- a/smart-flow-core/src/main/java/org/smartboot/flow/core/parser/ReflectionUtils.java
+++ b/smart-flow-core/src/main/java/org/smartboot/flow/core/util/ReflectionUtils.java
@@ -1,4 +1,4 @@
-package org.smartboot.flow.core.parser;
+package org.smartboot.flow.core.util;
import org.smartboot.flow.core.exception.FlowException;
@@ -18,16 +18,12 @@ import java.util.stream.Collectors;
*/
public class ReflectionUtils {
- private static final String SETTER_PREFIX = "set";
-
- public static Method lookUpMethod(Class type, String fieldName) {
- String methodName = SETTER_PREFIX + fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+ public static Method lookUpMethod(Class type, String methodName, MethodMatcher matcher) {
List> classes = collectAllSuperClassAndInterfaces(type);
-
for (Class clazz : classes) {
Method[] declaredMethods = clazz.getDeclaredMethods();
for (Method m : declaredMethods) {
- if (Objects.equals(m.getName(), methodName) && m.getParameterCount() == 1) {
+ if (Objects.equals(methodName, m.getName()) && (matcher == null || matcher.match(m))) {
return m;
}
}
@@ -79,14 +75,14 @@ public class ReflectionUtils {
return classes.stream().distinct().collect(Collectors.toList());
}
- public static void invokeMethod(Object target, Method m, Object[] args) {
+ public static Object invokeMethod(Object target, Method m, Object[] args) {
if (target == null || m == null || args == null) {
- return;
+ return null;
}
try {
m.setAccessible(true);
- m.invoke(target, args);
+ return m.invoke(target, args);
} catch (Exception e) {
throw new FlowException("invoke method failed", e);
}
@@ -104,4 +100,31 @@ public class ReflectionUtils {
throw new FlowException("invoke field failed", e);
}
}
+
+ public static Class getWrappedType(Class type) {
+ if (!type.isPrimitive()) {
+ return type;
+ }
+
+ if (type == byte.class) {
+ return Byte.class;
+ } else if (type == short.class) {
+ return Short.class;
+ } else if (type == int.class) {
+ return Integer.class;
+ } else if (type == long.class) {
+ return Long.class;
+ } else if (type == float.class) {
+ return Float.class;
+ } else if (type == double.class) {
+ return Double.class;
+ } else if (type == char.class) {
+ return Character.class;
+ } else if (type == boolean.class) {
+ return Boolean.class;
+ }
+
+ AssertUtil.shouldNotReachHere();
+ return null;
+ }
}
diff --git a/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java b/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java
index b99c77e..b5833ec 100644
--- a/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java
+++ b/smart-flow-helper/src/main/java/org/smartboot/flow/helper/view/XmlComponentVisitor.java
@@ -6,6 +6,7 @@ import org.smartboot.flow.core.attribute.AttributeHolder;
import org.smartboot.flow.core.attribute.Attributes;
import org.smartboot.flow.core.common.ComponentType;
import org.smartboot.flow.core.executable.Executable;
+import org.smartboot.flow.core.parser.ExecutableTypeDetector;
import org.smartboot.flow.core.script.ScriptCondition;
import org.smartboot.flow.core.script.ScriptExecutable;
import org.smartboot.flow.core.script.ScriptExecutor;
@@ -274,6 +275,11 @@ public class XmlComponentVisitor extends ComponentVisitor {
XmlComponentVisitor.this.rollbackScriptType = rollbackExecutor.getType();
XmlComponentVisitor.this.rollbackScript = rollbackExecutor.getScript();
}
+ } else {
+ String phrase = ExecutableTypeDetector.get().getPhrase(executable.getClass());
+ if (AuxiliaryUtils.isNotBlank(phrase)) {
+ XmlComponentVisitor.this.executable = phrase;
+ }
}
}
}
diff --git a/smart-flow-plugin/pom.xml b/smart-flow-plugin/pom.xml
new file mode 100644
index 0000000..889f248
--- /dev/null
+++ b/smart-flow-plugin/pom.xml
@@ -0,0 +1,32 @@
+
+
+ 4.0.0
+
+ org.smartboot.flow
+ smart-flow-parent
+ 1.1.0-SNAPSHOT
+
+
+ smart-flow-plugin
+ pom
+
+ smart-flow-enhance-plugin
+
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ org.smartboot.flow
+ smart-flow-core
+ ${smart-flow.version}
+
+
+
+
\ No newline at end of file
diff --git a/smart-flow-plugin/smart-flow-enhance-plugin/pom.xml b/smart-flow-plugin/smart-flow-enhance-plugin/pom.xml
new file mode 100644
index 0000000..30237db
--- /dev/null
+++ b/smart-flow-plugin/smart-flow-enhance-plugin/pom.xml
@@ -0,0 +1,34 @@
+
+
+ 4.0.0
+
+ org.smartboot.flow
+ smart-flow-plugin
+ 1.1.0-SNAPSHOT
+
+
+ smart-flow-enhance-plugin
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ org.ow2.asm
+ asm
+ 9.4
+
+
+
+ org.ow2.asm
+ asm-commons
+ 9.4
+
+
+
+
\ No newline at end of file
diff --git a/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/LocalVariableMethodVisitor.java b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/LocalVariableMethodVisitor.java
new file mode 100644
index 0000000..2bd548c
--- /dev/null
+++ b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/LocalVariableMethodVisitor.java
@@ -0,0 +1,50 @@
+package org.smartboot.plugin.executable;
+
+
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Type;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 22:30
+ * @since 1.0.0
+ */
+public class LocalVariableMethodVisitor extends MethodVisitor {
+
+ private final Type[] argumentTypes;
+ private int variableIndex;
+ private final List parameterNames = new ArrayList<>();
+ private final boolean isStatic;
+
+ public LocalVariableMethodVisitor(int api, int access, Type[] argumentTypes) {
+ super(api);
+ this.argumentTypes = argumentTypes;
+ this.isStatic = Modifier.isStatic(access);
+ }
+
+ @Override
+ public void visitLocalVariable(String name, String description, String signature, Label start, Label end, int index) {
+ // 非static方法第一个参数为this，跳过
+ if (!isStatic && variableIndex == 0) {
+ variableIndex++;
+ return;
+ }
+
+ // 跳过非参数的本地变量
+ if (variableIndex > argumentTypes.length) {
+ return;
+ }
+
+ parameterNames.add(name);
+ variableIndex++;
+ }
+
+ public List getParameterNames() {
+ return parameterNames;
+ }
+}
diff --git a/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptor.java b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptor.java
new file mode 100644
index 0000000..db51d15
--- /dev/null
+++ b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptor.java
@@ -0,0 +1,48 @@
+package org.smartboot.plugin.executable;
+
+import java.util.List;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 23:17
+ * @since 1.0.0
+ */
+public class MethodDescriptor {
+
+ private String declaredClass;
+ private String methodName;
+ private Class[] arguments;
+ private List parameterNames;
+
+ public String getDeclaredClass() {
+ return declaredClass;
+ }
+
+ public void setDeclaredClass(String declaredClass) {
+ this.declaredClass = declaredClass;
+ }
+
+ public String getMethodName() {
+ return methodName;
+ }
+
+ public void setMethodName(String methodName) {
+ this.methodName = methodName;
+ }
+
+ public Class[] getArguments() {
+ return arguments;
+ }
+
+ public void setArguments(Class[] arguments) {
+ this.arguments = arguments;
+ }
+
+ public List getParameterNames() {
+ return parameterNames;
+ }
+
+ public void setParameterNames(List parameterNames) {
+ this.parameterNames = parameterNames;
+ }
+}
diff --git a/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptorUtils.java b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptorUtils.java
new file mode 100644
index 0000000..a92e885
--- /dev/null
+++ b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/MethodDescriptorUtils.java
@@ -0,0 +1,62 @@
+package org.smartboot.plugin.executable;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 23:23
+ * @since 1.0.0
+ */
+public final class MethodDescriptorUtils {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(MethodDescriptorUtils.class);
+
+ private static final Map, List> DESCRIPTOR_MAP = new ConcurrentHashMap<>();
+
+ public static MethodDescriptor getMethodDescriptor(Method method) {
+ Class declaringClass = method.getDeclaringClass();
+ List methodDescriptors = DESCRIPTOR_MAP.get(declaringClass);
+ if (methodDescriptors == null) {
+ try {
+ ClassReader classReader = new ClassReader(Objects.requireNonNull(ClassLoader.getSystemResourceAsStream(declaringClass.getName().replace(".", "/") + ".class")));
+ ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+ ParameterNameClassVisitor classVisitor = new ParameterNameClassVisitor(Opcodes.ASM8, classWriter);
+ classReader.accept(classVisitor, ClassReader.EXPAND_FRAMES);
+ methodDescriptors = classVisitor.getMethodParameters();
+ DESCRIPTOR_MAP.put(declaringClass, methodDescriptors);
+ } catch (Exception e) {
+ LOGGER.error("cannot visit method parameter name from class {}", declaringClass.getName(), e);
+ }
+ }
+
+ if (methodDescriptors == null) {
+ return null;
+ }
+
+ for (MethodDescriptor descriptor : methodDescriptors) {
+ if (Objects.equals(descriptor.getMethodName(), method.getName())
+ && argumentsMatched(method, descriptor.getArguments())) {
+ return descriptor;
+ }
+ }
+
+ return null;
+ }
+
+ private static boolean argumentsMatched(Method method, Class[] paramTypes) {
+ return (paramTypes.length == method.getParameterCount() &&
+ Arrays.equals(paramTypes, method.getParameterTypes()));
+ }
+
+}
diff --git a/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/Param.java b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/Param.java
new file mode 100644
index 0000000..26ac9e7
--- /dev/null
+++ b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/Param.java
@@ -0,0 +1,23 @@
+package org.smartboot.plugin.executable;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 22:04
+ * @since 1.0.0
+ */
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Param {
+
+ /**
+ * Parameter's name.
+ *
+ * @return name.
+ */
+ String value();
+}
diff --git a/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ParameterNameClassVisitor.java b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ParameterNameClassVisitor.java
new file mode 100644
index 0000000..d49d1b9
--- /dev/null
+++ b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ParameterNameClassVisitor.java
@@ -0,0 +1,109 @@
+package org.smartboot.plugin.executable;
+
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.smartboot.flow.core.util.AuxiliaryUtils;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author yamikaze
+ * @date 2023/6/17 22:27
+ * @since 1.0.0
+ */
+public class ParameterNameClassVisitor extends ClassVisitor {
+
+ private final List methodDescriptors = new ArrayList<>(0);
+ private String className;
+
+ ParameterNameClassVisitor(int api, ClassVisitor classVisitor) {
+ super(api, classVisitor);
+ }
+
+ @Override
+ public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+ this.className = name.replace("/", ".");
+ super.visit(version, access, name, signature, superName, interfaces);
+ }
+
+ @Override
+ public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+ if (Objects.equals(name, "") || Objects.equals(name, "")) {
+ return null;
+ }
+
+ Type[] argumentTypes = Type.getArgumentTypes(descriptor);
+ LocalVariableMethodVisitor localVariableMethodVisitor = new LocalVariableMethodVisitor(Opcodes.ASM8, access, argumentTypes);
+
+ MethodDescriptor md = new MethodDescriptor();
+ methodDescriptors.add(md);
+
+ Class[] javaTypes = new Class[argumentTypes.length];
+ int index = 0;
+ for (Type argumentType : argumentTypes) {
+ javaTypes[index++] = transfer2JavaType(argumentType);
+ }
+
+ md.setMethodName(name);
+ md.setArguments(javaTypes);
+ md.setParameterNames(localVariableMethodVisitor.getParameterNames());
+ md.setDeclaredClass(className);
+ return localVariableMethodVisitor;
+
+ }
+
+ private static Class transfer2JavaType(Type argumentType) {
+ if (argumentType == Type.VOID_TYPE) {
+ return void.class;
+ } else if (argumentType == Type.INT_TYPE) {
+ return int.class;
+ } else if (argumentType == Type.SHORT_TYPE) {
+ return short.class;
+ } else if (argumentType == Type.BYTE_TYPE) {
+ return byte.class;
+ } else if (argumentType == Type.LONG_TYPE) {
+ return long.class;
+ } else if (argumentType == Type.FLOAT_TYPE) {
+ return float.class;
+ } else if (argumentType == Type.DOUBLE_TYPE) {
+ return double.class;
+ } else if (argumentType == Type.CHAR_TYPE) {
+ return char.class;
+ } else if (argumentType == Type.BOOLEAN_TYPE) {
+ return boolean.class;
+ } else {
+ // 数组形如 [[[Ljava.lang.Long; 的形式
+ String descriptor = argumentType.getDescriptor();
+ descriptor = descriptor.replace("/", ".");
+ int length = descriptor.length();
+ descriptor = descriptor.replace("[", "");
+ int dimens = length - descriptor.length();
+ descriptor = descriptor.replace(";", "");
+ if (descriptor.startsWith("L")) {
+ descriptor = descriptor.substring(1);
+ }
+
+ Class rawType = AuxiliaryUtils.asClass(descriptor);
+ // 可能是基本类型
+ if (rawType == null) {
+ rawType = transfer2JavaType(Type.getType(descriptor));
+ }
+
+ while (dimens-- > 0) {
+ rawType = Array.newInstance(rawType, 0).getClass();
+ }
+
+ return rawType;
+ }
+ }
+
+ public List getMethodParameters() {
+ return methodDescriptors;
+ }
+}
diff --git a/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ReflectExecutable.java b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ReflectExecutable.java
new file mode 100644
index 0000000..92acfb2
--- /dev/null
+++ b/smart-flow-plugin/smart-flow-enhance-plugin/src/main/java/org/smartboot/plugin/executable/ReflectExecutable.java
@@ -0,0 +1,229 @@
+package org.smartboot.plugin.executable;
+
+import org.smartboot.flow.core.EngineContext;
+import org.smartboot.flow.core.Key;
+import org.smartboot.flow.core.executable.AbstractExecutable;
+import org.smartboot.flow.core.util.AssertUtil;
+import org.smartboot.flow.core.util.AuxiliaryUtils;
+import org.smartboot.flow.core.util.ReflectionUtils;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Adapter custom code without implementation interface {@link org.smartboot.flow.core.executable.Executable}.
+ *
+ * @author yamikaze
+ * @date 2023/6/17 18:25
+ * @since 1.0.0
+ */
+public class ReflectExecutable extends AbstractExecutable {
+
+ protected volatile boolean initialized = false;
+
+ /**
+ * 执行方法
+ */
+ private String executeMethod = "execute";
+ private Method targetMethod;
+ private final List parameters = new ArrayList<>(0);
+
+ /**
+ * 回滚方法
+ */
+ private String rollbackMethod;
+ private Method rollbackTargetMethod;
+ private final List rollbackParameters = new ArrayList<>(0);
+
+
+ /**
+ * 执行目标
+ */
+ private Object target;
+
+ /**
+ * 回滚目标
+ */
+ private Object rollbackTarget;
+
+ /**
+ * 结果id
+ */
+ private String resultId;
+
+ @Override
+ public String describe() {
+ return "Reflect[" + target.getClass().getName() + "#" + executeMethod + "]";
+ }
+
+ private synchronized void init() {
+ if (initialized) {
+ return;
+ }
+
+ AssertUtil.notNull(target, "target must not be null");
+ AssertUtil.notBlank(executeMethod, "execute-method must not be null");
+ rollbackTarget = rollbackTarget != null ? rollbackTarget : target;
+
+ // 第一个方法为执行方法
+ targetMethod = ReflectionUtils.lookUpMethod(target.getClass(), executeMethod, m -> true);
+ AssertUtil.notNull(targetMethod, "cannot find execute-method [" + executeMethod + "] in type " + target.getClass().getName());
+ resolveParameters(targetMethod, parameters);
+
+ if (AuxiliaryUtils.isNotBlank(rollbackMethod)) {
+ rollbackTargetMethod = ReflectionUtils.lookUpMethod(rollbackTarget.getClass(), rollbackMethod, m -> true);
+ AssertUtil.notNull(rollbackTargetMethod, "cannot find rollback-method " + rollbackMethod + " in type " + rollbackTarget.getClass().getName());
+ resolveParameters(rollbackTargetMethod, rollbackParameters);
+ }
+
+ if (AuxiliaryUtils.isBlank(resultId)) {
+ resultId = target.getClass().getName() + "-" + executeMethod;
+ }
+
+ initialized = true;
+ }
+
+ private void resolveParameters(Method method, List parameterList) {
+ int index = 0;
+ Parameter[] parametersList = method.getParameters();
+ for (Parameter p : parametersList) {
+ ParameterDescriptor descriptor = new ParameterDescriptor();
+ Param param = p.getAnnotation(Param.class);
+ descriptor.type = ReflectionUtils.getWrappedType(p.getType());
+ descriptor.parameterIndex = index++;
+
+ if (param != null) {
+ descriptor.name = param.value();
+ } else {
+ MethodDescriptor md = MethodDescriptorUtils.getMethodDescriptor(method);
+ if (md != null) {
+ descriptor.name = md.getParameterNames().get(descriptor.parameterIndex);
+ } else {
+ descriptor.name = p.getName();
+ }
+ }
+ parameterList.add(descriptor);
+ }
+ }
+
+ @Override
+ public void execute(EngineContext context) {
+ if (!initialized) {
+ init();
+ }
+
+ Object[] args = prepareArgs(context, parameters);
+ Object result = ReflectionUtils.invokeMethod(target, targetMethod, args);
+ if (targetMethod.getReturnType() != void.class) {
+ context.putExt(Key.of(resultId), result);
+ }
+ }
+
+ @Override
+ public void rollback(EngineContext context) {
+ if (!initialized || rollbackTargetMethod == null) {
+ return;
+ }
+
+ Object[] args = prepareArgs(context, rollbackParameters);
+ ReflectionUtils.invokeMethod(rollbackTarget, rollbackTargetMethod, args);
+ }
+
+ private Object[] prepareArgs(EngineContext context, List parameterList) {
+ List