Setting process instance id to process instance execution (was the same in...

Setting process instance id to process instance execution (was the same in v5). Fixing outfall of that

modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/EndExecutionOperation.java

@@ -87,7 +87,7 @@ public class EndExecutionOperation extends AbstractOperation {
             Collection<ExecutionEntity> executions = executionEntityManager.findChildExecutionsByProcessInstanceId(processInstanceId);
             int activeExecutions = 0;
             for (ExecutionEntity execution : executions) {
-                if (execution.isActive()) {
+                if (execution.isActive() && !processInstanceId.equals(execution.getId())) {
                     activeExecutions++;
                 }
             }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/StartProcessInstanceCmd.java

@@ -27,10 +27,6 @@ import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.ProcessEngineConfiguration;
 import org.activiti.engine.compatibility.Activiti5CompatibilityHandler;
-import org.activiti.engine.delegate.event.ActivitiEventType;
-import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
-import org.activiti.engine.impl.context.Context;
-import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
 import org.activiti.engine.impl.persistence.deploy.DeploymentManager;
@@ -40,7 +36,6 @@ import org.activiti.engine.impl.runtime.ProcessInstanceBuilderImpl;
 import org.activiti.engine.impl.util.ProcessDefinitionUtil;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.task.IdentityLinkType;
 
 /**
  * @author Tom Baeyens
@@ -152,7 +147,10 @@ public class StartProcessInstanceCmd<T> implements Command<ProcessInstance>, Ser
         if (initialFlowElement instanceof StartEvent) {
             initiatorVariableName = ((StartEvent) initialFlowElement).getInitiator();
         }
-        ExecutionEntity processInstance = createProcessInstance(commandContext, processDefinition, businessKey, initiatorVariableName, initialFlowElement);
+        
+        ExecutionEntity processInstance = commandContext.getExecutionEntityManager().createProcessInstanceExecution(
+        		processDefinition.getId(), businessKey, processDefinition.getTenantId(), initiatorVariableName);
+        commandContext.getHistoryManager().recordProcessInstanceStart(processInstance, initialFlowElement);
 
         processInstance.setVariables(processDataObjects(process.getDataObjects()));
 
@@ -177,42 +175,6 @@ public class StartProcessInstanceCmd<T> implements Command<ProcessInstance>, Ser
         return processInstance;
     }
 
-    protected ExecutionEntity createProcessInstance(CommandContext commandContext, 
-    		ProcessDefinitionEntity processDefinitionEntity, String businessKey, 
-    		String initiatorVariableName, FlowElement initialFlowElement) {
-
-        ExecutionEntity processInstance = new ExecutionEntity();
-        processInstance.setProcessDefinitionId(processDefinitionEntity.getId());
-        processInstance.setBusinessKey(businessKey);
-        processInstance.setScope(true); // process instance is always a scope
-                                        // for all child executions
-
-        // Inherit tenant id (if any)
-        if (processDefinitionEntity.getTenantId() != null) {
-            processInstance.setTenantId(processDefinitionEntity.getTenantId());
-        }
-
-        String authenticatedUserId = Authentication.getAuthenticatedUserId();
-        if (initiatorVariableName != null) {
-            processInstance.setVariable(initiatorVariableName, authenticatedUserId);
-        }
-        if (authenticatedUserId != null) {
-            processInstance.addIdentityLink(authenticatedUserId, null, IdentityLinkType.STARTER);
-        }
-
-        // Store in database
-        commandContext.getExecutionEntityManager().insert(processInstance);
-
-        // Fire events
-        commandContext.getHistoryManager().recordProcessInstanceStart(processInstance, initialFlowElement);
-
-        if (Context.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
-            Context.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_CREATED, processInstance));
-        }
-
-        return processInstance;
-    }
-
     protected Map<String, Object> processDataObjects(Collection<ValuedDataObject> dataObjects) {
         Map<String, Object> variablesMap = new HashMap<String, Object>();
         // convert data objects to process variables

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java

@@ -23,14 +23,18 @@ import java.util.List;
 import java.util.Map;
 
 import org.activiti.engine.ActivitiObjectNotFoundException;
+import org.activiti.engine.delegate.event.ActivitiEventType;
+import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
 import org.activiti.engine.impl.ExecutionQueryImpl;
 import org.activiti.engine.impl.Page;
 import org.activiti.engine.impl.ProcessInstanceQueryImpl;
 import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.impl.interceptor.CommandContext;
 import org.activiti.engine.impl.persistence.CachedEntityMatcher;
 import org.activiti.engine.runtime.Execution;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.IdentityLinkType;
 
 /**
  * @author Tom Baeyens
@@ -43,52 +47,10 @@ public class ExecutionEntityManager extends AbstractEntityManager<ExecutionEntit
         return ExecutionEntity.class;
     }
 
-    @SuppressWarnings("unchecked")
-    public void deleteProcessInstancesByProcessDefinition(String processDefinitionId, String deleteReason, boolean cascade) {
-        List<String> processInstanceIds = getDbSqlSession().selectList("selectProcessInstanceIdsByProcessDefinitionId", processDefinitionId);
-
-        for (String processInstanceId : processInstanceIds) {
-            deleteProcessInstance(processInstanceId, deleteReason, cascade);
-        }
-
-        if (cascade) {
-            Context.getCommandContext().getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceByProcessDefinitionId(processDefinitionId);
-        }
-    }
-
-    public void deleteProcessInstance(String processInstanceId, String deleteReason) {
-        deleteProcessInstance(processInstanceId, deleteReason, false);
-    }
-
-    public void deleteProcessInstance(String processInstanceId, String deleteReason, boolean cascade) {
-        ExecutionEntity execution = findExecutionById(processInstanceId);
-
-        if (execution == null) {
-            throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);
-        }
-
-        deleteProcessInstanceCascade(execution, deleteReason, cascade);
-    }
-
-    private void deleteProcessInstanceCascade(ExecutionEntity execution, String deleteReason, boolean deleteHistory) {
-        for (ExecutionEntity subExecutionEntity : execution.getExecutions()) {
-            if (subExecutionEntity.getSubProcessInstance() != null) {
-                deleteProcessInstanceCascade(subExecutionEntity.getSubProcessInstance(), deleteReason, deleteHistory);
-            }
-        }
-
-        CommandContext commandContext = Context.getCommandContext();
-        commandContext.getTaskEntityManager().deleteTasksByProcessInstanceId(execution.getId(), deleteReason, deleteHistory);
-
-        // delete the execution BEFORE we delete the history, otherwise we will
-        // produce orphan HistoricVariableInstance instances
-        execution.deleteCascade(deleteReason);
-
-        if (deleteHistory) {
-            commandContext.getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceById(execution.getId());
-        }
-    }
-
+    
+    // FIND METHODS
+    
+    
     public ExecutionEntity findSubProcessInstanceBySuperExecutionId(String superExecutionId) {
         return (ExecutionEntity) getDbSqlSession().selectOne("selectSubProcessInstanceBySuperExecutionId", superExecutionId);
     }
@@ -206,6 +168,51 @@ public class ExecutionEntityManager extends AbstractEntityManager<ExecutionEntit
     public long findExecutionCountByNativeQuery(Map<String, Object> parameterMap) {
         return (Long) getDbSqlSession().selectOne("selectExecutionCountByNativeQuery", parameterMap);
     }
+    
+    
+    
+    // CREATE METHODS
+    
+    
+    public ExecutionEntity createProcessInstanceExecution(String processDefinitionId, String businessKey, String tenantId,  String initiatorVariableName) {
+
+        ExecutionEntity processInstanceExecution = new ExecutionEntity();
+        processInstanceExecution.setProcessDefinitionId(processDefinitionId);
+        processInstanceExecution.setBusinessKey(businessKey);
+        processInstanceExecution.setScope(true); // process instance is always a scope for all child executions
+
+        // Inherit tenant id (if any)
+        if (tenantId != null) {
+            processInstanceExecution.setTenantId(tenantId);
+        }
+
+        String authenticatedUserId = Authentication.getAuthenticatedUserId();
+        if (initiatorVariableName != null) {
+            processInstanceExecution.setVariable(initiatorVariableName, authenticatedUserId);
+        }
+        if (authenticatedUserId != null) {
+            processInstanceExecution.addIdentityLink(authenticatedUserId, null, IdentityLinkType.STARTER);
+        }
+
+        // Store in database
+        Context.getCommandContext().getExecutionEntityManager().insert(processInstanceExecution);
+        
+        // Need to be after insert, cause we need the id
+        processInstanceExecution.setProcessInstanceId(processInstanceExecution.getId());
+
+        // Fire events
+        if (Context.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
+            Context.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_CREATED, processInstanceExecution));
+        }
+
+        return processInstanceExecution;
+    }
+    
+    
+    
+    // UPDATE METHODS
+    
+    
 
     public void updateExecutionTenantIdForDeployment(String deploymentId, String newTenantId) {
         HashMap<String, Object> params = new HashMap<String, Object>();
@@ -229,6 +236,62 @@ public class ExecutionEntityManager extends AbstractEntityManager<ExecutionEntit
 
         getDbSqlSession().update("updateProcessInstanceLockTime", params);
     }
+    
+    
+    
+    // DELETE METHODS
+    
+    
+    
+    @SuppressWarnings("unchecked")
+    public void deleteProcessInstancesByProcessDefinition(String processDefinitionId, String deleteReason, boolean cascade) {
+        List<String> processInstanceIds = getDbSqlSession().selectList("selectProcessInstanceIdsByProcessDefinitionId", processDefinitionId);
+
+        for (String processInstanceId : processInstanceIds) {
+            deleteProcessInstance(processInstanceId, deleteReason, cascade);
+        }
+
+        if (cascade) {
+            Context.getCommandContext().getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceByProcessDefinitionId(processDefinitionId);
+        }
+    }
+
+    public void deleteProcessInstance(String processInstanceId, String deleteReason) {
+        deleteProcessInstance(processInstanceId, deleteReason, false);
+    }
+
+    public void deleteProcessInstance(String processInstanceId, String deleteReason, boolean cascade) {
+        ExecutionEntity execution = findExecutionById(processInstanceId);
+
+        if (execution == null) {
+            throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);
+        }
+
+        deleteProcessInstanceCascade(execution, deleteReason, cascade);
+    }
+
+    private void deleteProcessInstanceCascade(ExecutionEntity execution, String deleteReason, boolean deleteHistory) {
+        for (ExecutionEntity subExecutionEntity : execution.getExecutions()) {
+            if (subExecutionEntity.getSubProcessInstance() != null) {
+                deleteProcessInstanceCascade(subExecutionEntity.getSubProcessInstance(), deleteReason, deleteHistory);
+            }
+        }
+
+        CommandContext commandContext = Context.getCommandContext();
+        commandContext.getTaskEntityManager().deleteTasksByProcessInstanceId(execution.getId(), deleteReason, deleteHistory);
+
+        // delete the execution BEFORE we delete the history, otherwise we will
+        // produce orphan HistoricVariableInstance instances
+        execution.deleteCascade(deleteReason);
+
+        if (deleteHistory) {
+            commandContext.getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceById(execution.getId());
+        }
+    }
+    
+    
+    // OTHER METHODS
+    
 
     public void clearProcessInstanceLockTime(String processInstanceId) {
         HashMap<String, Object> params = new HashMap<String, Object>();

modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Execution.xml

@@ -352,7 +352,7 @@
           inner join ${prefix}ACT_RU_VARIABLE A${index} on RES.ID_ = A${index}.EXECUTION_ID_
         </when>
         <otherwise>
-          inner join ${prefix}ACT_RU_VARIABLE A${index} on RES.ID_ = A${index}.PROC_INST_ID_
+          inner join ${prefix}ACT_RU_VARIABLE A${index} on RES.PROC_INST_ID_ = A${index}.PROC_INST_ID_
         </otherwise>
       </choose> 
     </foreach>