Skip to content

Commit ea5bfeb

Browse files
jbarrezjbarrez
authored
CMMN fault transition support + cross-engine business error passing (#4196)
1 parent d50ab76 commit ea5bfeb

File tree

173 files changed

+2910
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+2910
-194
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE NONCLUSTERED INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_)
1515
CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ALTER TABLE ACT_APP_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
1717
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1818

1919
insert into ACT_GE_PROPERTY
20-
values ('app.schema.version', '8.0.0.0', 1);
20+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,7 @@ protected static void addHistoricPlanItemInstanceParams() {
11081108
info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
11091109
info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
11101110
info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
1111+
info.addColumn("FAILED_TIME_", "failedTime", PARAMETER_TYPE_TIMESTAMP);
11111112
info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
11121113
info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
11131114
info.addColumn("LAST_UPDATED_TIME_", "lastUpdatedTime", PARAMETER_TYPE_TIMESTAMP);
@@ -1171,6 +1172,8 @@ protected static void addHistoricPlanItemInstanceParams() {
11711172
info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
11721173
info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
11731174
info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
1175+
info.addQueryParameter("failedBefore", PARAMETER_TYPE_TIMESTAMP);
1176+
info.addQueryParameter("failedAfter", PARAMETER_TYPE_TIMESTAMP);
11741177
info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
11751178
info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
11761179
info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);
@@ -1232,6 +1235,7 @@ protected static void addPlanItemInstanceParams() {
12321235
info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
12331236
info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
12341237
info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
1238+
info.addColumn("FAILED_TIME_", "failedTime", PARAMETER_TYPE_TIMESTAMP);
12351239
info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
12361240
info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
12371241
info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
@@ -1295,6 +1299,8 @@ protected static void addPlanItemInstanceParams() {
12951299
info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
12961300
info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
12971301
info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
1302+
info.addQueryParameter("failedBefore", PARAMETER_TYPE_TIMESTAMP);
1303+
info.addQueryParameter("failedAfter", PARAMETER_TYPE_TIMESTAMP);
12981304
info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
12991305
info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
13001306
info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.flowable.common.engine.api.delegate.Expression;
2828
import org.flowable.common.engine.impl.context.Context;
2929
import org.flowable.engine.compatibility.Flowable5CompatibilityHandler;
30+
import org.flowable.common.engine.api.delegate.BusinessError;
3031
import org.flowable.engine.delegate.BpmnError;
3132
import org.flowable.engine.delegate.DelegateExecution;
3233
import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
@@ -171,13 +172,13 @@ protected boolean handleCamelException(Exchange exchange, DelegateExecution exec
171172
Exception camelException = exchange.getException();
172173
boolean notHandledByCamel = exchange.isFailed() && camelException != null;
173174
if (notHandledByCamel) {
174-
if (camelException instanceof BpmnError) {
175+
if (camelException instanceof BusinessError) {
175176
if (isV5Execution) {
176177
Flowable5CompatibilityHandler compatibilityHandler = Flowable5Util.getFlowable5CompatibilityHandler();
177178
compatibilityHandler.propagateError((BpmnError) camelException, execution);
178179
return true;
179180
}
180-
ErrorPropagation.propagateError((BpmnError) camelException, execution);
181+
ErrorPropagation.propagateError((BusinessError) camelException, execution);
181182
return true;
182183
} else {
183184
if (isV5Execution) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public interface DelegatePlanItemInstance extends PlanItemInstance, VariableScop
5151
void setCompletedTime(Date completedTime);
5252
void setOccurredTime(Date occurredTime);
5353
void setTerminatedTime(Date terminatedTime);
54+
void setFailedTime(Date failedTime);
5455
void setExitTime(Date exitTime);
5556
void setEndedTime(Date endedTime);
5657
void setStartUserId(String startUserId);

0 commit comments

Comments
 (0)