added multiple query properties

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

Author: WelschChristopher

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

@@ -250,7 +250,14 @@ 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,7 +15,9 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
+import org.flowable.cmmn.api.runtime.PlanItemInstanceQuery;
 import org.flowable.common.engine.api.query.Query;
 
 /**
@@ -30,6 +32,7 @@ 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/history/HistoricCaseInstanceQueryImpl.java

@@ -44,7 +44,7 @@
  * @author Joram Barrez
  * @author Tijs Rademakers
  */
-public class HistoricCaseInstanceQueryImpl extends AbstractVariableQueryImpl<HistoricCaseInstanceQuery, HistoricCaseInstance> 
+public class HistoricCaseInstanceQueryImpl extends AbstractVariableQueryImpl<HistoricCaseInstanceQuery, HistoricCaseInstance>
         implements HistoricCaseInstanceQuery, CacheAwareQuery<HistoricCaseInstanceEntity> {
 
     private static final long serialVersionUID = 1L;
@@ -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() {
     }
@@ -470,7 +471,7 @@ public HistoricCaseInstanceQueryImpl caseDefinitionKeys(Set<String> caseDefiniti
         }
         return this;
     }
-    
+
     @Override
     public HistoricCaseInstanceQueryImpl excludeCaseDefinitionKeys(Set<String> excludeCaseDefinitionKeys) {
         if (excludeCaseDefinitionKeys == null) {
@@ -687,7 +688,20 @@ 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) {
         if (callbackType == null) {
@@ -841,15 +855,15 @@ public long executeCount(CommandContext commandContext) {
     @Override
     public List<HistoricCaseInstance> executeList(CommandContext commandContext) {
         ensureVariablesInitialized();
-        
+
         if (withoutSorting) {
             setIgnoreOrderBy();
         }
-        
+
         List<HistoricCaseInstance> results;
         if (returnIdsOnly) {
             results = cmmnEngineConfiguration.getHistoricCaseInstanceEntityManager().findIdsByCriteria(this);
-            
+
         } else if (includeCaseVariables) {
             results = cmmnEngineConfiguration.getHistoricCaseInstanceEntityManager().findWithVariablesByQueryCriteria(this);
 
@@ -1200,13 +1214,13 @@ public HistoricCaseInstanceQuery withLocalizationFallback() {
         this.withLocalizationFallback = true;
         return this;
     }
-    
+
     @Override
     public HistoricCaseInstanceQuery withoutSorting() {
         this.withoutSorting = true;
         return this;
     }
-    
+
     @Override
     public HistoricCaseInstanceQuery returnIdsOnly() {
         this.returnIdsOnly = true;
@@ -1232,7 +1246,7 @@ public String getCaseDefinitionKeyLikeIgnoreCase() {
     public Set<String> getCaseDefinitionKeys() {
         return caseDefinitionKeys;
     }
-    
+
     public Set<String> getExcludeCaseDefinitionKeys() {
         return excludeCaseDefinitionKeys;
     }
@@ -1370,6 +1384,10 @@ public String getCallbackId() {
         return callbackId;
     }
 
+    public Set<String> getCallbackIds() {
+        return callbackIds;
+    }
+
     public String getCallbackType() {
         return callbackType;
     }