Merge pull request #51 from alibaba/classloader

voff12 · web-flow · commit 716ae46a2d79 · 2022-01-18T16:31:47.000+08:00
update task node
diff --git a/src/main/java/com/alibaba/compileflow/engine/process/preruntime/generator/impl/AbstractInOutActionNodeGenerator.java b/src/main/java/com/alibaba/compileflow/engine/process/preruntime/generator/impl/AbstractInOutActionNodeGenerator.java
@@ -35,24 +35,41 @@ public AbstractInOutActionNodeGenerator(AbstractProcessRuntime runtime, N flowNo
     protected void generateCode(String event, CodeTargetSupport codeTargetSupport) {
 
         HasInOutAction hasInOutAction = (HasInOutAction) flowNode;
-        IAction inAction = hasInOutAction.getInAction();
-        if (inAction != null) {
+
+        if (isTriggerMethod(codeTargetSupport)) {
+//            codeTargetSupport.addBodyLine("// entry wait node...");
+
+            IAction inAction = hasInOutAction.getInAction();
+            codeTargetSupport.addBodyLine("if (trigger) {");
+
+            codeTargetSupport.addBodyLine("if(\"" + event + "\".equals(event)) {");
+            IAction outAction = hasInOutAction.getOutAction();
+            generateActionMethodCode(codeTargetSupport, outAction);
+            codeTargetSupport.addBodyLine("} else {");
+
+            codeTargetSupport.addBodyLine("running = false;");
+            codeTargetSupport.addBodyLine("} ");
+
+            codeTargetSupport.addBodyLine("} else {");
+
+            if (inAction != null) {
+                generateActionMethodCode(codeTargetSupport, inAction);
+                codeTargetSupport.addBodyLine(" trigger = false;");
+            }
+            codeTargetSupport.addBodyLine("running = false;");
+            codeTargetSupport.addBodyLine("}");
+
+        } else {
+
+            IAction inAction = hasInOutAction.getInAction();
             generateActionMethodCode(codeTargetSupport, inAction);
-        }
-        generateNodeComment(codeTargetSupport);
+            codeTargetSupport.addBodyLine("if(wait_event) {");
+            codeTargetSupport.addBodyLine("return _pResult;");
+            codeTargetSupport.addBodyLine("} ");
 
-        codeTargetSupport.addBodyLine("if (trigger) {");
-        codeTargetSupport.addBodyLine("if(\"" + event + "\".equals(event)) {");
-        IAction outAction = hasInOutAction.getOutAction();
-        generateActionMethodCode(codeTargetSupport, outAction);
-        codeTargetSupport.addBodyLine("} else {");
-        codeTargetSupport.addBodyLine("running = false;");
-        codeTargetSupport.addBodyLine("} ");
+        }
 
-        codeTargetSupport.addBodyLine("} else {");
 
-        codeTargetSupport.addBodyLine("running = false;");
-        codeTargetSupport.addBodyLine("}");
     }
 
 }
diff --git a/src/main/java/com/alibaba/compileflow/engine/process/preruntime/generator/impl/container/ContainerGenerator.java b/src/main/java/com/alibaba/compileflow/engine/process/preruntime/generator/impl/container/ContainerGenerator.java
@@ -47,6 +47,9 @@ private void generateCode(TransitionNode flowNode, CodeTargetSupport codeTargetS
             return;
         }
         if (flowNode instanceof WaitElement) {
+            // 这里要产生wait节点里的前置任务
+            Generator generator = getGenerator(flowNode);
+            generator.generateCode(codeTargetSupport);
             return;
         }
         if (flowNode instanceof SubBpmNode && ((SubBpmNode) flowNode).isWaitForTrigger()) {
diff --git a/src/main/java/com/alibaba/compileflow/engine/process/preruntime/generator/impl/tbbpm/WaitEventTaskGenerator.java b/src/main/java/com/alibaba/compileflow/engine/process/preruntime/generator/impl/tbbpm/WaitEventTaskGenerator.java
@@ -1,5 +1,7 @@
 package com.alibaba.compileflow.engine.process.preruntime.generator.impl.tbbpm;
 
+import com.alibaba.compileflow.engine.definition.common.action.HasInOutAction;
+import com.alibaba.compileflow.engine.definition.common.action.IAction;
 import com.alibaba.compileflow.engine.definition.tbbpm.WaitEventTaskNode;
 import com.alibaba.compileflow.engine.process.preruntime.generator.code.CodeTargetSupport;
 import com.alibaba.compileflow.engine.process.preruntime.generator.constansts.SystemEventConstants;
diff --git a/src/main/java/com/alibaba/compileflow/engine/runtime/impl/AbstractProcessRuntime.java b/src/main/java/com/alibaba/compileflow/engine/runtime/impl/AbstractProcessRuntime.java
@@ -169,16 +169,17 @@ public Map<String, Object> trigger(String tag, String event, Map<String, Object>
     public abstract FlowModelType getFlowModelType();
 
     public String generateJavaCode() {
-        if (isStateful()) {
+        boolean stateful = isStateful();
+        if (stateful) {
             classTarget.addSuperInterface(ClassWrapper.of(StatefulProcessInstance.class));
             classTarget.addImportedType(ClassWrapper.of(SystemEventConstants.class));
         } else {
             classTarget.addSuperInterface(ClassWrapper.of(ProcessInstance.class));
         }
         generateFlowMethod(MethodConstants.EXECUTE_METHOD_NAME,
             Collections.singletonList(ParamTarget.of(ClassWrapper.of("Map<String, Object>"), "_pContext")),
-            this::generateExecuteMethodBody);
-        if (isStateful()) {
+            this::generateExecuteMethodBody, stateful);
+        if (stateful) {
             List<ParamTarget> paramTargets = new ArrayList<>(2);
             paramTargets.add(ParamTarget.of(ClassWrapper.of("String"), "tag"));
             paramTargets.add(ParamTarget.of(ClassWrapper.of("Map<String, Object>"), "_pContext"));
@@ -191,7 +192,7 @@ public String generateJavaCode() {
             paramTargets.add(ParamTarget.of(ClassWrapper.of("String"), "event"));
             paramTargets.add(ParamTarget.of(ClassWrapper.of("Map<String, Object>"), "_pContext"));
             EventTriggerMethodGenerator eventTriggerMethodGenerator = new EventTriggerMethodGenerator(this);
-            generateFlowMethod(MethodConstants.TRIGGER_METHOD_NAME, paramTargets, eventTriggerMethodGenerator);
+            generateFlowMethod(MethodConstants.TRIGGER_METHOD_NAME, paramTargets, eventTriggerMethodGenerator, stateful);
         }
         return classTarget.generateCode();
     }
@@ -333,7 +334,7 @@ private Class<?> compileJavaCode(String source, ClassLoader classLoader) {
 
     protected MethodTarget generateFlowMethod(String methodName,
                                               List<ParamTarget> paramTypes,
-                                              Generator methodExecuteBodyGenerator) {
+                                              Generator methodExecuteBodyGenerator, boolean stateful) {
         MethodTarget methodTarget = generateMethodDefinition(methodName, paramTypes);
         classTarget.addMethod(methodTarget);
 
@@ -362,6 +363,10 @@ protected MethodTarget generateFlowMethod(String methodName,
         }
 
         methodTarget.addBodyLine("Map<String, Object> _pResult = new HashMap<>();");
+        // add trigger status
+        if (stateful && MethodConstants.EXECUTE_METHOD_NAME.equals(methodName)) {
+            methodTarget.addBodyLine("boolean wait_event = true;");
+        }
         methodTarget.addNewLine();
         methodExecuteBodyGenerator.generateCode(methodTarget);
         methodTarget.addNewLine();
diff --git a/src/test/java/com/allibaba/compileflow/test/ProcessEngineTest.java b/src/test/java/com/allibaba/compileflow/test/ProcessEngineTest.java
@@ -75,7 +75,8 @@ public void testTbbpmModelConvert() {
     @Test
     public void testWaitPayProcess() {
         String code = "bpm.om.waitPaySuccessFlow";
-        System.out.println(ProcessEngineFactory.getProcessEngine().getJavaCode(code));
+        String javaCode = ProcessEngineFactory.getProcessEngine().getJavaCode(code);
+        System.out.println(javaCode);
         Map<String, Object> context = new HashMap<>();
         context.put("num", 100d);
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ private void generateCode(TransitionNode flowNode, CodeTargetSupport codeTargetS`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`	`if (flowNode instanceof WaitElement) {`
	`50`	`+ // 这里要产生wait节点里的前置任务`
	`51`	`+ Generator generator = getGenerator(flowNode);`
	`52`	`+ generator.generateCode(codeTargetSupport);`
`50`	`53`	`return;`
`51`	`54`	`}`
`52`	`55`	`if (flowNode instanceof SubBpmNode && ((SubBpmNode) flowNode).isWaitForTrigger()) {`