From cc6ca4855bac701e430c1f831ffbce6bf1f2a1a5 Mon Sep 17 00:00:00 2001 From: Tijs Rademakers Date: Tue, 5 Dec 2023 11:08:17 +0100 Subject: [PATCH] Change naming in case instance query requests --- .../HistoricCaseInstanceBaseResource.java | 8 ++--- ...istoricCaseInstanceCollectionResource.java | 4 +-- .../HistoricCaseInstanceQueryRequest.java | 36 +++++++++---------- .../caze/BaseCaseInstanceResource.java | 8 ++--- .../caze/CaseInstanceCollectionResource.java | 4 +-- .../caze/CaseInstanceQueryRequest.java | 36 +++++++++---------- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceBaseResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceBaseResource.java index 901d44ceb8e..60f5b37ab23 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceBaseResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceBaseResource.java @@ -101,11 +101,11 @@ protected DataResponse getQueryResponse(HistoricCa if (queryRequest.getCaseInstanceNameLikeIgnoreCase() != null) { query.caseInstanceNameLikeIgnoreCase(queryRequest.getCaseInstanceNameLikeIgnoreCase()); } - if (queryRequest.getRootScopeId() != null) { - query.caseInstanceRootScopeId(queryRequest.getRootScopeId()); + if (queryRequest.getCaseInstanceRootScopeId() != null) { + query.caseInstanceRootScopeId(queryRequest.getCaseInstanceRootScopeId()); } - if (queryRequest.getParentScopeId() != null) { - query.caseInstanceParentScopeId(queryRequest.getParentScopeId()); + if (queryRequest.getCaseInstanceParentScopeId() != null) { + query.caseInstanceParentScopeId(queryRequest.getCaseInstanceParentScopeId()); } if (queryRequest.getCaseInstanceBusinessKey() != null) { query.caseInstanceBusinessKey(queryRequest.getCaseInstanceBusinessKey()); diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java index de8f41fb3ef..c14507b71bb 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java @@ -128,11 +128,11 @@ public DataResponse getHistoricCasenstances(@ApiPa } if (allRequestParams.containsKey("rootScopeId")) { - queryRequest.setRootScopeId(allRequestParams.get("rootScopeId")); + queryRequest.setCaseInstanceRootScopeId(allRequestParams.get("rootScopeId")); } if (allRequestParams.containsKey("parentScopeId")) { - queryRequest.setParentScopeId(allRequestParams.get("parentScopeId")); + queryRequest.setCaseInstanceParentScopeId(allRequestParams.get("parentScopeId")); } if (allRequestParams.get("involvedUser") != null) { diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryRequest.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryRequest.java index 4bb80a2551e..8832e157736 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryRequest.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryRequest.java @@ -39,8 +39,8 @@ public class HistoricCaseInstanceQueryRequest extends PaginateRequest { private String caseInstanceName; private String caseInstanceNameLike; private String caseInstanceNameLikeIgnoreCase; - private String rootScopeId; - private String parentScopeId; + private String caseInstanceRootScopeId; + private String caseInstanceParentScopeId; private String caseInstanceBusinessKey; private String caseInstanceBusinessStatus; private String caseInstanceParentId; @@ -156,6 +156,22 @@ public void setCaseInstanceNameLikeIgnoreCase(String caseInstanceNameLikeIgnoreC this.caseInstanceNameLikeIgnoreCase = caseInstanceNameLikeIgnoreCase; } + public String getCaseInstanceRootScopeId() { + return caseInstanceRootScopeId; + } + + public void setCaseInstanceRootScopeId(String caseInstanceRootScopeId) { + this.caseInstanceRootScopeId = caseInstanceRootScopeId; + } + + public String getCaseInstanceParentScopeId() { + return caseInstanceParentScopeId; + } + + public void setCaseInstanceParentScopeId(String caseInstanceParentScopeId) { + this.caseInstanceParentScopeId = caseInstanceParentScopeId; + } + public String getCaseInstanceBusinessKey() { return caseInstanceBusinessKey; } @@ -364,20 +380,4 @@ public Boolean getWithoutCaseInstanceCallbackId() { public void setWithoutCaseInstanceCallbackId(Boolean withoutCaseInstanceCallbackId) { this.withoutCaseInstanceCallbackId = withoutCaseInstanceCallbackId; } - - public String getRootScopeId() { - return rootScopeId; - } - - public void setRootScopeId(String rootScopeId) { - this.rootScopeId = rootScopeId; - } - - public String getParentScopeId() { - return parentScopeId; - } - - public void setParentScopeId(String parentScopeId) { - this.parentScopeId = parentScopeId; - } } diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/BaseCaseInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/BaseCaseInstanceResource.java index 264ada323f0..aeb05208f10 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/BaseCaseInstanceResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/BaseCaseInstanceResource.java @@ -99,11 +99,11 @@ protected DataResponse getQueryResponse(CaseInstanceQueryR if (queryRequest.getCaseInstanceNameLikeIgnoreCase() != null) { query.caseInstanceNameLikeIgnoreCase(queryRequest.getCaseInstanceNameLikeIgnoreCase()); } - if (queryRequest.getRootScopeId() != null) { - query.caseInstanceRootScopeId(queryRequest.getRootScopeId()); + if (queryRequest.getCaseInstanceRootScopeId() != null) { + query.caseInstanceRootScopeId(queryRequest.getCaseInstanceRootScopeId()); } - if (queryRequest.getParentScopeId() != null) { - query.caseInstanceParentScopeId(queryRequest.getParentScopeId()); + if (queryRequest.getCaseInstanceParentScopeId() != null) { + query.caseInstanceParentScopeId(queryRequest.getCaseInstanceParentScopeId()); } if (queryRequest.getCaseInstanceBusinessKey() != null) { query.caseInstanceBusinessKey(queryRequest.getCaseInstanceBusinessKey()); diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java index 7286b4b8ffe..fddd15935a5 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java @@ -133,11 +133,11 @@ public DataResponse getCaseInstances(@ApiParam(hidden = tr } if (allRequestParams.containsKey("rootScopeId")) { - queryRequest.setRootScopeId(allRequestParams.get("rootScopeId")); + queryRequest.setCaseInstanceRootScopeId(allRequestParams.get("rootScopeId")); } if (allRequestParams.containsKey("parentScopeId")) { - queryRequest.setParentScopeId(allRequestParams.get("parentScopeId")); + queryRequest.setCaseInstanceParentScopeId(allRequestParams.get("parentScopeId")); } if (allRequestParams.containsKey("businessKey")) { diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryRequest.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryRequest.java index 3d766a1e5e4..c988991bcbd 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryRequest.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryRequest.java @@ -38,8 +38,8 @@ public class CaseInstanceQueryRequest extends PaginateRequest { private String caseInstanceName; private String caseInstanceNameLike; private String caseInstanceNameLikeIgnoreCase; - private String rootScopeId; - private String parentScopeId; + private String caseInstanceRootScopeId; + private String caseInstanceParentScopeId; private String caseInstanceBusinessKey; private String caseInstanceBusinessStatus; private String caseInstanceParentId; @@ -143,6 +143,22 @@ public void setCaseInstanceNameLikeIgnoreCase(String caseInstanceNameLikeIgnoreC this.caseInstanceNameLikeIgnoreCase = caseInstanceNameLikeIgnoreCase; } + public String getCaseInstanceRootScopeId() { + return caseInstanceRootScopeId; + } + + public void setCaseInstanceRootScopeId(String caseInstanceRootScopeId) { + this.caseInstanceRootScopeId = caseInstanceRootScopeId; + } + + public String getCaseInstanceParentScopeId() { + return caseInstanceParentScopeId; + } + + public void setCaseInstanceParentScopeId(String caseInstanceParentScopeId) { + this.caseInstanceParentScopeId = caseInstanceParentScopeId; + } + public String getCaseInstanceBusinessKey() { return caseInstanceBusinessKey; } @@ -319,20 +335,4 @@ public String getTenantIdLike() { public void setTenantIdLike(String tenantIdLike) { this.tenantIdLike = tenantIdLike; } - - public String getRootScopeId() { - return rootScopeId; - } - - public void setRootScopeId(String rootScopeId) { - this.rootScopeId = rootScopeId; - } - - public String getParentScopeId() { - return parentScopeId; - } - - public void setParentScopeId(String parentScopeId) { - this.parentScopeId = parentScopeId; - } }