added multiple query properties

added query parameter for case, processes, tasks, plan items and the historic variants

changes according to comments

fixed testcases

Author: WelschChristopher

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricCaseInstanceQuery.java

@@ -250,6 +250,11 @@ public interface HistoricCaseInstanceQuery extends Query<HistoricCaseInstanceQue
      * Only select historic case instances that have the provided callback identifier.
      */
     HistoricCaseInstanceQuery caseInstanceCallbackId(String callbackId);
+
+    /**
+     * Only select historic case instances that have the provided callback identifiers.
+     */
+    HistoricCaseInstanceQuery caseInstanceCallbackIds(Set<String> callbackId);
 
     /**
      * Only select historic case instances that have the provided callback type.

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/history/HistoricPlanItemInstanceQuery.java

@@ -15,6 +15,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.flowable.common.engine.api.query.Query;
 
@@ -30,6 +31,8 @@ public interface HistoricPlanItemInstanceQuery extends Query<HistoricPlanItemIns
     HistoricPlanItemInstanceQuery planItemInstanceCaseDefinitionId(String caseDefinitionId);
     HistoricPlanItemInstanceQuery planItemInstanceDerivedCaseDefinitionId(String derivedCaseDefinitionId);
     HistoricPlanItemInstanceQuery planItemInstanceCaseInstanceId(String caseInstanceId);
+
+    HistoricPlanItemInstanceQuery planItemInstanceCaseInstanceIds(Set<String> caseInstanceIds);
     HistoricPlanItemInstanceQuery planItemInstanceStageInstanceId(String stageInstanceId);
     HistoricPlanItemInstanceQuery planItemInstanceElementId(String elementId);
     HistoricPlanItemInstanceQuery planItemInstanceDefinitionId(String planItemDefinitionId);

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/runtime/CaseInstanceQuery.java

@@ -60,6 +60,7 @@ public interface CaseInstanceQuery extends Query<CaseInstanceQuery, CaseInstance
     CaseInstanceQuery caseInstanceLastReactivatedAfter(Date afterTime);
     CaseInstanceQuery caseInstanceLastReactivatedBy(String userId);
     CaseInstanceQuery caseInstanceCallbackId(String callbackId);
+    CaseInstanceQuery caseInstanceCallbackIds(Set<String> callbackIds);
     CaseInstanceQuery caseInstanceCallbackType(String callbackType);
     CaseInstanceQuery caseInstanceReferenceId(String referenceId);
     CaseInstanceQuery caseInstanceReferenceType(String referenceType);

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/runtime/PlanItemInstanceQuery.java

@@ -16,6 +16,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.flowable.common.engine.api.query.Query;
 
@@ -37,6 +38,7 @@ public interface PlanItemInstanceQuery extends Query<PlanItemInstanceQuery, Plan
     PlanItemInstanceQuery caseDefinitionId(String caseDefinitionId);
     PlanItemInstanceQuery derivedCaseDefinitionId(String derivedCaseDefinitionId);
     PlanItemInstanceQuery caseInstanceId(String caseInstanceId);
+    PlanItemInstanceQuery caseInstanceIds(Set<String> caseInstanceIds);
 
     PlanItemInstanceQuery stageInstanceId(String stageInstanceId);
 

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/BatchDeleteCaseConfig.java

@@ -240,6 +240,8 @@ protected static void populateQuery(JsonNode queryNode, HistoricCaseInstanceQuer
                     break;
                 case "callbackId":
                     query.caseInstanceCallbackId(value.textValue());
+                case "callbackIds":
+                    query.caseInstanceCallbackIds(asStringSet(value));
                     break;
                 case "callbackType":
                     query.caseInstanceCallbackType(value.textValue());

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/DeleteHistoricCaseInstancesUsingBatchesCmd.java

@@ -222,6 +222,7 @@ protected void populateQueryNode(ObjectNode queryNode, HistoricCaseInstanceQuery
         putIfNotNull(queryNode, "lastReactivatedAfter", query.getLastReactivatedAfter());
         putIfNotNull(queryNode, "lastReactivatedBy", query.getLastReactivatedBy());
         putIfNotNull(queryNode, "callbackId", query.getCallbackId());
+        putIfNotNullOrEmpty(queryNode, "callbackIds", query.getCallbackIds());
         putIfNotNull(queryNode, "callbackType", query.getCallbackType());
         putIfTrue(queryNode, "withoutCallbackId", query.isWithoutCallbackId());
         putIfNotNull(queryNode, "referenceId", query.getReferenceId());

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/HistoricCaseInstanceQueryImpl.java

@@ -118,6 +118,7 @@ public class HistoricCaseInstanceQueryImpl extends AbstractVariableQueryImpl<His
     protected boolean withLocalizationFallback;
     protected boolean withoutSorting;
     protected boolean returnIdsOnly;
+    protected Set<String> callbackIds;
 
     public HistoricCaseInstanceQueryImpl() {
     }
@@ -687,6 +688,19 @@ public HistoricCaseInstanceQuery caseInstanceCallbackId(String callbackId) {
         }
         return this;
     }
+
+    @Override
+    public HistoricCaseInstanceQuery caseInstanceCallbackIds(Set<String> callbackIds) {
+        if (callbackIds == null || callbackIds.isEmpty()) {
+            throw new FlowableIllegalArgumentException("callbackIds is null or empty");
+        }
+        if (inOrStatement) {
+            this.currentOrQueryObject.callbackIds = callbackIds;
+        } else {
+            this.callbackIds = callbackIds;
+        }
+        return this;
+    }
 
     @Override
     public HistoricCaseInstanceQuery caseInstanceCallbackType(String callbackType) {
@@ -1370,6 +1384,10 @@ public String getCallbackId() {
         return callbackId;
     }
 
+    public Set<String> getCallbackIds() {
+        return callbackIds;
+    }
+
     public String getCallbackType() {
         return callbackType;
     }

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/HistoricPlanItemInstanceQueryImpl.java

@@ -15,6 +15,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.flowable.cmmn.api.history.HistoricPlanItemInstance;
 import org.flowable.cmmn.api.history.HistoricPlanItemInstanceQuery;
@@ -41,6 +42,8 @@ public class HistoricPlanItemInstanceQueryImpl extends AbstractQuery<HistoricPla
     protected String caseDefinitionId;
     protected String derivedCaseDefinitionId;
     protected String caseInstanceId;
+    protected Set<String> caseInstanceIds;
+    private List<List<String>> safeCaseInstanceIds;
     protected String stageInstanceId;
     protected String elementId;
     protected String planItemDefinitionId;
@@ -136,6 +139,18 @@ public HistoricPlanItemInstanceQuery planItemInstanceCaseInstanceId(String caseI
         return this;
     }
 
+    @Override
+    public HistoricPlanItemInstanceQuery planItemInstanceCaseInstanceIds(Set<String> caseInstanceIds) {
+        if (caseInstanceIds == null) {
+            throw new FlowableIllegalArgumentException("Set of case instance ids is null");
+        }
+        if (caseInstanceIds.isEmpty()) {
+            throw new FlowableIllegalArgumentException("Set of case instance ids is empty");
+        }
+        this.caseInstanceIds = caseInstanceIds;
+        return this;
+    }
+
     @Override
     public HistoricPlanItemInstanceQuery planItemInstanceStageInstanceId(String stageInstanceId) {
         this.stageInstanceId = stageInstanceId;
@@ -720,4 +735,16 @@ public List<List<String>> getSafeInvolvedGroups() {
     public void setSafeInvolvedGroups(List<List<String>> safeInvolvedGroups) {
         this.safeInvolvedGroups = safeInvolvedGroups;
     }
+
+    public List<List<String>> getSafeCaseInstanceIds() {
+        return safeCaseInstanceIds;
+    }
+
+    public void setSafeCaseInstanceIds(List<List<String>> safeProcessInstanceIds) {
+        this.safeCaseInstanceIds = safeProcessInstanceIds;
+    }
+
+    public Collection<String> getCaseInstanceIds() {
+        return caseInstanceIds;
+    }
 }

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisHistoricPlanItemInstanceDataManager.java

@@ -103,5 +103,9 @@ protected void setSafeInValueLists(HistoricPlanItemInstanceQueryImpl planItemIns
         if (planItemInstanceQuery.getInvolvedGroups() != null) {
             planItemInstanceQuery.setSafeInvolvedGroups(createSafeInValuesList(planItemInstanceQuery.getInvolvedGroups()));
         }
+        if(planItemInstanceQuery.getCaseInstanceIds() != null) {
+            planItemInstanceQuery.setSafeCaseInstanceIds(createSafeInValuesList(planItemInstanceQuery.getCaseInstanceIds()));
+        }
+
     }
 }

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisPlanItemInstanceDataManagerImpl.java

@@ -196,6 +196,9 @@ protected void setSafeInValueLists(PlanItemInstanceQueryImpl planItemInstanceQue
         if (planItemInstanceQuery.getInvolvedGroups() != null) {
             planItemInstanceQuery.setSafeInvolvedGroups(createSafeInValuesList(planItemInstanceQuery.getInvolvedGroups()));
         }
+        if(planItemInstanceQuery.getCaseInstanceIds() != null) {
+            planItemInstanceQuery.setSafeCaseInstanceIds(createSafeInValuesList(planItemInstanceQuery.getCaseInstanceIds()));
+        }
 
         if (planItemInstanceQuery.getOrQueryObjects() != null && !planItemInstanceQuery.getOrQueryObjects().isEmpty()) {
             for (PlanItemInstanceQueryImpl oInstanceQuery : planItemInstanceQuery.getOrQueryObjects()) {