Merge branch 'main' into flowable-release-8.1.0

Author: filiphr

README.md

@@ -1,4 +1,4 @@
-Flowable (V7)
+Flowable
 ========
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.flowable/flowable-engine?label=Maven%20Central)](https://central.sonatype.com/search?q=g:org.flowable%20%26%26%20%28a:flowable-engine%20a:flowable-cmmn-engine%20a:flowable-dmn-engine%29)
@@ -11,7 +11,7 @@ Homepage: https://www.flowable.org/
 
 ## flowable / flowəb(ə)l /
 * a compact and highly efficient workflow and Business Process Management (BPM) platform for developers, system admins and business users.
-* a lightning fast, tried and tested BPMN 2 process engine written in Java.  It is Apache 2.0 licensed open source, with a committed community.
+* a lightning fast, tried and tested BPMN process engine, CMMN case engine and DMN rule engine written in Java.  It is Apache 2.0 licensed open source, with a committed community.
 * can run embedded in a Java application, or as a service on a server, a cluster, and in the cloud.  It integrates perfectly with Spring.  With a rich Java and REST API, it is the ideal engine for orchestrating human or system activities.
 
 ## Introduction

modules/flowable-cmmn-engine-configurator/src/main/java/org/flowable/cmmn/engine/configurator/impl/cmmn/DefaultCaseInstanceService.java

@@ -18,6 +18,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.cmmn.api.CallbackTypes;
 import org.flowable.cmmn.api.CmmnRuntimeService;
+import org.flowable.cmmn.api.repository.CaseDefinition;
 import org.flowable.cmmn.api.runtime.CaseInstance;
 import org.flowable.cmmn.api.runtime.CaseInstanceBuilder;
 import org.flowable.cmmn.api.runtime.CaseInstanceState;
@@ -51,21 +52,16 @@ public String generateNewCaseInstanceId() {
     }
 
     @Override
-    public String startCaseInstanceByKey(String caseDefinitionKey, String predefinedCaseInstanceId, String caseInstanceName, String businessKey,
-            String executionId,
-            String tenantId, boolean fallbackToDefaultTenant, String parentDeploymentId, Map<String, Object> inParametersMap) {
-        
+    public String startCaseInstance(String caseDefinitionId, String predefinedCaseInstanceId, String caseInstanceName, String businessKey,
+            String executionId, String tenantId, Map<String, Object> inParametersMap) {
+
         CaseInstanceBuilder caseInstanceBuilder = cmmnEngineConfiguration.getCmmnRuntimeService().createCaseInstanceBuilder();
-        caseInstanceBuilder.caseDefinitionKey(caseDefinitionKey);
+        caseInstanceBuilder.caseDefinitionId(caseDefinitionId);
 
-        if (parentDeploymentId != null) {
-            caseInstanceBuilder.caseDefinitionParentDeploymentId(parentDeploymentId);
-        }
-        
         if (predefinedCaseInstanceId != null) {
             caseInstanceBuilder.predefinedCaseInstanceId(predefinedCaseInstanceId);
         }
-        
+
         if (tenantId != null) {
             caseInstanceBuilder.tenantId(tenantId);
             caseInstanceBuilder.overrideCaseDefinitionTenantId(tenantId);
@@ -80,18 +76,14 @@ public String startCaseInstanceByKey(String caseDefinitionKey, String predefined
             caseInstanceBuilder.variable(target, inParametersMap.get(target));
         }
 
-        if (fallbackToDefaultTenant) {
-            caseInstanceBuilder.fallbackToDefaultTenant();
-        }
-
         if (businessKey != null) {
             caseInstanceBuilder.businessKey(businessKey);
         }
 
         if (caseInstanceName != null) {
             caseInstanceBuilder.name(caseInstanceName);
         }
-        
+
         CaseInstance caseInstance = caseInstanceBuilder.start();
         return caseInstance.getId();
     }
@@ -142,6 +134,29 @@ public void deleteCaseInstancesForExecutionId(String executionId) {
         }
     }
 
+    @Override
+    public String resolveCaseDefinitionId(String caseDefinitionKey, String tenantId,
+            boolean fallbackToDefaultTenant, String parentDeploymentId) {
+        CaseDefinition caseDefinition = cmmnEngineConfiguration.getCaseInstanceHelper()
+                .resolveCaseDefinition(caseDefinitionKey, tenantId,
+                        fallbackToDefaultTenant || cmmnEngineConfiguration.isFallbackToDefaultTenant(), parentDeploymentId);
+        return caseDefinition.getId();
+    }
+
+    @Override
+    public boolean isHistoryEnabledForCaseDefinitionId(String caseDefinitionId) {
+        return cmmnEngineConfiguration.getCmmnHistoryConfigurationSettings().isHistoryEnabled(caseDefinitionId);
+    }
+
+    @Override
+    public boolean isHistoryEnabledForCaseInstance(String caseInstanceId) {
+        CaseInstanceEntity caseInstance = cmmnEngineConfiguration.getCaseInstanceEntityManager().findById(caseInstanceId);
+        if (caseInstance != null) {
+            return cmmnEngineConfiguration.getCmmnHistoryConfigurationSettings().isHistoryEnabled(caseInstance.getCaseDefinitionId());
+        }
+        return cmmnEngineConfiguration.getCmmnHistoryConfigurationSettings().isHistoryEnabled();
+    }
+
     @Override
     public void deleteCaseInstanceWithoutAgenda(String caseInstanceId) {
         cmmnEngineConfiguration.getCommandExecutor().execute(commandContext -> {

modules/flowable-cmmn-engine-configurator/src/main/java/org/flowable/cmmn/engine/configurator/impl/process/DefaultProcessInstanceService.java

@@ -29,6 +29,7 @@
 import org.flowable.engine.impl.persistence.entity.BpmnEngineEntityConstants;
 import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
 import org.flowable.engine.impl.util.CommandContextUtil;
+import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.engine.runtime.ProcessInstanceBuilder;
 import org.flowable.form.api.FormInfo;
@@ -56,30 +57,27 @@ public String generateNewProcessInstanceId() {
     }
 
     @Override
-    public String startProcessInstanceByKey(String processDefinitionKey, String predefinedProcessInstanceId, String stageInstanceId,
-            String tenantId, Boolean fallbackToDefaultTenant, String parentDeploymentId, Map<String, Object> inParametersMap, String businessKey,
+    public String startProcessInstance(String processDefinitionId, String predefinedProcessInstanceId, String stageInstanceId,
+            String tenantId, Map<String, Object> inParametersMap, String businessKey,
             Map<String, Object> variableFormVariables, FormInfo variableFormInfo, String variableFormOutcome) {
-        
-        return startProcessInstanceByKey(processDefinitionKey, predefinedProcessInstanceId, null, stageInstanceId, tenantId, fallbackToDefaultTenant,
-                parentDeploymentId, inParametersMap, businessKey, variableFormVariables, variableFormInfo, variableFormOutcome);
+
+        return startProcessInstance(processDefinitionId, predefinedProcessInstanceId, null, stageInstanceId, tenantId,
+                inParametersMap, businessKey, variableFormVariables, variableFormInfo, variableFormOutcome);
     }
 
     @Override
-    public String startProcessInstanceByKey(String processDefinitionKey, String predefinedProcessInstanceId, String planItemInstanceId, String stageInstanceId,
-            String tenantId, Boolean fallbackToDefaultTenant, String parentDeploymentId, Map<String, Object> inParametersMap, String businessKey,
+    public String startProcessInstance(String processDefinitionId, String predefinedProcessInstanceId, String planItemInstanceId, String stageInstanceId,
+            String tenantId, Map<String, Object> inParametersMap, String businessKey,
             Map<String, Object> variableFormVariables, FormInfo variableFormInfo, String variableFormOutcome) {
-        
+
         ProcessInstanceBuilder processInstanceBuilder = processEngineConfiguration.getRuntimeService().createProcessInstanceBuilder();
-        processInstanceBuilder.processDefinitionKey(processDefinitionKey);
+        processInstanceBuilder.processDefinitionId(processDefinitionId);
+
         if (tenantId != null) {
             processInstanceBuilder.tenantId(tenantId);
             processInstanceBuilder.overrideProcessDefinitionTenantId(tenantId);
         }
 
-        if (parentDeploymentId != null) {
-            processInstanceBuilder.processDefinitionParentDeploymentId(parentDeploymentId);
-        }
-        
         processInstanceBuilder.predefineProcessInstanceId(predefinedProcessInstanceId);
 
         if (planItemInstanceId != null) {
@@ -91,10 +89,6 @@ public String startProcessInstanceByKey(String processDefinitionKey, String pred
             processInstanceBuilder.variable(target, inParametersMap.get(target));
         }
 
-        if (fallbackToDefaultTenant != null && fallbackToDefaultTenant) {
-            processInstanceBuilder.fallbackToDefaultTenant();
-        }
-
         if (businessKey != null) {
             processInstanceBuilder.businessKey(businessKey);
         }
@@ -146,6 +140,30 @@ public List<IOParameter> getOutputParametersOfCaseTask(String executionId) {
         return cmmnParameters;
     }
 
+    @Override
+    public String resolveProcessDefinitionId(String processDefinitionKey, String tenantId,
+            Boolean fallbackToDefaultTenant, String parentDeploymentId) {
+        ProcessDefinition processDefinition = processEngineConfiguration.getProcessInstanceHelper()
+                .resolveProcessDefinition(processDefinitionKey, tenantId,
+                        Boolean.TRUE.equals(fallbackToDefaultTenant) || processEngineConfiguration.isFallbackToDefaultTenant(),
+                        parentDeploymentId, processEngineConfiguration);
+        return processDefinition.getId();
+    }
+
+    @Override
+    public boolean isHistoryEnabledForProcessDefinitionId(String processDefinitionId) {
+        return processEngineConfiguration.getHistoryConfigurationSettings().isHistoryEnabled(processDefinitionId);
+    }
+
+    @Override
+    public boolean isHistoryEnabledForProcessInstance(String processInstanceId) {
+        ExecutionEntity execution = processEngineConfiguration.getExecutionEntityManager().findById(processInstanceId);
+        if (execution != null) {
+            return processEngineConfiguration.getHistoryConfigurationSettings().isHistoryEnabled(execution.getProcessDefinitionId());
+        }
+        return processEngineConfiguration.getHistoryConfigurationSettings().isHistoryEnabled();
+    }
+
     @Override
     public void deleteProcessInstance(String processInstanceId) {
         processEngineConfiguration.getCommandExecutor().execute(commandContext -> {