Merge branch 'hotfix/async_cancel' into test

workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncCancelProcessInstanceJobHandler.java

@@ -1,6 +1,5 @@
 package cn.axzo.workflow.core.engine.job;
 
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
 import cn.axzo.workflow.core.engine.cmd.CustomCancelProcessInstanceCmd;
 import cn.axzo.workflow.core.service.ExtAxHiTaskInstService;
@@ -34,8 +33,8 @@ public class AsyncCancelProcessInstanceJobHandler extends AbstractExecuteWithLoc
         log.info("AsyncCancelProcessInstanceHandler executing...,jobInfo:{}", JSONUtil.toJsonStr(job));
         log(job);
         ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
-        BpmnProcessInstanceCancelDTO dto = JSONUtil.toBean(job.getCustomValues(), BpmnProcessInstanceCancelDTO.class);
+        SuperBpmnProcessInstanceCancelDTO dto = JSONUtil.toBean(job.getCustomValues(), SuperBpmnProcessInstanceCancelDTO.class);
-        processEngineConfiguration.getCommandExecutor().execute(new CustomCancelProcessInstanceCmd((SuperBpmnProcessInstanceCancelDTO) dto, extAxHiTaskInstService));
+        processEngineConfiguration.getCommandExecutor().execute(new CustomCancelProcessInstanceCmd(dto, extAxHiTaskInstService));
     }
 
 }

workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java

@@ -67,7 +67,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
 
     @Override
     public void onCreated(FlowableEngineEntityEvent event) {
-        log.info("MessagePushProcessEventListener#onCreated..., processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onCreated..., processInstanceId: {}", event.getProcessInstanceId());
         Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
                 .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()).singleResult());
         Process mainProcess = getContext().getProcess(() -> repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess());
@@ -92,13 +92,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
 
         setProcessInstanceVersion(event.getProcessInstanceId(), dto);
         sendMessageQueue(dto, PROCESS_INSTANCE_CREATED);
-        log.info("MessagePushProcessEventListener#onCreated...end, processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onCreated...end, processInstanceId: {}", event.getProcessInstanceId());
     }
 
 
     @Override
     public void onStarted(FlowableProcessStartedEvent event) {
-        log.info("MessagePushProcessEventListener#onStarted..., processInstanceId: {}", event.getNestedProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onStarted..., processInstanceId: {}", event.getNestedProcessInstanceId());
         Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
                 .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId())
                 .singleResult());
@@ -127,12 +127,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
 
         setProcessInstanceVersion(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId(), dto);
         sendMessageQueue(dto, PROCESS_INSTANCE_STARTED);
-        log.info("MessagePushProcessEventListener#onStarted...end: {}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onStarted...end: {}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId());
     }
 
     @Override
     public void onCancelled(FlowableCancelledEvent event) {
-        log.info("MessagePushProcessEventListener#onCancelled..., processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onCancelled..., processInstanceId: {}", event.getProcessInstanceId());
         Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
                 .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId())
                 .singleResult());
@@ -163,7 +163,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
         setProcessDeleteReason(event, dto);
         setProcessInstanceVersion(event.getProcessInstanceId(), dto);
         sendMessageQueue(dto, PROCESS_INSTANCE_CANCELLED);
-        log.info("MessagePushProcessEventListener#onCancelled...end, processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onCancelled...end, processInstanceId: {}", event.getProcessInstanceId());
     }
 
     /**
@@ -173,7 +173,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
      */
     @Override
     public void onRejected(FlowableCancelledEvent event) {
-        log.info("MessagePushProcessEventListener#onRejected..., processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onRejected..., processInstanceId: {}", event.getProcessInstanceId());
         Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
                 .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId())
                 .singleResult());
@@ -204,12 +204,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
         setProcessDeleteReason(event, dto);
         setProcessInstanceVersion(event.getProcessInstanceId(), dto);
         sendMessageQueue(dto, PROCESS_INSTANCE_REJECTED);
-        log.info("MessagePushProcessEventListener#onRejected...end, processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onRejected...end, processInstanceId: {}", event.getProcessInstanceId());
     }
 
     @Override
     public void onAborted(FlowableCancelledEvent event) {
-        log.info("MessagePushProcessEventListener#onAborted..., processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onAborted..., processInstanceId: {}", event.getProcessInstanceId());
         Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
                 .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId())
                 .singleResult());
@@ -240,12 +240,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
         setProcessDeleteReason(event, dto);
         setProcessInstanceVersion(event.getProcessInstanceId(), dto);
         sendMessageQueue(dto, PROCESS_INSTANCE_ABORTED);
-        log.info("MessagePushProcessEventListener#onAborted...end, processInstanceId: {}.", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onAborted...end, processInstanceId: {}.", event.getProcessInstanceId());
     }
 
     @Override
     public void onCompleted(FlowableEngineEntityEvent event) {
-        log.info("MessagePushProcessEventListener#onCompleted...,processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onCompleted...,processInstanceId: {}", event.getProcessInstanceId());
         Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery()
                 .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId())
                 .singleResult());
@@ -279,7 +279,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
         }
         dto.setWorkflowEngineVersion(version);
         sendMessageQueue(dto, PROCESS_INSTANCE_COMPLETED);
-        log.info("MessagePushProcessEventListener#onCompleted...end,processInstanceId: {}", event.getProcessInstanceId());
+        log.info("RocketMqBpmnProcessEventListener#onCompleted...end,processInstanceId: {}", event.getProcessInstanceId());
     }
 
     private void setProcessDeleteReason(FlowableCancelledEvent event, ProcessInstanceDTO dto) {