Merge branch 'master' into classloader

Author: voff12

src/main/java/com/alibaba/compileflow/engine/runtime/impl/AbstractProcessRuntime.java

@@ -231,8 +231,9 @@ public String generateTestCode() {
         method.addAnnotation("@Test");
         method.addException(ClassWrapper.of(Exception.class));
         method.addBodyLine("String code = \"" + code + "\";");
+
         String engineCode = isBpmn20() ? "ProcessEngine<BpmnModel> engine = ProcessEngineFactory.getProcessEngine(FlowModelType.BPMN);"
-            : "ProcessEngine<TbbpmModel> engine = ProcessEngineFactory.getProcessEngine();";
+            : "ProcessEngine engine = ProcessEngineFactory.getProcessEngine();";
         method.addBodyLine(engineCode);
         method.addBodyLine("System.out.println(engine.getJavaCode(code));");
         method.addBodyLine("Map<String, Object> context = new HashMap<String, Object>();");
@@ -244,7 +245,7 @@ public String generateTestCode() {
             }
         }
         method.addBodyLine("try {");
-        method.addBodyLine("System.out.println(engine.start(code, context));");
+        method.addBodyLine("System.out.println(engine.execute(code, context));");
         method.addBodyLine("}");
         method.addBodyLine("catch (Exception e) {");
         method.addBodyLine("e.printStackTrace();");
@@ -564,10 +565,7 @@ private void validateRuntime() {
 
     @SuppressWarnings("unchecked")
     protected List<ValidateMessage> validateFlowModel() {
-        //Class<? extends FlowModelValidator> validatorClass = FlowModelType.BPMN.equals(getFlowModelType())
-        //    ? BpmnModelValidator.class : TbbpmModelValidator.class;
-        //return ExtensionInvoker.getInstance().invoke(FlowModelValidator.CODE, validatorClass,
-        //    ReduceFilter.allCollectionNonEmpty(), flowModel);
+
         FlowModelValidator validator = ModelValidatorFactory.getFlowModelValidator(getFlowModelType());
         List<ValidateMessage> validateMessages = validator.validate(flowModel);
         List<TransitionNode> transitionNodes = flowModel.getTransitionNodes();
@@ -639,6 +637,7 @@ private String getFlowTestClassFullName(String code, String id) {
     }
 
     private String wrapClassFullName(String name) {
+
         return "compileflow." + name;
     }
 

src/test/java/com/allibaba/compileflow/test/ProcessEngineTest.java

@@ -37,7 +37,7 @@ public void testProcessEngine() {
         context.put("pList", pList);
 
         final ProcessEngine processEngine = ProcessEngineFactory.getProcessEngine();
-        System.out.println(processEngine.getTestCode(code));
+        System.out.println(processEngine.getJavaCode(code));
 
         System.out.println(processEngine.execute(code, context));
     }

src/test/resources/bpm/xxx.bpm renamed to src/test/resources/bpm/OutpatientMaterialFulfillmentSubProcess.bpm

@@ -1,36 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <bpm code="bpm.om.waitpaySuccessflow" name="test" type="process" description="This is test demo.">
-  <var name="num" description="入参" dataType="java.lang.Integer" inOutType="param"></var>
-  <var name="numSqrt" description="开根号结果" dataType="java.lang.Integer" inOutType="return"></var>
+  <var name="num" description="入参" dataType="java.lang.Integer" inOutType="param"/>
+  <var name="numSqrt" description="开根号结果" dataType="java.lang.Integer" inOutType="return"/>
   <start id="1" name="开始" tag="start" g="115,16,30,30">
-    <transition to="17" g=":-15,20"></transition>
+    <transition to="17" g=":-15,20"/>
   </start>
-  <end id="11" name="结束" tag="end" g="130,815,30,30"></end>
+  <end id="11" name="结束" tag="end" g="130,815,30,30"/>
   <autoTask id="17" name="计算平方根" tag="rate" g="95,160,88,48">
-    <transition to="29" g=":-15,20"></transition>
+    <transition to="29" g=":-15,20"/>
     <action type="java">
       <actionHandle clazz="com.allibaba.compileflow.test.mock.MockJavaClazz" method="mockReturnMethod">
-        <var name="input" dataType="java.lang.Integer" contextVarName="num" inOutType="param"></var>
-        <var name="output" dataType="java.lang.Integer" contextVarName="numSqrt" inOutType="return"></var>
+        <var name="input" dataType="java.lang.Integer" contextVarName="num" inOutType="param"/>
+        <var name="output" dataType="java.lang.Integer" contextVarName="numSqrt" inOutType="return"/>
       </actionHandle>
     </action>
   </autoTask>
-  <waitEventTask id="29" name="֧等待支付成功事件" tag="PaymentPendingCallback" eventName="PaymentPendingCallback"
-                 g="100,370,101,53">
-      <inAction type="java">
-          <actionHandle clazz="com.allibaba.compileflow.test.mock.MockJavaClazz" method="calPrice">
-              <var name="input" dataType="java.lang.Integer" contextVarName="num" inOutType="param"></var>
-              <var name="output" dataType="java.lang.Integer" contextVarName="numSqrt" inOutType="return"></var>
-          </actionHandle>
-      </inAction>
-      <transition to="38" g=":-15,20"></transition>
+  <waitEventTask id="29" name="֧等待支付成功事件" tag="PaymentPendingCallback" eventName="PaymentPendingCallback" g="100,370,101,53">
+    <transition to="38" g=":-15,20"/>
+    <inAction type="java">
+      <actionHandle clazz="com.allibaba.compileflow.test.mock.MockJavaClazz" method="calPrice">
+        <var name="input" dataType="java.lang.Integer" contextVarName="num" defaultValue="1" inOutType="param"/>
+        <var name="output" dataType="java.lang.Integer" contextVarName="numSqrt" defaultValue="2" inOutType="return"/>
+      </actionHandle>
+    </inAction>
   </waitEventTask>
   <autoTask id="38" name="计算价格2" tag="rate2" g="95,545,88,48">
-    <transition to="11" g=":-15,20"></transition>
+    <transition to="11" g=":-15,20"/>
     <action type="java">
       <actionHandle clazz="com.allibaba.compileflow.test.mock.MockJavaClazz" method="calPrice">
-        <var name="input" dataType="java.lang.Integer" contextVarName="num" inOutType="param"></var>
-        <var name="output" dataType="java.lang.Integer" contextVarName="numSqrt" inOutType="return"></var>
+        <var name="input" dataType="java.lang.Integer" contextVarName="num" inOutType="param"/>
+        <var name="output" dataType="java.lang.Integer" contextVarName="numSqrt" inOutType="return"/>
       </actionHandle>
     </action>
   </autoTask>