Merge branch 'main' of github.com:flowable/flowable-engine into flowable-release-8.0.0

tijsrademakers · tijsrademakers · commit 2006fc5a3d7a · 2025-09-12T12:11:49.000+02:00
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java
@@ -198,6 +198,7 @@
 import org.flowable.cmmn.engine.interceptor.CreateCasePageTaskInterceptor;
 import org.flowable.cmmn.engine.interceptor.CreateCmmnExternalWorkerJobInterceptor;
 import org.flowable.cmmn.engine.interceptor.CreateHumanTaskInterceptor;
+import org.flowable.cmmn.engine.interceptor.EndCaseInstanceInterceptor;
 import org.flowable.cmmn.engine.interceptor.HumanTaskStateInterceptor;
 import org.flowable.cmmn.engine.interceptor.StartCaseInstanceInterceptor;
 import org.flowable.cmmn.image.CaseDiagramGenerator;
@@ -388,6 +389,8 @@ public class CmmnEngineConfiguration extends AbstractBuildableEngineConfiguratio
     protected List<CaseInstanceLifecycleListener> caseInstanceLifecycleListeners;
     protected Map<String, List<PlanItemInstanceLifecycleListener>> planItemInstanceLifecycleListeners;
     protected StartCaseInstanceInterceptor startCaseInstanceInterceptor;
+    protected EndCaseInstanceInterceptor endCaseInstanceInterceptor;
+
     protected CreateHumanTaskInterceptor createHumanTaskInterceptor;
     protected HumanTaskStateInterceptor humanTaskStateInterceptor;
     protected CreateCasePageTaskInterceptor createCasePageTaskInterceptor;
@@ -2501,6 +2504,14 @@ public CmmnEngineConfiguration setStartCaseInstanceInterceptor(StartCaseInstance
         this.startCaseInstanceInterceptor = startCaseInstanceInterceptor;
         return this;
     }
+
+    public EndCaseInstanceInterceptor getEndCaseInstanceInterceptor() {
+        return endCaseInstanceInterceptor;
+    }
+
+    public void setEndCaseInstanceInterceptor(EndCaseInstanceInterceptor endCaseInstanceInterceptor) {
+        this.endCaseInstanceInterceptor = endCaseInstanceInterceptor;
+    }
     
     public CreateHumanTaskInterceptor getCreateHumanTaskInterceptor() {
         return createHumanTaskInterceptor;
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/AbstractDeleteCaseInstanceOperation.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/AbstractDeleteCaseInstanceOperation.java
@@ -40,7 +40,14 @@ public AbstractDeleteCaseInstanceOperation(CommandContext commandContext, CaseIn
 
     @Override
     public void internalExecute() {
+        CmmnEngineConfiguration cmmnEngineConfiguration = CommandContextUtil.getCmmnEngineConfiguration(commandContext);
+        if (cmmnEngineConfiguration.getEndCaseInstanceInterceptor() != null) {
+            cmmnEngineConfiguration.getEndCaseInstanceInterceptor().beforeEndCaseInstance(caseInstanceEntity, getNewState());
+        }
         deleteCaseInstance();
+        if (cmmnEngineConfiguration.getEndCaseInstanceInterceptor() != null) {
+            cmmnEngineConfiguration.getEndCaseInstanceInterceptor().afterEndCaseInstance(caseInstanceEntity.getId(), getNewState());
+        }
     }
 
     protected void deleteCaseInstance() {
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/CompleteCaseInstanceOperation.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/CompleteCaseInstanceOperation.java
@@ -13,6 +13,7 @@
 package org.flowable.cmmn.engine.impl.agenda.operation;
 
 import org.flowable.cmmn.api.runtime.CaseInstanceState;
+import org.flowable.cmmn.engine.CmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.behavior.OnParentEndDependantActivityBehavior;
 import org.flowable.cmmn.engine.impl.event.FlowableCmmnEventBuilder;
 import org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntity;
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/TerminateCaseInstanceOperation.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/TerminateCaseInstanceOperation.java
@@ -20,6 +20,7 @@
 import java.util.HashMap;
 
 import org.flowable.cmmn.api.runtime.CaseInstanceState;
+import org.flowable.cmmn.engine.CmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.behavior.OnParentEndDependantActivityBehavior;
 import org.flowable.cmmn.engine.impl.callback.CallbackConstants;
 import org.flowable.cmmn.engine.impl.event.FlowableCmmnEventBuilder;
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/CmmnHistoryManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/CmmnHistoryManager.java
@@ -16,6 +16,7 @@
 import java.util.Date;
 
 import org.flowable.cmmn.api.repository.CaseDefinition;
+import org.flowable.cmmn.api.runtime.CaseInstance;
 import org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntity;
 import org.flowable.cmmn.engine.impl.persistence.entity.MilestoneInstanceEntity;
 import org.flowable.cmmn.engine.impl.persistence.entity.PlanItemInstanceEntity;
@@ -51,6 +52,8 @@ public interface CmmnHistoryManager {
 
     void recordIdentityLinkCreated(IdentityLinkEntity identityLink);
 
+    void recordIdentityLinkCreated(CaseInstanceEntity caseInstance, IdentityLinkEntity identityLink);
+
     void recordIdentityLinkDeleted(IdentityLinkEntity identityLink);
     
     void recordEntityLinkCreated(EntityLinkEntity entityLink);
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/CompositeCmmnHistoryManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/CompositeCmmnHistoryManager.java
@@ -17,6 +17,7 @@
 import java.util.Date;
 
 import org.flowable.cmmn.api.repository.CaseDefinition;
+import org.flowable.cmmn.api.runtime.CaseInstance;
 import org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntity;
 import org.flowable.cmmn.engine.impl.persistence.entity.MilestoneInstanceEntity;
 import org.flowable.cmmn.engine.impl.persistence.entity.PlanItemInstanceEntity;
@@ -109,6 +110,13 @@ public void recordIdentityLinkCreated(IdentityLinkEntity identityLink) {
         }
     }
 
+    @Override
+    public void recordIdentityLinkCreated(CaseInstanceEntity caseInstance, IdentityLinkEntity identityLink) {
+        for (CmmnHistoryManager historyManager : historyManagers) {
+            historyManager.recordIdentityLinkCreated(caseInstance, identityLink);
+        }
+    }
+
     @Override
     public void recordIdentityLinkDeleted(IdentityLinkEntity identityLink) {
         for (CmmnHistoryManager historyManager : historyManagers) {
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/DefaultCmmnHistoryManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/DefaultCmmnHistoryManager.java
@@ -21,6 +21,7 @@
 import org.flowable.cmmn.api.history.HistoricMilestoneInstance;
 import org.flowable.cmmn.api.history.HistoricPlanItemInstance;
 import org.flowable.cmmn.api.repository.CaseDefinition;
+import org.flowable.cmmn.api.runtime.CaseInstance;
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntity;
 import org.flowable.cmmn.engine.impl.persistence.entity.HistoricCaseInstanceEntity;
@@ -177,6 +178,11 @@ public void recordBulkDeleteHistoricCaseInstances(Collection<String> caseInstanc
 
     @Override
     public void recordIdentityLinkCreated(IdentityLinkEntity identityLink) {
+        this.recordIdentityLinkCreated(null, identityLink);
+    }
+
+    @Override
+    public void recordIdentityLinkCreated(CaseInstanceEntity caseInstance, IdentityLinkEntity identityLink) {
         if (getHistoryConfigurationSettings().isHistoryEnabledForIdentityLink(identityLink)
                 && (identityLink.getScopeId() != null || identityLink.getTaskId() != null)) {
             HistoricIdentityLinkService historicIdentityLinkService = cmmnEngineConfiguration.getIdentityLinkServiceConfiguration().getHistoricIdentityLinkService();
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/util/IdentityLinkUtil.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/util/IdentityLinkUtil.java
@@ -17,6 +17,7 @@
 import org.flowable.cmmn.api.runtime.CaseInstance;
 import org.flowable.cmmn.api.runtime.PlanItemInstance;
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
+import org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntity;
 import org.flowable.common.engine.api.scope.ScopeTypes;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntity;
@@ -33,14 +34,13 @@
  */
 public class IdentityLinkUtil {
 
-    public static IdentityLinkEntity createCaseInstanceIdentityLink(CaseInstance caseInstance, String userId, String groupId, String type,
+    public static IdentityLinkEntity createCaseInstanceIdentityLink(CaseInstanceEntity caseInstanceEntity, String userId, String groupId, String type,
             CmmnEngineConfiguration cmmnEngineConfiguration) {
         
         IdentityLinkEntity identityLinkEntity = cmmnEngineConfiguration.getIdentityLinkServiceConfiguration()
-                .getIdentityLinkService().createScopeIdentityLink(null, caseInstance.getId(), ScopeTypes.CMMN, userId, groupId, type);
-        
-        CommandContextUtil.getCmmnHistoryManager().recordIdentityLinkCreated(identityLinkEntity);
-        
+                .getIdentityLinkService().createScopeIdentityLink(null, caseInstanceEntity.getId(), ScopeTypes.CMMN, userId, groupId, type);
+
+        CommandContextUtil.getCmmnHistoryManager().recordIdentityLinkCreated(caseInstanceEntity, identityLinkEntity);
         return identityLinkEntity;
     }
     
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/interceptor/EndCaseInstanceInterceptor.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/interceptor/EndCaseInstanceInterceptor.java
@@ -0,0 +1,22 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.cmmn.engine.interceptor;
+
+import org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntity;
+
+public interface EndCaseInstanceInterceptor {
+
+    void beforeEndCaseInstance(CaseInstanceEntity caseInstance, String state);
+
+    void afterEndCaseInstance(String caseInstanceId, String state);
+}
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/CompositeCmmnHistoryManagerTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/CompositeCmmnHistoryManagerTest.java
@@ -118,6 +118,16 @@ void recordIdentityLinkCreated() {
         verify(historyManager2).recordIdentityLinkCreated(same(identityLink));
     }
 
+    @Test
+    void recordIdentityLinkCreatedWithCaseInstance() {
+        CaseInstanceEntity caseInstance = new CaseInstanceEntityImpl();
+        IdentityLinkEntity identityLink = new IdentityLinkEntityImpl();
+        compositeHistoryManager.recordIdentityLinkCreated(caseInstance, identityLink);
+
+        verify(historyManager1).recordIdentityLinkCreated(same(caseInstance), same(identityLink));
+        verify(historyManager2).recordIdentityLinkCreated(same(caseInstance), same(identityLink));
+    }
+
     @Test
     void recordIdentityLinkDeleted() {
         IdentityLinkEntity identityLink = new IdentityLinkEntityImpl();
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/CaseInstanceEndInterceptorTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/CaseInstanceEndInterceptorTest.java
@@ -0,0 +1,88 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.flowable.cmmn.test.runtime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.flowable.cmmn.api.runtime.CaseInstance;
+import org.flowable.cmmn.api.runtime.CaseInstanceState;
+import org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntity;
+import org.flowable.cmmn.engine.interceptor.EndCaseInstanceInterceptor;
+import org.flowable.cmmn.engine.test.CmmnDeployment;
+import org.flowable.cmmn.test.FlowableCmmnTestCase;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Christopher Welsch
+ */
+public class CaseInstanceEndInterceptorTest extends FlowableCmmnTestCase {
+
+    @Test
+    @CmmnDeployment(resources = "org/flowable/cmmn/test/runtime/oneHumanTaskCase.cmmn")
+    public void testEndProcessInterceptorIsCalled() {
+        try {
+            TestEndCaseInstanceInterceptor testEndCaseInstanceInterceptor = new TestEndCaseInstanceInterceptor();
+            cmmnEngineConfiguration.setEndCaseInstanceInterceptor(testEndCaseInstanceInterceptor);
+
+            cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("oneHumanTaskCase").start();
+            cmmnTaskService.complete(cmmnTaskService.createTaskQuery().singleResult().getId());
+            assertThat(testEndCaseInstanceInterceptor.beforeIsCalled).isTrue();
+            assertThat(testEndCaseInstanceInterceptor.beforeState).isEqualTo(CaseInstanceState.COMPLETED);
+
+            assertThat(testEndCaseInstanceInterceptor.afterIsCalled).isTrue();
+            assertThat(testEndCaseInstanceInterceptor.afterState).isEqualTo(CaseInstanceState.COMPLETED);
+        } finally {
+            cmmnEngineConfiguration.setEndCaseInstanceInterceptor(null);
+        }
+    }
+
+    @Test
+    @CmmnDeployment(resources = "org/flowable/cmmn/test/runtime/oneHumanTaskCase.cmmn")
+    public void testEndProcessInterceptorIsNotCalledForTermination() {
+        try {
+            TestEndCaseInstanceInterceptor testEndCaseInstanceInterceptor = new TestEndCaseInstanceInterceptor();
+            cmmnEngineConfiguration.setEndCaseInstanceInterceptor(testEndCaseInstanceInterceptor);
+            CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("oneHumanTaskCase").start();
+            cmmnRuntimeService.terminateCaseInstance(caseInstance.getId());
+            assertThat(testEndCaseInstanceInterceptor.beforeIsCalled).isTrue();
+            assertThat(testEndCaseInstanceInterceptor.beforeState).isEqualTo(CaseInstanceState.TERMINATED);
+
+            assertThat(testEndCaseInstanceInterceptor.afterIsCalled).isTrue();
+            assertThat(testEndCaseInstanceInterceptor.afterState).isEqualTo(CaseInstanceState.TERMINATED);
+        } finally {
+            cmmnEngineConfiguration.setEndCaseInstanceInterceptor(null);
+        }
+    }
+
+    public static class TestEndCaseInstanceInterceptor implements EndCaseInstanceInterceptor {
+
+        protected boolean beforeIsCalled = false;
+        protected String beforeState = null;
+
+        protected boolean afterIsCalled = false;
+        protected String afterState = null;
+
+        @Override
+        public void beforeEndCaseInstance(CaseInstanceEntity caseInstance, String endingState) {
+            beforeIsCalled = true;
+            beforeState = endingState;
+        }
+
+        @Override
+        public void afterEndCaseInstance(String caseInstanceId, String endingState) {
+            afterIsCalled = true;
+            afterState = endingState;
+        }
+    }
+}
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/agenda/EndExecutionOperation.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/agenda/EndExecutionOperation.java
@@ -43,6 +43,7 @@
 import org.flowable.engine.impl.jobexecutor.AsyncCompleteCallActivityJobHandler;
 import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
 import org.flowable.engine.impl.persistence.entity.ExecutionEntityManager;
+import org.flowable.engine.impl.runtime.callback.ProcessInstanceState;
 import org.flowable.engine.impl.util.CommandContextUtil;
 import org.flowable.engine.impl.util.ProcessDefinitionUtil;
 import org.flowable.job.service.JobService;
@@ -183,6 +184,10 @@ protected void handleRegularExecution() {
         ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
         ExecutionEntityManager executionEntityManager = processEngineConfiguration.getExecutionEntityManager();
 
+        if (processEngineConfiguration.getEndProcessInstanceInterceptor() != null) {
+            processEngineConfiguration.getEndProcessInstanceInterceptor().beforeEndProcessInstance(execution, ProcessInstanceState.COMPLETED);
+        }
+
         // There will be a parent execution (or else we would be in the process instance handling method)
         ExecutionEntity parentExecution = executionEntityManager.findById(execution.getParentId());
 
@@ -242,7 +247,6 @@ protected void handleRegularExecution() {
                     
                     agenda.planEndExecutionOperation(subProcessParentExecution);
                 }
-
                 return;
             }
         }
@@ -305,6 +309,10 @@ protected void handleRegularExecution() {
             }
 
         }
+
+        if (processEngineConfiguration.getEndProcessInstanceInterceptor() != null) {
+            processEngineConfiguration.getEndProcessInstanceInterceptor().afterEndProcessInstance(execution.getId(), ProcessInstanceState.COMPLETED);
+        }
     }
 
     protected ExecutionEntity handleSubProcessEnd(ExecutionEntityManager executionEntityManager, ExecutionEntity parentExecution, SubProcess subProcess) {
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
@@ -348,6 +348,7 @@
 import org.flowable.engine.impl.variable.ParallelMultiInstanceLoopVariableType;
 import org.flowable.engine.interceptor.CreateExternalWorkerJobInterceptor;
 import org.flowable.engine.interceptor.CreateUserTaskInterceptor;
+import org.flowable.engine.interceptor.EndProcessInstanceInterceptor;
 import org.flowable.engine.interceptor.ExecutionQueryInterceptor;
 import org.flowable.engine.interceptor.HistoricProcessInstanceQueryInterceptor;
 import org.flowable.engine.interceptor.IdentityLinkInterceptor;
@@ -753,6 +754,8 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
     protected BusinessCalendarManager businessCalendarManager;
 
     protected StartProcessInstanceInterceptor startProcessInstanceInterceptor;
+    protected EndProcessInstanceInterceptor endProcessInstanceInterceptor;
+
     protected CreateUserTaskInterceptor createUserTaskInterceptor;
     protected UserTaskStateInterceptor userTaskStateInterceptor;
     protected CreateExternalWorkerJobInterceptor createExternalWorkerJobInterceptor;
@@ -3353,6 +3356,15 @@ public ProcessEngineConfigurationImpl setStartProcessInstanceInterceptor(StartPr
         this.startProcessInstanceInterceptor = startProcessInstanceInterceptor;
         return this;
     }
+
+    public EndProcessInstanceInterceptor getEndProcessInstanceInterceptor() {
+        return endProcessInstanceInterceptor;
+    }
+
+    public ProcessEngineConfigurationImpl setEndProcessInstanceInterceptor(EndProcessInstanceInterceptor endProcessInstanceInterceptor) {
+        this.endProcessInstanceInterceptor = endProcessInstanceInterceptor;
+        return this;
+    }
     
     public CreateUserTaskInterceptor getCreateUserTaskInterceptor() {
         return createUserTaskInterceptor;
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/history/CompositeHistoryManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/history/CompositeHistoryManager.java
@@ -288,6 +288,13 @@ public void recordIdentityLinkCreated(IdentityLinkEntity identityLink) {
         }
     }
 
+    @Override
+    public void recordIdentityLinkCreated(ExecutionEntity processInstance, IdentityLinkEntity identityLink) {
+        for (HistoryManager historyManager : historyManagers) {
+            historyManager.recordIdentityLinkCreated(processInstance,identityLink);
+        }
+    }
+
     @Override
     public void recordIdentityLinkDeleted(IdentityLinkEntity identityLink) {
         for (HistoryManager historyManager : historyManagers) {
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/history/DefaultHistoryManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/history/DefaultHistoryManager.java
@@ -389,6 +389,11 @@ public void recordFormPropertiesSubmitted(ExecutionEntity processInstance, Map<S
     // Identity link related history
     @Override
     public void recordIdentityLinkCreated(IdentityLinkEntity identityLink) {
+        recordIdentityLinkCreated(null, identityLink);
+    }
+
+    @Override
+    public void recordIdentityLinkCreated(ExecutionEntity processInstance, IdentityLinkEntity identityLink) {
         // It makes no sense storing historic counterpart for an identity link that is related
         // to a process definition only as this is never kept in history
         if (getHistoryConfigurationSettings().isHistoryEnabledForIdentityLink(identityLink)
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/history/HistoryManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/history/HistoryManager.java
@@ -198,6 +198,11 @@ void recordHistoricDetailVariableCreate(VariableInstanceEntity variable, Executi
      */
     void recordIdentityLinkCreated(IdentityLinkEntity identityLink);
 
+    /**
+     * Record the creation of a new {@link IdentityLink} for the processInstance, if audit history is enabled.
+     */
+    void recordIdentityLinkCreated(ExecutionEntity processInstance, IdentityLinkEntity identityLinkEntity);
+
     /**
      * Record the deletion of a {@link IdentityLink}, if audit history is enabled
      */
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/util/IdentityLinkUtil.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/util/IdentityLinkUtil.java
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/interceptor/EndProcessInstanceInterceptor.java b/modules/flowable-engine/src/main/java/org/flowable/engine/interceptor/EndProcessInstanceInterceptor.java
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/ProcessInstanceEndInterceptorTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/runtime/ProcessInstanceEndInterceptorTest.java
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/history/CompositeHistoryManagerTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/history/CompositeHistoryManagerTest.java
