Skip to content

Commit 9539d06

Browse files
filiphrfiliphr
committed
Merge branch 'main' into flowable-release-8.1.0
2 parents 6dcb7ba + 821e187 commit 9539d06

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/BatchDeleteCaseConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static BatchDeleteCaseConfig create(String batchPartId, CmmnEngineConfigu
9191

9292
Batch batch = batchService.getBatch(batchPart.getBatchId());
9393
JsonNode batchConfiguration = getBatchConfiguration(batch, engineConfiguration);
94-
boolean sequentialExecution = batchConfiguration.path("sequential").booleanValue();
94+
boolean sequentialExecution = batchConfiguration.path("sequential").booleanValue(false);
9595

9696
JsonNode queryNode = batchConfiguration.path("query");
9797
if (queryNode.isMissingNode()) {
@@ -127,7 +127,7 @@ protected static HistoricCaseInstanceQuery createQuery(JsonNode queryNode, CmmnE
127127

128128
populateQuery(queryNode, query, engineConfiguration);
129129

130-
if (queryNode.hasNonNull("finishedBefore") || queryNode.hasNonNull("finishedAfter") || queryNode.path("finished").asBoolean(false)) {
130+
if (queryNode.hasNonNull("finishedBefore") || queryNode.hasNonNull("finishedAfter") || queryNode.path("finished").booleanValue(false)) {
131131
// When the query has finishedBefore, finishedAfter or finished then we need to order by the end time
132132
// This is done in order to improve the performance when getting pages with large offsets.
133133
// When the properties are not set we cannot order on the end time
@@ -319,7 +319,7 @@ protected static void populateQueryVariableValues(JsonNode variableValuesNode, H
319319
}
320320

321321
QueryOperator operator = QueryOperator.valueOf(operatorString);
322-
String variableName = variableValue.path("name").stringValue();
322+
String variableName = variableValue.path("name").stringValue(null);
323323
switch (operator) {
324324
case EQUALS:
325325
if (variableName != null) {
@@ -470,7 +470,7 @@ public String getTaskId() {
470470

471471
@Override
472472
public String getTextValue() {
473-
return node.path("textValue").stringValue();
473+
return node.path("textValue").stringValue(null);
474474
}
475475

476476
@Override
@@ -480,7 +480,7 @@ public void setTextValue(String textValue) {
480480

481481
@Override
482482
public String getTextValue2() {
483-
return node.path("textValues").stringValue();
483+
return node.path("textValues").stringValue(null);
484484
}
485485

486486
@Override

‎modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/DeleteHistoricCaseInstanceIdsJobHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void execute(JobEntity job, String configuration, VariableScope variableS
108108
batchService.completeBatchPart(batchPart.getId(), status, resultNode.toString());
109109

110110
// This part is here for backwards compatibility when the sequential deletion was done with a compute as well
111-
if (computeBatchPartResult.path("sequential").booleanValue()) {
111+
if (computeBatchPartResult.path("sequential").booleanValue(false)) {
112112
// If the computation was sequential we need to schedule the next job
113113
List<BatchPart> nextDeleteParts = engineConfiguration.getCmmnManagementService()
114114
.createBatchPartQuery()

‎modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/BatchDeleteProcessConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static BatchDeleteProcessConfig create(String batchPartId, ProcessEngineC
9191

9292
Batch batch = batchService.getBatch(batchPart.getBatchId());
9393
JsonNode batchConfiguration = getBatchConfiguration(batch, engineConfiguration);
94-
boolean sequentialExecution = batchConfiguration.path("sequential").booleanValue();
94+
boolean sequentialExecution = batchConfiguration.path("sequential").booleanValue(false);
9595

9696
JsonNode queryNode = batchConfiguration.path("query");
9797
if (queryNode.isMissingNode()) {
@@ -127,7 +127,7 @@ protected static HistoricProcessInstanceQuery createQuery(JsonNode queryNode, Pr
127127

128128
populateQuery(queryNode, query, engineConfiguration);
129129

130-
if (queryNode.hasNonNull("finishedBefore") || queryNode.hasNonNull("finishedAfter") || queryNode.path("finished").asBoolean(false)) {
130+
if (queryNode.hasNonNull("finishedBefore") || queryNode.hasNonNull("finishedAfter") || queryNode.path("finished").booleanValue(false)) {
131131
// When the query has finishedBefore, finishedAfter or finished then we need to order by the process instance end time
132132
// This is done in order to improve the performance when getting pages with large offsets.
133133
// When the properties are not set we cannot order on the end time
@@ -341,7 +341,7 @@ protected static void populateQueryVariableValues(JsonNode variableValuesNode, H
341341
}
342342

343343
QueryOperator operator = QueryOperator.valueOf(operatorString);
344-
String variableName = variableValue.path("name").stringValue();
344+
String variableName = variableValue.path("name").stringValue(null);
345345
switch (operator) {
346346
case EQUALS:
347347
if (variableName != null) {
@@ -493,7 +493,7 @@ public String getTaskId() {
493493

494494
@Override
495495
public String getTextValue() {
496-
return node.path("textValue").stringValue();
496+
return node.path("textValue").stringValue(null);
497497
}
498498

499499
@Override
@@ -503,7 +503,7 @@ public void setTextValue(String textValue) {
503503

504504
@Override
505505
public String getTextValue2() {
506-
return node.path("textValues").stringValue();
506+
return node.path("textValues").stringValue(null);
507507
}
508508

509509
@Override

‎modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/DeleteHistoricProcessInstanceIdsJobHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void execute(JobEntity job, String configuration, VariableScope variableS
107107
batchService.completeBatchPart(batchPart.getId(), status, resultNode.toString());
108108

109109
// This part is here for backwards compatibility when the sequential deletion was done with a compute as well
110-
if (computeBatchPartResult.path("sequential").booleanValue()) {
110+
if (computeBatchPartResult.path("sequential").booleanValue(false)) {
111111
// If the computation was sequential we need to schedule the next job
112112
List<BatchPart> nextDeleteParts = engineConfiguration.getManagementService()
113113
.createBatchPartQuery()

‎modules/flowable-engine/src/main/java/org/flowable/engine/impl/jobexecutor/AsyncLeaveJobHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ protected SequenceFlow determineSequenceFlow(JobEntity job, ExecutionEntity exec
117117
}
118118

119119
if (sequenceFlow == null) {
120-
String source = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_SOURCE).asString(null);
121-
String target = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_TARGET).asString(null);
122-
int lineNr = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_LINE_NR).asInt();
123-
int columnNr = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_LINE_COLUMN_NR).asInt();
120+
String source = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_SOURCE).stringValue(null);
121+
String target = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_TARGET).stringValue(null);
122+
int lineNr = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_LINE_NR).asInt(0);
123+
int columnNr = jobConfigurationJson.path(FIELD_SEQUENCE_FLOW_LINE_COLUMN_NR).asInt(0);
124124

125125
List<SequenceFlow> sequenceFlows = bpmnModel.getMainProcess().findFlowElementsOfType(SequenceFlow.class, true);
126126
Optional<SequenceFlow> sequenceFlowOptional = sequenceFlows.stream()

‎modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/keydetector/JsonFieldBasedInboundEventKeyDetector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public JsonFieldBasedInboundEventKeyDetector(String field) {
3030

3131
@Override
3232
public String detectEventDefinitionKey(JsonNode payload) {
33-
return payload.path(field).asString();
33+
return payload.path(field).asString("");
3434
}
3535

3636
public String getJsonField() {

0 commit comments

Comments
 (0)