Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/query list ids #3797

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public interface AppDefinitionEntityManager extends EntityManager<AppDefinitionE

List<AppDefinition> findAppDefinitionsByQueryCriteria(AppDefinitionQuery appDefinitionQuery);

List<String> findAppDefinitionIdsByQueryCriteria(AppDefinitionQuery appDefinitionQuery);

long findAppDefinitionCountByQueryCriteria(AppDefinitionQuery appDefinitionQuery);

}
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ public List<AppDefinition> findAppDefinitionsByQueryCriteria(AppDefinitionQuery
return dataManager.findAppDefinitionsByQueryCriteria((AppDefinitionQueryImpl) appDefinitionQuery);
}

@Override
public List<String> findAppDefinitionIdsByQueryCriteria(AppDefinitionQuery appDefinitionQuery) {
return dataManager.findAppDefinitionIdsByQueryCriteria((AppDefinitionQueryImpl) appDefinitionQuery);
}

@Override
public long findAppDefinitionCountByQueryCriteria(AppDefinitionQuery appDefinitionQuery) {
return dataManager.findAppDefinitionCountByQueryCriteria((AppDefinitionQueryImpl) appDefinitionQuery);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public interface AppDeploymentEntityManager extends EntityManager<AppDeploymentE
AppDeploymentQuery createDeploymentQuery();

List<AppDeployment> findDeploymentsByQueryCriteria(AppDeploymentQuery deploymentQuery);

List<String> findDeploymentIdsByQueryCriteria(AppDeploymentQuery deploymentQuery);

long findDeploymentCountByQueryCriteria(AppDeploymentQuery deploymentQuery);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ public AppDeploymentQuery createDeploymentQuery() {
public List<AppDeployment> findDeploymentsByQueryCriteria(AppDeploymentQuery deploymentQuery) {
return dataManager.findDeploymentsByQueryCriteria((AppDeploymentQueryImpl) deploymentQuery);
}

@Override
public List<String> findDeploymentIdsByQueryCriteria(AppDeploymentQuery deploymentQuery) {
return dataManager.findDeploymentIdsByQueryCriteria((AppDeploymentQueryImpl) deploymentQuery);
}

@Override
public long findDeploymentCountByQueryCriteria(AppDeploymentQuery deploymentQuery) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public interface AppDefinitionDataManager extends DataManager<AppDefinitionEntit

List<AppDefinition> findAppDefinitionsByQueryCriteria(AppDefinitionQueryImpl appDefinitionQuery);

List<String> findAppDefinitionIdsByQueryCriteria(AppDefinitionQueryImpl appDefinitionQuery);

long findAppDefinitionCountByQueryCriteria(AppDefinitionQueryImpl appDefinitionQuery);

}
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ public interface AppDeploymentDataManager extends DataManager<AppDeploymentEntit

List<AppDeployment> findDeploymentsByQueryCriteria(AppDeploymentQueryImpl deploymentQuery);

List<String> findDeploymentIdsByQueryCriteria(AppDeploymentQueryImpl deploymentQuery);

}
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ public List<AppDefinition> findAppDefinitionsByQueryCriteria(AppDefinitionQueryI
return getDbSqlSession().selectList("selectAppDefinitionsByQueryCriteria", appDefinitionQuery);
}

@Override
@SuppressWarnings("unchecked")
public List<String> findAppDefinitionIdsByQueryCriteria(AppDefinitionQueryImpl appDefinitionQuery) {
return getDbSqlSession().selectList("selectAppDefinitionIdsByQueryCriteria", appDefinitionQuery);
}

@Override
public long findAppDefinitionCountByQueryCriteria(AppDefinitionQueryImpl appDefinitionQuery) {
return (Long) getDbSqlSession().selectOne("selectAppDefinitionCountByQueryCriteria", appDefinitionQuery);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ public List<String> getDeploymentResourceNames(String deploymentId) {
public List<AppDeployment> findDeploymentsByQueryCriteria(AppDeploymentQueryImpl deploymentQuery) {
return getDbSqlSession().selectList("selectAppDeploymentsByQueryCriteria", deploymentQuery);
}


@Override
public List<String> findDeploymentIdsByQueryCriteria(AppDeploymentQueryImpl deploymentQuery) {
return getDbSqlSession().selectList("selectAppDeploymentIdsByQueryCriteria", deploymentQuery);
}

@Override
public long findDeploymentCountByQueryCriteria(AppDeploymentQueryImpl deploymentQuery) {
return (Long) getDbSqlSession().selectOne("selectAppDeploymentCountByQueryCriteria", deploymentQuery);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,11 @@ public List<AppDefinition> executeList(CommandContext commandContext) {
return CommandContextUtil.getAppDefinitionEntityManager(commandContext).findAppDefinitionsByQueryCriteria(this);
}

@Override
public List<String> executeListIds(CommandContext commandContext) {
return CommandContextUtil.getAppDefinitionEntityManager(commandContext).findAppDefinitionIdsByQueryCriteria(this);
}

// getters ////////////////////////////////////////////

public String getDeploymentId() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ public List<AppDeployment> executeList(CommandContext commandContext) {
return CommandContextUtil.getAppDeploymentEntityManager(commandContext).findDeploymentsByQueryCriteria(this);
}

@Override
public List<String> executeListIds(CommandContext commandContext) {
return CommandContextUtil.getAppDeploymentEntityManager(commandContext).findDeploymentIdsByQueryCriteria(this);
}

// getters ////////////////////////////////////////////////////////

public String getDeploymentId() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@
<if test="needsPaging">${limitAfter}</if>
</select>

<select id="selectAppDefinitionIdsByQueryCriteria" parameterType="org.flowable.app.engine.impl.repository.AppDefinitionQueryImpl" resultType="string">
<if test="needsPaging">${limitBefore}</if>
SELECT RES.ID_ <if test="needsPaging">${limitBetween}</if>
<include refid="selectAppDefinitionsByQueryCriteriaSql"/>
${orderBy}
<if test="needsPaging">${limitAfter}</if>
</select>

<select id="selectAppDefinitionCountByQueryCriteria" parameterType="org.flowable.app.engine.impl.repository.AppDefinitionQueryImpl" resultType="long">
select count(RES.ID_)
<include refid="selectAppDefinitionsByQueryCriteriaSql"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@
<if test="needsPaging">${limitAfter}</if>
</select>

<select id="selectAppDeploymentIdsByQueryCriteria" parameterType="org.flowable.app.engine.impl.repository.AppDeploymentQueryImpl" resultType="string">
<if test="needsPaging">${limitBefore}</if>
SELECT RES.ID_ <if test="needsPaging">${limitBetween}</if>
<include refid="selectAppDeploymentsByQueryCriteriaSql"/>
${orderBy}
<if test="needsPaging">${limitAfter}</if>
</select>

<select id="selectAppDeploymentCountByQueryCriteria" parameterType="org.flowable.app.engine.impl.repository.AppDeploymentQueryImpl" resultType="long">
select count(RES.ID_)
<include refid="selectAppDeploymentsByQueryCriteriaSql"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,31 @@ public void testQueryNoParams() {
@Test
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();
}

Expand Down Expand Up @@ -222,9 +232,13 @@ public void testQueryByAppDefinitionCategoryNotEquals() {
@Test
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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,42 +59,60 @@ public void deleteTestDeployments() {
@Test
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
public void testQueryByDeploymentId() {
assertThat(appRepositoryService.createDeploymentQuery().deploymentId(deploymentId1).singleResult()).isNotNull();
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);
}

@Test
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();
}

@Test
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)
Expand All @@ -121,10 +139,14 @@ public void testQueryByDeploymentNameLike() {
assertThat(appRepositoryService.createDeploymentQuery().deploymentNameLike("test%").singleResult()).isNotNull();
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();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public List<BatchPart> executeList(CommandContext commandContext) {
return batchServiceConfiguration.getBatchPartEntityManager().findBatchPartsByQueryCriteria(this);
}

@Override
public List<String> executeListIds(CommandContext commandContext) {
return batchServiceConfiguration.getBatchPartEntityManager().findBatchPartIdsByQueryCriteria(this);
}

@Override
public BatchPartQuery id(String id) {
if (id == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ public List<Batch> executeList(CommandContext commandContext) {
return batchServiceConfiguration.getBatchEntityManager().findBatchesByQueryCriteria(this);
}

@Override
public List<String> executeListIds(CommandContext commandContext) {
return batchServiceConfiguration.getBatchEntityManager().findBatchIdsByQueryCriteria(this);
}

@Override
public void delete() {
if (commandExecutor != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public interface BatchEntityManager extends EntityManager<BatchEntity> {
List<Batch> findAllBatches();

List<Batch> findBatchesByQueryCriteria(BatchQueryImpl batchQuery);

List<String> findBatchIdsByQueryCriteria(BatchQueryImpl batchQuery);

long findBatchCountByQueryCriteria(BatchQueryImpl batchQuery);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ public List<Batch> findBatchesByQueryCriteria(BatchQueryImpl batchQuery) {
return dataManager.findBatchesByQueryCriteria(batchQuery);
}

@Override
public List<String> findBatchIdsByQueryCriteria(BatchQueryImpl batchQuery) {
return dataManager.findBatchIdsByQueryCriteria(batchQuery);
}

@Override
public long findBatchCountByQueryCriteria(BatchQueryImpl batchQuery) {
return dataManager.findBatchCountByQueryCriteria(batchQuery);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public interface BatchPartEntityManager extends EntityManager<BatchPartEntity> {

List<BatchPart> findBatchPartsByQueryCriteria(BatchPartQuery batchPartQuery);

List<String> findBatchPartIdsByQueryCriteria(BatchPartQuery batchPartQuery);

long findBatchPartCountByQueryCriteria(BatchPartQuery batchPartQuery);

BatchPartEntity createBatchPart(BatchEntity parentBatch, String status, String scopeId, String subScopeId, String scopeType);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ public List<BatchPart> findBatchPartsByQueryCriteria(BatchPartQuery batchPartQue
return dataManager.findBatchPartsByQueryCriteria((BatchPartQueryImpl) batchPartQuery);
}

@Override
public List<String> findBatchPartIdsByQueryCriteria(BatchPartQuery batchPartQuery) {
return dataManager.findBatchPartIdsByQueryCriteria((BatchPartQueryImpl) batchPartQuery);
}

@Override
public long findBatchPartCountByQueryCriteria(BatchPartQuery batchPartQuery) {
return dataManager.findBatchPartCountByQueryCriteria((BatchPartQueryImpl) batchPartQuery);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public interface BatchDataManager extends DataManager<BatchEntity> {
List<Batch> findAllBatches();

List<Batch> findBatchesByQueryCriteria(BatchQueryImpl batchQuery);

List<String> findBatchIdsByQueryCriteria(BatchQueryImpl batchQuery);

long findBatchCountByQueryCriteria(BatchQueryImpl batchQuery);

Expand Down
Loading