Merge branch 'main' of github.com:flowable/flowable-engine into flowa…

…ble-release-7.1.0
flowable · Apr 12, 2024 · 1ba5594 · 1ba5594
2 parents 5ccb254 + b5d15f6
commit 1ba5594
Show file tree

Hide file tree

Showing 23 changed files with 484 additions and 64 deletions.
diff --git a/...i/src/main/java/org/flowable/cmmn/api/migration/CaseInstanceBatchMigrationPartResult.java b/...i/src/main/java/org/flowable/cmmn/api/migration/CaseInstanceBatchMigrationPartResult.java
@@ -22,6 +22,7 @@ public class CaseInstanceBatchMigrationPartResult {
     protected String sourceCaseDefinitionId;
     protected String targetCaseDefinitionId;
     protected String migrationMessage;
+    protected String migrationStacktrace;
 
     public String getBatchId() {
         return batchId;
@@ -78,4 +79,12 @@ public String getMigrationMessage() {
     public void setMigrationMessage(String migrationMessage) {
         this.migrationMessage = migrationMessage;
     }
+
+    public String getMigrationStacktrace() {
+        return migrationStacktrace;
+    }
+
+    public void setMigrationStacktrace(String migrationStacktrace) {
+        this.migrationStacktrace = migrationStacktrace;
+    }
 }
diff --git a/...c/main/java/org/flowable/cmmn/engine/impl/cmd/GetCaseInstanceMigrationBatchResultCmd.java b/...c/main/java/org/flowable/cmmn/engine/impl/cmd/GetCaseInstanceMigrationBatchResultCmd.java
@@ -36,6 +36,7 @@
 public class GetCaseInstanceMigrationBatchResultCmd implements Command<CaseInstanceBatchMigrationResult> {
 
     protected static final String BATCH_RESULT_MESSAGE_LABEL = "resultMessage";
+    protected static final String BATCH_RESULT_STACKTRACE_LABEL = "resultStacktrace";
     protected String migrationBatchId;
 
     public GetCaseInstanceMigrationBatchResultCmd(String migrationBatchId) {
@@ -98,6 +99,11 @@ protected CaseInstanceBatchMigrationPartResult convertFromBatchPart(BatchPart ba
                     String resultMessage = resultNode.get(BATCH_RESULT_MESSAGE_LABEL).asText();
                     partResult.setMigrationMessage(resultMessage);
                 }
+
+                if (resultNode.has(BATCH_RESULT_STACKTRACE_LABEL)) {
+                    String resultStacktrace = resultNode.get(BATCH_RESULT_STACKTRACE_LABEL).asText();
+                    partResult.setMigrationStacktrace(resultStacktrace);
+                }
 
             } catch (IOException e) {
                 throw new FlowableException("Error reading batch part " + batchPart.getId());

diff --git a/.../main/java/org/flowable/cmmn/engine/impl/job/AbstractCaseInstanceMigrationJobHandler.java b/.../main/java/org/flowable/cmmn/engine/impl/job/AbstractCaseInstanceMigrationJobHandler.java
@@ -25,6 +25,7 @@ public abstract class AbstractCaseInstanceMigrationJobHandler implements JobHand
 
     public static final String BATCH_RESULT_STATUS_LABEL = "resultStatus";
     public static final String BATCH_RESULT_MESSAGE_LABEL = "resultMessage";
+    public static final String BATCH_RESULT_STACKTRACE_LABEL = "resultStacktrace";
 
     protected static final String CFG_LABEL_BATCH_ID = "batchId";
     protected static final String CFG_LABEL_BATCH_PART_ID = "batchPartId";

diff --git a/...gine/src/main/java/org/flowable/cmmn/engine/impl/job/CaseInstanceMigrationJobHandler.java b/...gine/src/main/java/org/flowable/cmmn/engine/impl/job/CaseInstanceMigrationJobHandler.java
@@ -12,6 +12,9 @@
  */
 package org.flowable.cmmn.engine.impl.job;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.flowable.batch.api.Batch;
 import org.flowable.batch.api.BatchPart;
 import org.flowable.batch.api.BatchService;
@@ -21,7 +24,9 @@
 import org.flowable.cmmn.engine.impl.migration.CaseInstanceMigrationDocumentImpl;
 import org.flowable.cmmn.engine.impl.migration.CaseInstanceMigrationManager;
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.api.FlowableBatchPartMigrationException;
+import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.job.service.impl.persistence.entity.JobEntity;
 import org.flowable.variable.api.delegate.VariableScope;
@@ -49,31 +54,53 @@ public void execute(JobEntity job, String configuration, VariableScope variableS
         CaseInstanceMigrationDocument migrationDocument = CaseInstanceMigrationDocumentImpl.fromJson(
                 batch.getBatchDocumentJson(engineConfiguration.getEngineCfgKey()));
 
-        String exceptionMessage = null;
         try {
             migrationManager.migrateCaseInstance(batchPart.getScopeId(), migrationDocument, commandContext);
-        } catch (FlowableException e) {
-            exceptionMessage = e.getMessage();
-        }
+        } catch (Exception e) {
+            String exceptionMessage = e.getMessage();
+
+            engineConfiguration.getCommandExecutor().execute(new Command<>() {
+                @Override
+                public Void execute(CommandContext commandContext) {
+                    CommandConfig commandConfig = engineConfiguration.getCommandExecutor().getDefaultConfig().transactionRequiresNew();
+                    return engineConfiguration.getCommandExecutor().execute(commandConfig, new Command<>() {
+                        @Override
+                        public Void execute(CommandContext commandContext2) {
+                            String resultAsJsonString = prepareResultAsJsonString(exceptionMessage, e);
+                            batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_FAIL, resultAsJsonString);
 
-        String resultAsJsonString = prepareResultAsJsonString(exceptionMessage);
-
-        if (exceptionMessage != null) {
-            batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_FAIL, resultAsJsonString);
-        } else {
-            batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_SUCCESS, resultAsJsonString);
+                            return null;
+                        }
+                    });
+                }
+            });
+
+            FlowableBatchPartMigrationException wrappedException = new FlowableBatchPartMigrationException(e.getMessage(), e);
+            wrappedException.setIgnoreFailedJob(true);
+            throw wrappedException;
         }
+
+        String resultAsJsonString = prepareResultAsJsonString();
+        batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_SUCCESS, resultAsJsonString);
     }
 
-    protected static String prepareResultAsJsonString(String exceptionMessage) {
+    protected String prepareResultAsJsonString(String exceptionMessage, Exception e) {
         ObjectNode objectNode = getObjectMapper().createObjectNode();
-        if (exceptionMessage == null) {
-            objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_SUCCESS);
-        } else {
-            objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_FAIL);
-            objectNode.put(BATCH_RESULT_MESSAGE_LABEL, exceptionMessage);
-        }
+        objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_FAIL);
+        objectNode.put(BATCH_RESULT_MESSAGE_LABEL, exceptionMessage);
+        objectNode.put(BATCH_RESULT_STACKTRACE_LABEL, getExceptionStacktrace(e));
+        return objectNode.toString();
+    }
+
+    protected String prepareResultAsJsonString() {
+        ObjectNode objectNode = getObjectMapper().createObjectNode();
+        objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_SUCCESS);
         return objectNode.toString();
     }
 
+    protected String getExceptionStacktrace(Throwable exception) {
+        StringWriter stringWriter = new StringWriter();
+        exception.printStackTrace(new PrintWriter(stringWriter));
+        return stringWriter.toString();
+    }
 }
diff --git a/.../main/java/org/flowable/cmmn/engine/impl/job/HistoricCaseInstanceMigrationJobHandler.java b/.../main/java/org/flowable/cmmn/engine/impl/job/HistoricCaseInstanceMigrationJobHandler.java
@@ -12,6 +12,9 @@
  */
 package org.flowable.cmmn.engine.impl.job;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.flowable.batch.api.Batch;
 import org.flowable.batch.api.BatchPart;
 import org.flowable.batch.api.BatchService;
@@ -21,7 +24,9 @@
 import org.flowable.cmmn.engine.impl.migration.CaseInstanceMigrationManager;
 import org.flowable.cmmn.engine.impl.migration.HistoricCaseInstanceMigrationDocumentImpl;
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.api.FlowableBatchPartMigrationException;
+import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.job.service.impl.persistence.entity.JobEntity;
 import org.flowable.variable.api.delegate.VariableScope;
@@ -49,31 +54,53 @@ public void execute(JobEntity job, String configuration, VariableScope variableS
         HistoricCaseInstanceMigrationDocument migrationDocument = HistoricCaseInstanceMigrationDocumentImpl.fromJson(
                 batch.getBatchDocumentJson(engineConfiguration.getEngineCfgKey()));
 
-        String exceptionMessage = null;
         try {
             migrationManager.migrateHistoricCaseInstance(batchPart.getScopeId(), migrationDocument, commandContext);
-        } catch (FlowableException e) {
-            exceptionMessage = e.getMessage();
-        }
+        } catch (Exception e) {
+            String exceptionMessage = e.getMessage();
+
+            engineConfiguration.getCommandExecutor().execute(new Command<>() {
+                @Override
+                public Void execute(CommandContext commandContext) {
+                    CommandConfig commandConfig = engineConfiguration.getCommandExecutor().getDefaultConfig().transactionRequiresNew();
+                    return engineConfiguration.getCommandExecutor().execute(commandConfig, new Command<>() {
+                        @Override
+                        public Void execute(CommandContext commandContext2) {
+                            String resultAsJsonString = prepareResultAsJsonString(exceptionMessage, e);
+                            batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_FAIL, resultAsJsonString);
 
-        String resultAsJsonString = prepareResultAsJsonString(exceptionMessage);
-
-        if (exceptionMessage != null) {
-            batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_FAIL, resultAsJsonString);
-        } else {
-            batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_SUCCESS, resultAsJsonString);
+                            return null;
+                        }
+                    });
+                }
+            });
+
+            FlowableBatchPartMigrationException wrappedException = new FlowableBatchPartMigrationException(e.getMessage(), e);
+            wrappedException.setIgnoreFailedJob(true);
+            throw wrappedException;
         }
+
+        String resultAsJsonString = prepareResultAsJsonString();
+        batchService.completeBatchPart(batchPartId, CaseInstanceBatchMigrationResult.RESULT_SUCCESS, resultAsJsonString);
     }
 
-    protected static String prepareResultAsJsonString(String exceptionMessage) {
+    protected String prepareResultAsJsonString(String exceptionMessage, Exception e) {
         ObjectNode objectNode = getObjectMapper().createObjectNode();
-        if (exceptionMessage == null) {
-            objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_SUCCESS);
-        } else {
-            objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_FAIL);
-            objectNode.put(BATCH_RESULT_MESSAGE_LABEL, exceptionMessage);
-        }
+        objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_FAIL);
+        objectNode.put(BATCH_RESULT_MESSAGE_LABEL, exceptionMessage);
+        objectNode.put(BATCH_RESULT_STACKTRACE_LABEL, getExceptionStacktrace(e));
+        return objectNode.toString();
+    }
+
+    protected String prepareResultAsJsonString() {
+        ObjectNode objectNode = getObjectMapper().createObjectNode();
+        objectNode.put(BATCH_RESULT_STATUS_LABEL, CaseInstanceBatchMigrationResult.RESULT_SUCCESS);
         return objectNode.toString();
     }
 
+    protected String getExceptionStacktrace(Throwable exception) {
+        StringWriter stringWriter = new StringWriter();
+        exception.printStackTrace(new PrintWriter(stringWriter));
+        return stringWriter.toString();
+    }
 }
diff --git a/...c/main/java/org/flowable/cmmn/engine/impl/migration/CaseInstanceMigrationBuilderImpl.java b/...c/main/java/org/flowable/cmmn/engine/impl/migration/CaseInstanceMigrationBuilderImpl.java
@@ -52,6 +52,8 @@ public CaseInstanceMigrationBuilder fromCaseInstanceMigrationDocument(CaseInstan
         this.caseInstanceMigrationDocumentDocumentBuilder.addWaitingForRepetitionPlanItemDefinitionMappings(caseInstanceMigrationDocument.getWaitingForRepetitionPlanItemDefinitionMappings());
         this.caseInstanceMigrationDocumentDocumentBuilder.addRemoveWaitingForRepetitionPlanItemDefinitionMappings(caseInstanceMigrationDocument.getRemoveWaitingForRepetitionPlanItemDefinitionMappings());
         this.caseInstanceMigrationDocumentDocumentBuilder.addCaseInstanceVariables(caseInstanceMigrationDocument.getCaseInstanceVariables());
+        this.caseInstanceMigrationDocumentDocumentBuilder.preUpgradeExpression(caseInstanceMigrationDocument.getPreUpgradeExpression());
+        this.caseInstanceMigrationDocumentDocumentBuilder.postUpgradeExpression(caseInstanceMigrationDocument.getPostUpgradeExpression());
         return this;
     }
 

diff --git a/...c/main/java/org/flowable/cmmn/engine/impl/migration/CaseInstanceMigrationManagerImpl.java b/...c/main/java/org/flowable/cmmn/engine/impl/migration/CaseInstanceMigrationManagerImpl.java
@@ -14,11 +14,9 @@
 package org.flowable.cmmn.engine.impl.migration;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 
 import org.flowable.batch.api.Batch;
 import org.flowable.batch.api.BatchPart;
@@ -480,6 +478,7 @@ public Batch batchMigrateCaseInstancesOfCaseDefinition(String caseDefinitionId,
             job.setScopeType(ScopeTypes.CMMN);
             job.setJobHandlerConfiguration(CaseInstanceMigrationJobHandler.getHandlerCfgForBatchPartId(batchPart.getId()));
             jobService.createAsyncJob(job, false);
+            job.setRetries(0);
             jobService.scheduleAsyncJob(job);
         }
 
@@ -488,6 +487,7 @@ public Batch batchMigrateCaseInstancesOfCaseDefinition(String caseDefinitionId,
             TimerJobEntity timerJob = timerJobService.createTimerJob();
             timerJob.setJobType(JobEntity.JOB_TYPE_TIMER);
             timerJob.setRevision(1);
+            timerJob.setRetries(0);
             timerJob.setJobHandlerType(CaseInstanceMigrationStatusJobHandler.TYPE);
             timerJob.setJobHandlerConfiguration(CaseInstanceMigrationJobHandler.getHandlerCfgForBatchId(batch.getId()));
             timerJob.setScopeType(ScopeTypes.CMMN);

diff --git a/.../src/main/java/org/flowable/cmmn/engine/impl/runtime/AbstractCmmnDynamicStateManager.java b/.../src/main/java/org/flowable/cmmn/engine/impl/runtime/AbstractCmmnDynamicStateManager.java
@@ -355,6 +355,7 @@ protected void executeChangePlanItemInstancesToAvailableState(CaseInstanceChange
             }
 
             PlanItemInstance existingPlanItemInstance = null;
+            boolean allExistingPlanItemsAreAvailable = true;
             for (PlanItemInstance planItemInstance : planItemInstances) {
                 if (PlanItemInstanceState.ACTIVE.equals(planItemInstance.getState()) || PlanItemInstanceState.ENABLED.equals(planItemInstance.getState())) {
                     if (existingPlanItemInstance != null) {
@@ -363,6 +364,14 @@ protected void executeChangePlanItemInstancesToAvailableState(CaseInstanceChange
                         existingPlanItemInstance = planItemInstance;
                     }
                 }
+                if (!PlanItemInstanceState.AVAILABLE.equals(planItemInstance.getState())) {
+                    allExistingPlanItemsAreAvailable = false;
+                }
+            }
+
+            if (allExistingPlanItemsAreAvailable) {
+                // all existing plan items are available, we can continue without any changes
+                continue;
             }
 
             if (existingPlanItemInstance == null) {