Merge pull request #50 from alibaba/classloader

Classloader

Author: voff12

README.md

@@ -105,7 +105,6 @@ public void testProcessEngine() {
 
     final TbbpmModel tbbpmModel = processEngine.load(code);
     final OutputStream outputStream = TbbpmModelConverter.getInstance().convertToStream(tbbpmModel);
-    System.out.println(outputStream);
     System.out.println(processEngine.getTestCode(code));
 
     processEngine.preCompile(code);

src/main/java/com/alibaba/compileflow/engine/process/preruntime/converter/impl/parser/support/tbbpm/InActionParser.java

@@ -17,6 +17,7 @@
 package com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.support.tbbpm;
 
 import com.alibaba.compileflow.engine.definition.common.action.impl.Action;
+import com.alibaba.compileflow.engine.definition.common.action.impl.InAction;
 import com.alibaba.compileflow.engine.definition.tbbpm.TbbpmModelConstants;
 import com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.model.ParseContext;
 import com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.model.XMLSource;
@@ -29,7 +30,9 @@ public class InActionParser extends ActionParser {
 
     @Override
     protected Action doParse(XMLSource xmlSource, ParseContext parseContext) {
-        return super.doParse(xmlSource, parseContext);
+        InAction action = new InAction();
+        action.setType(xmlSource.getString("type"));
+        return action;
     }
 
     @Override

src/main/java/com/alibaba/compileflow/engine/process/preruntime/converter/impl/parser/support/tbbpm/OutActionParser.java

@@ -17,6 +17,7 @@
 package com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.support.tbbpm;
 
 import com.alibaba.compileflow.engine.definition.common.action.impl.Action;
+import com.alibaba.compileflow.engine.definition.common.action.impl.OutAction;
 import com.alibaba.compileflow.engine.definition.tbbpm.TbbpmModelConstants;
 import com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.model.ParseContext;
 import com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.model.XMLSource;
@@ -29,7 +30,9 @@ public class OutActionParser extends ActionParser {
 
     @Override
     protected Action doParse(XMLSource xmlSource, ParseContext parseContext) {
-        return super.doParse(xmlSource, parseContext);
+        OutAction action = new OutAction();
+        action.setType(xmlSource.getString("type"));
+        return action;
     }
 
     @Override

src/main/java/com/alibaba/compileflow/engine/process/preruntime/converter/impl/parser/support/tbbpm/WaitEventTaskParser.java

@@ -1,6 +1,9 @@
 package com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.support.tbbpm;
 
 import com.alibaba.compileflow.engine.definition.common.Element;
+import com.alibaba.compileflow.engine.definition.common.action.IAction;
+import com.alibaba.compileflow.engine.definition.common.action.IInAction;
+import com.alibaba.compileflow.engine.definition.common.action.IOutAction;
 import com.alibaba.compileflow.engine.definition.tbbpm.TbbpmModelConstants;
 import com.alibaba.compileflow.engine.definition.tbbpm.WaitEventTaskNode;
 import com.alibaba.compileflow.engine.process.preruntime.converter.impl.parser.model.ParseContext;
@@ -32,6 +35,10 @@ protected WaitEventTaskNode doParse(XMLSource xmlSource, ParseContext parseConte
 
     @Override
     protected void attachChildElement(Element childElement, WaitEventTaskNode element, ParseContext parseContext) {
-
+        if (childElement instanceof IInAction) {
+            element.setInAction((IAction)childElement);
+        } else if (childElement instanceof IOutAction) {
+            element.setOutAction((IAction)childElement);
+        }
     }
 }

src/main/java/com/alibaba/compileflow/engine/process/preruntime/generator/impl/AbstractInOutActionNodeGenerator.java

@@ -33,13 +33,13 @@ public AbstractInOutActionNodeGenerator(AbstractProcessRuntime runtime, N flowNo
     }
 
     protected void generateCode(String event, CodeTargetSupport codeTargetSupport) {
-        generateNodeComment(codeTargetSupport);
+
         HasInOutAction hasInOutAction = (HasInOutAction) flowNode;
-        if (isExecuteMethod(codeTargetSupport)) {
-            IAction inAction = hasInOutAction.getInAction();
+        IAction inAction = hasInOutAction.getInAction();
+        if (inAction != null) {
             generateActionMethodCode(codeTargetSupport, inAction);
-            return;
         }
+        generateNodeComment(codeTargetSupport);
 
         codeTargetSupport.addBodyLine("if (trigger) {");
         codeTargetSupport.addBodyLine("if(\"" + event + "\".equals(event)) {");
@@ -51,8 +51,6 @@ protected void generateCode(String event, CodeTargetSupport codeTargetSupport) {
 
         codeTargetSupport.addBodyLine("} else {");
 
-        IAction inAction = hasInOutAction.getInAction();
-        generateActionMethodCode(codeTargetSupport, inAction);
         codeTargetSupport.addBodyLine("running = false;");
         codeTargetSupport.addBodyLine("}");
     }