Change naming in case instance query requests

dbmalkovsky · Dec 5, 2023 · cc6ca48 · cc6ca48
1 parent ac71d57
commit cc6ca48
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 48 deletions.
diff --git a/...ava/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceBaseResource.java b/...ava/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceBaseResource.java
@@ -101,11 +101,11 @@ protected DataResponse<HistoricCaseInstanceResponse> 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/...g/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java b/...g/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java
@@ -128,11 +128,11 @@ public DataResponse<HistoricCaseInstanceResponse> 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/...ava/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryRequest.java b/...ava/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/...c/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/BaseCaseInstanceResource.java b/...c/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/BaseCaseInstanceResource.java
@@ -99,11 +99,11 @@ protected DataResponse<CaseInstanceResponse> 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/.../java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java b/.../java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java
@@ -133,11 +133,11 @@ public DataResponse<CaseInstanceResponse> 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/...c/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryRequest.java b/...c/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;
-    }
 }