Add .listIdsPage() to support fetching ids in pages only

amporsim · Dec 4, 2023 · 784ce8a · 784ce8a
1 parent 949fbbb
commit 784ce8a
Show file tree

Hide file tree

Showing 36 changed files with 295 additions and 18 deletions.
diff --git a/...-engine/src/test/java/org/flowable/app/engine/test/repository/AppDefinitionQueryTest.java b/...-engine/src/test/java/org/flowable/app/engine/test/repository/AppDefinitionQueryTest.java
@@ -90,25 +90,30 @@ public void testQueryNoParams() {
     public void testQueryByDeploymentId() {
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId1).list()).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId1).listIds()).hasSize(1);
+        assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId1).listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId1).count()).isEqualTo(1);
 
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId2).list()).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId2).listIds()).hasSize(1);
+        assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId2).listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId2).count()).isEqualTo(1);
 
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId3).list()).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId3).listIds()).hasSize(1);
+        assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId3).listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId3).count()).isEqualTo(1);
 
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId4).list()).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId4).listIds()).hasSize(1);
+        assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId4).listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId(deploymentId4).count()).isEqualTo(1);
     }
 
     @Test
     public void testQueryByInvalidDeploymentId() {
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId("invalid").list()).isEmpty();
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId("invalid").listIds()).isEmpty();
+        assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId("invalid").listIdsPage(0, 10)).isEmpty();
         assertThat(appRepositoryService.createAppDefinitionQuery().deploymentId("invalid").count()).isZero();
     }
 
@@ -228,10 +233,12 @@ public void testQueryByAppDefinitionCategoryNotEquals() {
     public void testQueryByAppDefinitionName() {
         assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Test app").list()).hasSize(3);
         assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Test app").listIds()).hasSize(3);
+        assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Test app").listIdsPage(0, 10)).hasSize(3);
         assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Test app").count()).isEqualTo(3);
 
         assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Full info app").list()).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Full info app").listIds()).hasSize(1);
+        assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Full info app").listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Full info app").count()).isEqualTo(1);
 
         assertThat(appRepositoryService.createAppDefinitionQuery().appDefinitionName("Full info app").singleResult().getDeploymentId())

diff --git a/...app-engine/src/test/java/org/flowable/app/engine/test/repository/DeploymentQueryTest.java b/...app-engine/src/test/java/org/flowable/app/engine/test/repository/DeploymentQueryTest.java
@@ -60,14 +60,17 @@ public void deleteTestDeployments() {
     public void testQueryNoParams() {
         assertThat(appRepositoryService.createDeploymentQuery().list()).hasSize(2);
         assertThat(appRepositoryService.createDeploymentQuery().listIds()).hasSize(2);
+        assertThat(appRepositoryService.createDeploymentQuery().listIdsPage(0, 10)).hasSize(2);
         assertThat(appRepositoryService.createDeploymentQuery().count()).isEqualTo(2);
 
         assertThat(appRepositoryService.createDeploymentQuery().list())
-            .extracting(AppDeployment::getId)
-            .containsExactlyInAnyOrder(deploymentId1, deploymentId2);
+                .extracting(AppDeployment::getId)
+                .containsExactlyInAnyOrder(deploymentId1, deploymentId2);
 
         assertThat(appRepositoryService.createDeploymentQuery().listIds())
                 .containsExactlyInAnyOrder(deploymentId1, deploymentId2);
+        assertThat(appRepositoryService.createDeploymentQuery().listIdsPage(0, 10))
+                .containsExactlyInAnyOrder(deploymentId1, deploymentId2);
     }
 
     @Test
@@ -76,11 +79,13 @@ public void testQueryByDeploymentId() {
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId1).singleResult().getId()).isEqualTo(deploymentId1);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId1).list()).hasSize(1);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId1).listIds()).hasSize(1);
+        assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId1).listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId1).count()).isEqualTo(1);
 
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId2).singleResult()).isNotNull();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId2).list()).hasSize(1);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId2).listIds()).hasSize(1);
+        assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId2).listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId2).count()).isEqualTo(1);
     }
 
@@ -89,13 +94,16 @@ public void testQueryByInvalidDeploymentId() {
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId("invalid").singleResult()).isNull();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId("invalid").list()).isEmpty();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId("invalid").listIds()).isEmpty();
+        assertThat(appRepositoryService.createDeploymentQuery().deploymentId("invalid").listIdsPage(0, 10)).isEmpty();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentId("invalid").count()).isZero();
     }
 
     @Test
     public void testQueryByDeploymentIds() {
         assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Arrays.asList(deploymentId1, deploymentId2, "dummy")).list()).hasSize(2);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Arrays.asList(deploymentId1, deploymentId2, "dummy")).listIds()).hasSize(2);
+        assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Arrays.asList(deploymentId1, deploymentId2, "dummy")).listIdsPage(0, 10)).hasSize(
+                2);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Arrays.asList(deploymentId2, "dummy")).singleResult()).isNotNull();
     }
 
@@ -104,6 +112,7 @@ public void testQueryByInvalidDeploymentIds() {
         assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Collections.singletonList("invalid")).singleResult()).isNull();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Collections.singletonList("invalid")).list()).isEmpty();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Collections.singletonList("invalid")).listIds()).isEmpty();
+        assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Collections.singletonList("invalid")).listIdsPage(0, 10)).isEmpty();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentIds(Collections.singletonList("invalid")).count()).isZero();
         assertThatThrownBy(() -> appRepositoryService.createDeploymentQuery().deploymentIds(null))
                 .isInstanceOf(FlowableIllegalArgumentException.class)
@@ -131,11 +140,13 @@ public void testQueryByDeploymentNameLike() {
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("test%").singleResult().getId()).isEqualTo(deploymentId2);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("test%").list()).hasSize(1);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("test%").listIds()).hasSize(1);
+        assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("test%").listIdsPage(0, 10)).hasSize(1);
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("test%").count()).isEqualTo(1);
 
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("inval%").singleResult()).isNull();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("inval%").list()).isEmpty();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("inval%").listIds()).isEmpty();
+        assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("inval%").listIdsPage(0, 10)).isEmpty();
         assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("inval%").count()).isZero();
     }
 

diff --git a/...ain/java/org/flowable/cmmn/engine/impl/history/CmmnHistoricVariableInstanceQueryImpl.java b/...ain/java/org/flowable/cmmn/engine/impl/history/CmmnHistoricVariableInstanceQueryImpl.java
@@ -179,4 +179,9 @@ public List<HistoricVariableInstance> listPage(int firstResult, int maxResults)
         return wrappedHistoricVariableInstanceQuery.listPage(firstResult, maxResults);
     }
 
+    @Override
+    public List<String> listIdsPage(int firstResult, int maxResults) {
+        return wrappedHistoricVariableInstanceQuery.listIdsPage(firstResult, maxResults);
+    }
+
 }
diff --git a/...ne/src/main/java/org/flowable/cmmn/engine/impl/runtime/CmmnVariableInstanceQueryImpl.java b/...ne/src/main/java/org/flowable/cmmn/engine/impl/runtime/CmmnVariableInstanceQueryImpl.java
@@ -178,4 +178,9 @@ public List<VariableInstance> listPage(int firstResult, int maxResults) {
         return wrappedVariableInstanceQuery.listPage(firstResult, maxResults);
     }
 
+    @Override
+    public List<String> listIdsPage(int firstResult, int maxResults) {
+        return wrappedVariableInstanceQuery.listIdsPage(firstResult, maxResults);
+    }
+
 }
diff --git a/...ain/java/org/flowable/cmmn/engine/impl/runtime/GenericEventListenerInstanceQueryImpl.java b/...ain/java/org/flowable/cmmn/engine/impl/runtime/GenericEventListenerInstanceQueryImpl.java
@@ -146,6 +146,11 @@ public List<GenericEventListenerInstance> listPage(int firstResult, int maxResul
         return convertPlanItemInstances(innerQuery.listPage(firstResult, maxResults));
     }
 
+    @Override
+    public List<String> listIdsPage(int firstResult, int maxResults) {
+        return innerQuery.listIdsPage(firstResult, maxResults);
+    }
+
     protected List<GenericEventListenerInstance> convertPlanItemInstances(List<PlanItemInstance> instances) {
         if (instances == null) {
             return null;

diff --git a/...main/java/org/flowable/cmmn/engine/impl/runtime/SignalEventListenerInstanceQueryImpl.java b/...main/java/org/flowable/cmmn/engine/impl/runtime/SignalEventListenerInstanceQueryImpl.java
@@ -147,6 +147,11 @@ public List<SignalEventListenerInstance> listPage(int firstResult, int maxResult
         return convertPlanItemInstances(innerQuery.listPage(firstResult, maxResults));
     }
 
+    @Override
+    public List<String> listIdsPage(int firstResult, int maxResults) {
+        return innerQuery.listIdsPage(firstResult, maxResults);
+    }
+
     protected List<SignalEventListenerInstance> convertPlanItemInstances(List<PlanItemInstance> instances) {
         if (instances == null) {
             return null;

diff --git a/...c/main/java/org/flowable/cmmn/engine/impl/runtime/UserEventListenerInstanceQueryImpl.java b/...c/main/java/org/flowable/cmmn/engine/impl/runtime/UserEventListenerInstanceQueryImpl.java
@@ -154,6 +154,11 @@ public List<UserEventListenerInstance> listPage(int firstResult, int maxResults)
         return convertPlanItemInstances(innerQuery.listPage(firstResult, maxResults));
     }
 
+    @Override
+    public List<String> listIdsPage(int firstResult, int maxResults) {
+        return innerQuery.listIdsPage(firstResult, maxResults);
+    }
+
     protected List<UserEventListenerInstance> convertPlanItemInstances(List<PlanItemInstance> instances) {
         if (instances == null) {
             return null;

diff --git a/...ngine/src/test/java/org/flowable/cmmn/test/history/HistoricPlanItemInstanceQueryTest.java b/...ngine/src/test/java/org/flowable/cmmn/test/history/HistoricPlanItemInstanceQueryTest.java
@@ -55,6 +55,7 @@ public void testByCaseDefinitionId() {
         if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().list()).hasSize(20);
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().listIds()).hasSize(20);
+            assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().listIdsPage(0, 100)).hasSize(20);
         }
     }
 
@@ -65,6 +66,8 @@ public void testByCaseInstanceId() {
             if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
                 assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceCaseInstanceId(caseInstanceId).list()).hasSize(4);
                 assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceCaseInstanceId(caseInstanceId).listIds()).hasSize(4);
+                assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceCaseInstanceId(caseInstanceId).listIdsPage(0, 10)).hasSize(
+                        4);
             }
         }
     }
@@ -79,6 +82,8 @@ public void testByStageInstanceId() {
                 .singleResult();
             assertThat(planItemInstance).isNotNull();
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceStageInstanceId(planItemInstance.getId()).listIds()).hasSize(2);
+            assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceStageInstanceId(planItemInstance.getId())
+                    .listIdsPage(0, 10)).hasSize(2);
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceStageInstanceId(planItemInstance.getId()).count()).isEqualTo(2);
         }
     }
@@ -91,6 +96,7 @@ public void testByPlanItemInstanceId() {
             List<HistoricPlanItemInstance> planItemInstances = cmmnHistoryService.createHistoricPlanItemInstanceQuery().list();
             for (HistoricPlanItemInstance planItemInstance : planItemInstances) {
                 assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceId(planItemInstance.getId()).listIds()).hasSize(1);
+                assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceId(planItemInstance.getId()).listIdsPage(0, 10)).hasSize(1);
                 assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceId(planItemInstance.getId()).count()).isEqualTo(1);
             }
         }
@@ -102,6 +108,7 @@ public void testByElementId() {
 
         if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceElementId("planItem3").listIds()).hasSize(4);
+            assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceElementId("planItem3").listIdsPage(0, 10)).hasSize(4);
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceElementId("planItem3").list()).hasSize(4);
         }
     }
@@ -112,6 +119,7 @@ public void testByName() {
 
         if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceName("B").listIds()).hasSize(9);
+            assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceName("B").listIdsPage(0, 10)).hasSize(9);
             assertThat(cmmnHistoryService.createHistoricPlanItemInstanceQuery().planItemInstanceName("B").list()).hasSize(9);
         }
     }

diff --git a/...ble-cmmn-engine/src/test/java/org/flowable/cmmn/test/mgmt/ExternalWorkerJobQueryTest.java b/...ble-cmmn-engine/src/test/java/org/flowable/cmmn/test/mgmt/ExternalWorkerJobQueryTest.java
@@ -54,6 +54,7 @@ public void testQueryByNoCriteria() {
                 .extracting(ExternalWorkerJob::getScopeId)
                 .containsOnly(caseInstance.getId());
         assertThat(query.listIds()).hasSize(2);
+        assertThat(query.listIdsPage(0, 10)).hasSize(2);
     }
 
     @Test
@@ -72,19 +73,22 @@ public void testQueryByCaseInstanceId() {
                 .extracting(ExternalWorkerJob::getScopeId)
                 .containsOnly(caseInstance1.getId());
         assertThat(query.listIds()).hasSize(2);
+        assertThat(query.listIdsPage(0, 10)).hasSize(2);
 
         query = cmmnManagementService.createExternalWorkerJobQuery().caseInstanceId(caseInstance2.getId());
         assertThat(query.count()).isEqualTo(2);
         assertThat(query.list())
                 .extracting(ExternalWorkerJob::getScopeId)
                 .containsOnly(caseInstance2.getId());
         assertThat(query.listIds()).hasSize(2);
+        assertThat(query.listIdsPage(0, 10)).hasSize(2);
 
         query = cmmnManagementService.createExternalWorkerJobQuery().caseInstanceId("invalid");
         assertThat(query.count()).isZero();
         assertThat(query.list()).isEmpty();
         assertThat(query.singleResult()).isNull();
         assertThat(query.listIds()).isEmpty();
+        assertThat(query.listIdsPage(0, 10)).isEmpty();
     }
 
     @Test
@@ -106,6 +110,7 @@ public void testQueryByCaseDefinitionId() {
         assertThat(query.count()).isZero();
         assertThat(query.list()).isEmpty();
         assertThat(query.listIds()).isEmpty();
+        assertThat(query.listIdsPage(0, 10)).isEmpty();
         assertThat(query.singleResult()).isNull();
     }