CMMN fault transition support + cross-engine business error passing

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.db2.create.app.sql

@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
 CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('app.schema.version', '8.0.0.0', 1);
+values ('app.schema.version', '8.1.0.0', 1);

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.h2.create.app.sql

@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
 CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('app.schema.version', '8.0.0.0', 1);
+values ('app.schema.version', '8.1.0.0', 1);

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mssql.create.app.sql

@@ -15,4 +15,4 @@ CREATE NONCLUSTERED INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_)
 CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('app.schema.version', '8.0.0.0', 1);
+values ('app.schema.version', '8.1.0.0', 1);

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mysql.create.app.sql

@@ -17,4 +17,4 @@ ALTER TABLE ACT_APP_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
 CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('app.schema.version', '8.0.0.0', 1);
+values ('app.schema.version', '8.1.0.0', 1);

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.oracle.create.app.sql

@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
 CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('app.schema.version', '8.0.0.0', 1);
+values ('app.schema.version', '8.1.0.0', 1);

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.postgres.create.app.sql

@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
 CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('app.schema.version', '8.0.0.0', 1);
+values ('app.schema.version', '8.1.0.0', 1);

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.all.upgradestep.8000.to.8100.app.sql

@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '8.1.0.0' where NAME_ = 'app.schema.version';

modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityParameterTypesOverview.java

@@ -1108,6 +1108,7 @@ protected static void addHistoricPlanItemInstanceParams() {
         info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("FAILED_TIME_", "failedTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("LAST_UPDATED_TIME_", "lastUpdatedTime", PARAMETER_TYPE_TIMESTAMP);
@@ -1171,6 +1172,8 @@ protected static void addHistoricPlanItemInstanceParams() {
         info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("failedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("failedAfter", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);
@@ -1232,6 +1235,7 @@ protected static void addPlanItemInstanceParams() {
         info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("FAILED_TIME_", "failedTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
         info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
@@ -1295,6 +1299,8 @@ protected static void addPlanItemInstanceParams() {
         info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("failedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("failedAfter", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);

modules/flowable-camel/src/main/java/org/flowable/camel/CamelBehavior.java

@@ -27,6 +27,7 @@
 import org.flowable.common.engine.api.delegate.Expression;
 import org.flowable.common.engine.impl.context.Context;
 import org.flowable.engine.compatibility.Flowable5CompatibilityHandler;
+import org.flowable.common.engine.api.delegate.BusinessError;
 import org.flowable.engine.delegate.BpmnError;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
@@ -171,13 +172,13 @@ protected boolean handleCamelException(Exchange exchange, DelegateExecution exec
         Exception camelException = exchange.getException();
         boolean notHandledByCamel = exchange.isFailed() && camelException != null;
         if (notHandledByCamel) {
-            if (camelException instanceof BpmnError) {
+            if (camelException instanceof BusinessError) {
                 if (isV5Execution) {
                     Flowable5CompatibilityHandler compatibilityHandler = Flowable5Util.getFlowable5CompatibilityHandler();
                     compatibilityHandler.propagateError((BpmnError) camelException, execution);
                     return true;
                 }
-                ErrorPropagation.propagateError((BpmnError) camelException, execution);
+                ErrorPropagation.propagateError((BusinessError) camelException, execution);
                 return true;
             } else {
                 if (isV5Execution) {

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/delegate/DelegatePlanItemInstance.java

@@ -51,6 +51,7 @@ public interface DelegatePlanItemInstance extends PlanItemInstance, VariableScop
     void setCompletedTime(Date completedTime);
     void setOccurredTime(Date occurredTime);
     void setTerminatedTime(Date terminatedTime);
+    void setFailedTime(Date failedTime);
     void setExitTime(Date exitTime);
     void setEndedTime(Date endedTime);
     void setStartUserId(String startUserId);

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricPlanItemInstance.java

@@ -63,6 +63,8 @@ public interface HistoricPlanItemInstance {
 
     Date getTerminatedTime();
 
+    Date getFailedTime();
+
     Date getExitTime();
 
     Date getEndedTime();

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricPlanItemInstanceQuery.java

@@ -73,6 +73,8 @@ public interface HistoricPlanItemInstanceQuery extends Query<HistoricPlanItemIns
     HistoricPlanItemInstanceQuery occurredAfter(Date occurredAfter);
     HistoricPlanItemInstanceQuery terminatedBefore(Date terminatedBefore);
     HistoricPlanItemInstanceQuery terminatedAfter(Date terminatedAfter);
+    HistoricPlanItemInstanceQuery failedBefore(Date failedBefore);
+    HistoricPlanItemInstanceQuery failedAfter(Date failedAfter);
     HistoricPlanItemInstanceQuery exitBefore(Date exitBefore);
     HistoricPlanItemInstanceQuery exitAfter(Date exitAfter);
     HistoricPlanItemInstanceQuery endedBefore(Date endedBefore);

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/runtime/PlanItemInstance.java

@@ -48,6 +48,7 @@ default Date getStartTime() {
     Date getCompletedTime();
     Date getOccurredTime();
     Date getTerminatedTime();
+    Date getFailedTime();
     Date getExitTime();
     Date getEndedTime();
     String getStartUserId();

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/runtime/PlanItemInstanceQuery.java

@@ -76,6 +76,8 @@ public interface PlanItemInstanceQuery extends Query<PlanItemInstanceQuery, Plan
     PlanItemInstanceQuery planItemInstanceOccurredAfter(Date occurredAfter);
     PlanItemInstanceQuery planItemInstanceTerminatedBefore(Date terminatedBefore);
     PlanItemInstanceQuery planItemInstanceTerminatedAfter(Date terminatedAfter);
+    PlanItemInstanceQuery planItemInstanceFailedBefore(Date failedBefore);
+    PlanItemInstanceQuery planItemInstanceFailedAfter(Date failedAfter);
     PlanItemInstanceQuery planItemInstanceExitBefore(Date exitBefore);
     PlanItemInstanceQuery planItemInstanceExitAfter(Date exitAfter);
     PlanItemInstanceQuery planItemInstanceEndedBefore(Date endedBefore);

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

@@ -25,6 +25,8 @@
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.delegate.Expression;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.flowable.common.engine.api.delegate.BusinessError;
+import org.flowable.engine.impl.cmd.HandleCaseTaskErrorCmd;
 import org.flowable.engine.impl.cmd.TriggerCaseTaskCmd;
 import org.flowable.engine.impl.persistence.entity.BpmnEngineEntityConstants;
 import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
@@ -110,6 +112,11 @@ public String startProcessInstance(String processDefinitionId, String predefined
     public void triggerCaseTask(String executionId, Map<String, Object> variables) {
         processEngineConfiguration.getCommandExecutor().execute(new TriggerCaseTaskCmd(executionId, variables));
     }
+
+    @Override
+    public void handleCaseTaskError(String executionId, BusinessError error) {
+        processEngineConfiguration.getCommandExecutor().execute(new HandleCaseTaskErrorCmd(executionId, error));
+    }
 
     @Override
     public List<IOParameter> getOutputParametersOfCaseTask(String executionId) {