AAE-39413 Change relationship of IntegrationContextEntity and ServiceTaskEntity #2047

aonych · 2025-12-04T09:57:47Z

No description provided.

…ndler

This reverts commit ebffb67.

…ceTaskId to many

Copilot

Pull request overview

This pull request changes the relationship between IntegrationContextEntity and ServiceTaskEntity from a one-to-one to a one-to-many relationship, allowing multiple integration contexts to be associated with a single service task. This supports cyclical service tasks and retry scenarios.

Key changes:

Changed JPA relationship from @OneToOne to @OneToMany on ServiceTaskEntity and @ManyToOne on IntegrationContextEntity
Modified database unique constraint to allow multiple integration contexts per service task
Added new REST endpoint /admin/v1/service-tasks/{serviceTaskId}/integration-contexts to retrieve all integration contexts for a service task
Added integrationContextCounter field to CloudServiceTask to track the number of integration contexts

Reviewed changes

Copilot reviewed 21 out of 21 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
IntegrationContextEntity.java	Changed relationship from @OnetoOne to @manytoone with composite foreign key join columns; removed unique constraint on process/client/execution combination; simplified setServiceTask method
ServiceTaskEntity.java	Changed relationship from @OnetoOne to @onetomany; added getIntegrationContextCounter method that counts associated integration contexts
IntegrationContextRepository.java	Updated findByProcessInstanceIdAndClientIdAndExecutionId to return Page instead of single entity and added Pageable parameter
ServiceTaskIntegrationContextAdminController.java	Refactored findById to findByServiceTaskId with string parsing logic; added new findAllByServiceTaskId endpoint; removed EntityFinder dependency
IntegrationContextRepresentationModelAssembler.java	Updated to call renamed controller method findByServiceTaskId
QueryRestControllersAutoConfiguration.java	Removed unused import TaskControllerAdvice
IntegrationRequestedEventHandler.java	Separated integration context ID from service task ID; now uses integrationContext.getId() directly
IntegrationErrorReceivedEventHandler.java	Added explicit service task ID construction using IdBuilderHelper
BaseIntegrationEventHandler.java	Changed to use integrationContext.getId() instead of IdBuilderHelper for finding integration contexts
CloudServiceTask.java	Added getIntegrationContextCounter() method to interface
CloudServiceTaskImpl.java	Implemented integrationContextCounter field with getter, setter, and updated toString method
33-alter.pg.schema.8.8.0.sql	Database migration script for PostgreSQL to modify unique constraint
33-alter.oracle.schema.8.8.0.sql	Database migration script for Oracle to modify unique constraint
h2.schema.sql	Removed unique constraint creation from H2 schema
master.xml	Added new Liquibase changesets for database migrations
swagger-expected.json	Updated OpenAPI specification with new endpoint, parameters, and schemas; renamed operation from findById to findByServiceTaskId
QueryAdminProcessServiceTasksIT.java	Added integration tests for multiple integration contexts functionality
ProcessQueryAdminSteps.java	Added step method to retrieve all integration contexts
ProcessQueryAdminService.java	Added service method to call new REST endpoint
process-instance-service-tasks-actions.story	Added acceptance test scenario for retrieving all integration contexts
ProcessInstanceServiceTasks.java	Implemented test steps for verifying multiple integration contexts retrieval

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

...quibase/src/main/resources/config/query/liquibase/changelog/33-alter.oracle.schema.8.8.0.sql

...ava/org/activiti/cloud/services/query/rest/ServiceTaskIntegrationContextAdminController.java

...ces-query-model/src/main/java/org/activiti/cloud/services/query/model/ServiceTaskEntity.java

...viti/cloud/services/query/rest/assembler/IntegrationContextRepresentationModelAssembler.java

...ti-cloud-query-service/activiti-cloud-starter-query/src/test/resources/swagger-expected.json

...ry-model/src/main/java/org/activiti/cloud/services/query/model/IntegrationContextEntity.java

...ti-cloud-query-service/activiti-cloud-starter-query/src/test/resources/swagger-expected.json

...model-impl/src/main/java/org/activiti/cloud/api/process/model/impl/CloudServiceTaskImpl.java

...ava/org/activiti/cloud/services/query/rest/ServiceTaskIntegrationContextAdminController.java

...y-liquibase/src/main/resources/config/query/liquibase/changelog/33-alter.pg.schema.8.8.0.sql

# Conflicts: # activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/33-alter.oracle.schema.8.8.0.sql # activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/33-alter.pg.schema.8.8.0.sql

CLAassistant · 2026-01-12T12:28:34Z

All committers have signed the CLA.

erdemedeiros

Great job! I've added some questions and suggestions

erdemedeiros · 2026-01-16T15:47:22Z

...-acceptance-tests/src/main/java/org/activiti/cloud/qa/story/ProcessInstanceServiceTasks.java

+            .untilAsserted(() -> {
+                PagedModel<CloudServiceTask> tasks = processQueryAdminSteps.getServiceTasks(processId);
+
+                assertThat(tasks.getContent()).isNotEmpty().hasSize(1).as("Should have exactly one service task");


calling isNotEmpty() is redundant. This assertion will already fail if size is different from 1.

erdemedeiros · 2026-01-16T15:50:17Z

...-acceptance-tests/src/main/java/org/activiti/cloud/qa/story/ProcessInstanceServiceTasks.java

+            .untilAsserted(() -> {
+                PagedModel<CloudServiceTask> tasks = processQueryAdminSteps.getServiceTasks(processId);
+
+                assertThat(tasks.getContent()).isNotEmpty().hasSize(1).as("Should have exactly one service task");


isNotEmpty() is redundant

erdemedeiros · 2026-01-16T15:51:52Z

...-acceptance-tests/src/main/java/org/activiti/cloud/qa/story/ProcessInstanceServiceTasks.java

+                CloudServiceTask serviceTask = tasks.getContent().iterator().next();
+
+                assertThat(serviceTask.getIntegrationContextCounter())
+                    .isNotNull()


isNotNull() is redundant

erdemedeiros · 2026-01-19T08:15:19Z

...mple-runtime-bundle/starter/src/main/resources/processes/ConnectorProcessWithLoop.bpmn20.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>


I think it would be nice to add coverage for multi-instances as well once https://hyland.atlassian.net/browse/AAE-41417 is fixed (in a follow up PR).

erdemedeiros · 2026-01-19T08:32:09Z

...ry-model/src/main/java/org/activiti/cloud/services/query/model/IntegrationContextEntity.java

-            name = "integration_context_processInstance_elementId_idx",
-            columnList = "processInstanceId,clientId,executionId",
-            unique = true
+            name = "integration_context_proc_client_exec_idx",


I think it's worth testing how an existing integration context will behave during migration. I think you can test this by making a connector fail in the first attempt, then using replay after migration

erdemedeiros · 2026-01-19T09:36:02Z

...viti/cloud/services/query/rest/assembler/IntegrationContextRepresentationModelAssembler.java

    public EntityModel<CloudIntegrationContext> toModel(IntegrationContextEntity entity) {
-        Link selfRel = linkTo(methodOn(ServiceTaskIntegrationContextAdminController.class).findById(entity.getId()))
+        Link selfRel = linkTo(
+            methodOn(ServiceTaskIntegrationContextAdminController.class).findByServiceTaskId(entity.getId())


Are you sure about this? entity here is IntegrationContextEntity, so getId() will be returning the new id format, if you want to use service task Id you need to build it again using IdBuilderHelper.from(entity) as suggested by Copilot. However, this is not going to be selfRel, as it's not retuning the element itself. So I think either we remove the selfRel link here or we expose a new endpoint to be able to return a single IntegrationContext based on its id (/integration-contexts/{inegrationContextID}) and use this new end point for self link

erdemedeiros · 2026-01-19T09:36:46Z

...ava/org/activiti/cloud/services/query/rest/ServiceTaskIntegrationContextAdminController.java

-            repository,
-            serviceTaskId,
-            "Unable to find integration context entity for the given id:'" + serviceTaskId + "'"
+    public EntityModel<CloudIntegrationContext> findByServiceTaskId(@PathVariable String serviceTaskId) {


Should we deprecated this endpoint?

I agree we should deprecate this endpoint.

erdemedeiros · 2026-01-19T09:40:04Z

...er-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessServiceTasksIT.java

+                assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
+                assertThat(responseEntity.getBody()).isNotNull();
+                assertThat(responseEntity.getBody().getContent())
+                    .hasSize(1)


You can get ride of .hasSize(1) if you use containsExactly instead of contains

erdemedeiros · 2026-01-19T09:41:30Z

...er-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessServiceTasksIT.java

+                );
+                assertThat(cloudIntegrationContext)
+                    .isNotEmpty()
+                    .hasSize(2)


hasSize is redundant. The assertion is already fail if it has a different size because containsExactly is used

erdemedeiros · 2026-01-19T09:41:50Z

...er-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessServiceTasksIT.java

+                );
+                assertThat(cloudIntegrationContext)
+                    .isNotEmpty()
+                    .hasSize(2)


hasSize is redundant

erdemedeiros

LGTM

igdianov

You should update

activiti-cloud/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-events/src/main/java/org/activiti/cloud/services/query/events/handlers/QueryEventHandlerContextOptimizer.java

Line 175 in 34d716b

entityManager

to include IntegrationContextEntity in the optimization logic after service tasks before entityManager.load to avoid performance bottlenecks.

igdianov · 2026-01-19T17:58:53Z

...ces-query-model/src/main/java/org/activiti/cloud/services/query/model/ServiceTaskEntity.java

+    private List<IntegrationContextEntity> integrationContexts;
+
+    @Formula(
+        "(SELECT COUNT(*) FROM INTEGRATION_CONTEXT ic WHERE ic.process_instance_id = process_instance_id AND ic.client_id = element_id AND ic.execution_id = execution_id)"


I think using @Forumula here will cause a performance bottleneck, i.e. N+1 query for each row. This would be solved by incrementing and storing this counter in the completed integration context Query handler.

...ces-query-model/src/main/java/org/activiti/cloud/services/query/model/ServiceTaskEntity.java

igdianov · 2026-01-19T18:03:25Z

...ava/org/activiti/cloud/services/query/rest/ServiceTaskIntegrationContextAdminController.java

-            repository,
-            serviceTaskId,
-            "Unable to find integration context entity for the given id:'" + serviceTaskId + "'"
+    public EntityModel<CloudIntegrationContext> findByServiceTaskId(@PathVariable String serviceTaskId) {


I agree we should deprecate this endpoint.

igdianov · 2026-01-19T18:10:12Z

...y-liquibase/src/main/resources/config/query/liquibase/changelog/34-alter.pg.schema.8.8.0.sql

@@ -0,0 +1,8 @@
+ALTER TABLE integration_context
+  DROP CONSTRAINT integration_context_bpmn_activity_idx;
+


There are going to be running service tasks during the database upgrade window that should be migrated before creating the new index.

…window

igdianov

Great job!

sonarqubecloud · 2026-01-20T20:17:45Z

Quality Gate failed

Failed conditions
51.1% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

aonych added 2 commits December 4, 2025 10:40

[AAE-39413] Change liquibase schema

054d279

[AAE-39413] Change relationship from OneToOne to OneToMany

227f4f7

aonych added the preview label Dec 4, 2025

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

04d14c0

alfresco-build added this to the Validating milestone Dec 4, 2025

aonych added 17 commits December 4, 2025 11:00

[AAE-39413] Turn off GHA tests

ebffb67

[AAE-39413] Fix id name

938c0f4

[AAE-39413] Fix id params

31072f0

[AAE-39413] Fix serviceTask id in integration context handler

9dd89d1

[AAE-39413] Fix integrationContextEntity id in integration context ha…

5357c4e

…ndler

[AAE-39413] Test with eager fetch

c52d669

[AAE-39413] Remove JsonIgnore

e5ff8e9

[AAE-39413] Link ServiceTaskEntity using unique constraint

8c244ad

Revert "[AAE-39413] Turn off GHA tests"

d46f7fb

This reverts commit ebffb67.

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

c975831

[AAE-39413] Update swagger-excepted json file

be95e9b

[AAE-39413] Update API from returning one IntegrationContext by servi…

50cce14

…ceTaskId to many

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

465638f

[AAE-39413] Add integrationContextCounter to CloudServiceTask

0c947f8

[AAE-39413] Add backward combability

55dee83

[AAE-39413] Add test for getting all Integration Context scenario

62dad45

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

39831d7

aonych requested a review from Copilot December 15, 2025 11:01

Copilot started reviewing on behalf of aonych December 15, 2025 11:02 View session

Copilot AI reviewed Dec 15, 2025

View reviewed changes

aonych added 2 commits January 12, 2026 13:11

[AAE-39413] Resolve conflicts

3cac88b

aonych and others added 2 commits January 12, 2026 13:59

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

1d8cac2

[AAE-39413] Update acceptance-test

1bd9f83

[AAE-39413] Refactor IT tests (given-when-then blocks)

cd6dc73

aonych requested a review from dsibilio January 14, 2026 12:44

dsibilio approved these changes Jan 14, 2026

View reviewed changes

erdemedeiros reviewed Jan 19, 2026

View reviewed changes

aonych and others added 3 commits January 19, 2026 14:27

[AAE-39413] Address PR comments

acee33c

[AAE-39413] Update licence header

bc445a6

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

b19c28c

erdemedeiros approved these changes Jan 19, 2026

View reviewed changes

aonych enabled auto-merge (squash) January 19, 2026 13:55

[AAE-39413] Update swagger-expected.json

26f7a37

aonych disabled auto-merge January 19, 2026 16:03

aonych enabled auto-merge (squash) January 19, 2026 16:03

igdianov requested changes Jan 19, 2026

View reviewed changes

aonych disabled auto-merge January 20, 2026 07:14

aonych and others added 7 commits January 20, 2026 10:30

[AAE-39413] Update optimization logic

47120d5

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

544f572

[AAE-39413] Update optimization logic - fix

c5baed8

Merge branch 'develop' into feature/AAE-39413-service-task-in-loops

4bcc587

[AAE-39413] Handle running service tasks during the database upgrade …

21c51c3

…window

[AAE-39413] Revert - purge orphaned integration_context records

4cf1496

[AAE-39413] Add IT tests

f39a526

aonych requested a review from igdianov January 20, 2026 17:47

aonych added 3 commits January 20, 2026 20:16

[AAE-39413] Fix fetching integration context

6442e6f

[AAE-39413] Update swagger json

ebbe41a

[AAE-39413] Remove formula from ServiceTaskEntity

5d68cc0

igdianov approved these changes Jan 20, 2026

View reviewed changes

aonych enabled auto-merge (squash) January 20, 2026 19:49

aonych merged commit 495ca77 into develop Jan 20, 2026
18 of 19 checks passed

aonych deleted the feature/AAE-39413-service-task-in-loops branch January 20, 2026 20:58

		@@ -0,0 +1,8 @@
		ALTER TABLE integration_context
		DROP CONSTRAINT integration_context_bpmn_activity_idx;

AAE-39413 Change relationship of IntegrationContextEntity and ServiceTaskEntity #2047

AAE-39413 Change relationship of IntegrationContextEntity and ServiceTaskEntity #2047

Conversation

aonych commented Dec 4, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CLAassistant commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

erdemedeiros left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

erdemedeiros left a comment

Choose a reason for hiding this comment

Uh oh!

igdianov left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

igdianov left a comment

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jan 20, 2026

Quality Gate failed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

CLAassistant commented Jan 12, 2026 •

edited

Loading