Cmmn: remove cmmn specific task queries and consolidate methods in task-service

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/engine/CmmnHistoryService.java

@@ -14,8 +14,8 @@ package org.flowable.cmmn.engine;
 
 import org.flowable.cmmn.engine.history.HistoricCaseInstanceQuery;
 import org.flowable.cmmn.engine.history.HistoricMilestoneInstanceQuery;
-import org.flowable.cmmn.engine.history.HistoricTaskInstanceQuery;
 import org.flowable.cmmn.engine.history.HistoricVariableInstanceQuery;
+import org.flowable.task.service.history.HistoricTaskInstanceQuery;
 
 /**
  * @author Joram Barrez

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/engine/CmmnTaskService.java

@@ -14,7 +14,7 @@ package org.flowable.cmmn.engine;
 
 import java.util.Map;
 
-import org.flowable.cmmn.engine.task.TaskQuery;
+import org.flowable.task.service.TaskQuery;
 
 /**
  * @author Joram Barrez

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

-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.cmmn.engine.history;
-
-import java.util.Date;
-
-import org.flowable.task.service.TaskInfoQuery;
-import org.flowable.task.service.history.HistoricTaskInstance;
-
-/**
- * @author Joram Barrez
- */
-public interface HistoricTaskInstanceQuery extends TaskInfoQuery<HistoricTaskInstanceQuery, HistoricTaskInstance> {
-    
-    HistoricTaskInstanceQuery caseInstanceId(String caseInstanceId);
-    
-    HistoricTaskInstanceQuery caseDefinitionId(String caseDefinitionId);
-    
-    HistoricTaskInstanceQuery planItemInstanceId(String planItemInstanceId);
-    
-    HistoricTaskInstanceQuery taskDeleteReason(String taskDeleteReason);
-
-    HistoricTaskInstanceQuery taskDeleteReasonLike(String taskDeleteReasonLike);
-
-    HistoricTaskInstanceQuery finished();
-
-    HistoricTaskInstanceQuery unfinished();
-
-    HistoricTaskInstanceQuery taskParentTaskId(String parentTaskId);
-
-    HistoricTaskInstanceQuery taskCompletedOn(Date endDate);
-
-    HistoricTaskInstanceQuery taskCompletedBefore(Date endDate);
-
-    HistoricTaskInstanceQuery taskCompletedAfter(Date endDate);
-
-    HistoricTaskInstanceQuery orderByHistoricTaskInstanceDuration();
-    HistoricTaskInstanceQuery orderByHistoricTaskInstanceStartTime();
-    HistoricTaskInstanceQuery orderByHistoricTaskInstanceEndTime();
-    HistoricTaskInstanceQuery orderByDeleteReason();
-
-}

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/engine/task/TaskQuery.java

-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.cmmn.engine.task;
-
-import org.flowable.task.service.Task;
-import org.flowable.task.service.TaskInfoQuery;
-
-/**
- * @author Joram Barrez
- */
-public interface TaskQuery extends TaskInfoQuery<TaskQuery, Task>  {
-    
-    TaskQuery caseInstanceId(String caseInstanceId);
-    
-    TaskQuery caseDefinitionId(String caseDefinitionId);
-    
-    TaskQuery planItemInstanceId(String planItemInstanceId);
-
-}

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

@@ -15,11 +15,11 @@ package org.flowable.cmmn.engine.impl;
 import org.flowable.cmmn.engine.CmmnHistoryService;
 import org.flowable.cmmn.engine.history.HistoricCaseInstanceQuery;
 import org.flowable.cmmn.engine.history.HistoricMilestoneInstanceQuery;
-import org.flowable.cmmn.engine.history.HistoricTaskInstanceQuery;
 import org.flowable.cmmn.engine.history.HistoricVariableInstanceQuery;
 import org.flowable.cmmn.engine.impl.cmd.DeleteHistoricCaseInstanceCmd;
-import org.flowable.cmmn.engine.impl.history.CmmnHistoricTaskInstanceQueryImpl;
 import org.flowable.cmmn.engine.impl.history.CmmnHistoricVariableInstanceQueryImpl;
+import org.flowable.task.service.history.HistoricTaskInstanceQuery;
+import org.flowable.task.service.impl.HistoricTaskInstanceQueryImpl;
 
 /**
  * @author Joram Barrez
@@ -49,7 +49,7 @@ public class CmmnHistoryServiceImpl extends ServiceImpl implements CmmnHistorySe
 
     @Override
     public HistoricTaskInstanceQuery createHistoricTaskInstanceQuery() {
-        return new CmmnHistoricTaskInstanceQueryImpl(commandExecutor);
+        return new HistoricTaskInstanceQueryImpl(commandExecutor);
     }
     
 }

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

@@ -16,8 +16,8 @@ import java.util.Map;
 
 import org.flowable.cmmn.engine.CmmnTaskService;
 import org.flowable.cmmn.engine.impl.cmd.CompleteTaskCmd;
-import org.flowable.cmmn.engine.impl.task.CmmnTaskQueryImpl;
-import org.flowable.cmmn.engine.task.TaskQuery;
+import org.flowable.task.service.TaskQuery;
+import org.flowable.task.service.impl.TaskQueryImpl;
 
 /**
  * @author Joram Barrez
@@ -41,7 +41,7 @@ public class CmmnTaskServiceImpl extends ServiceImpl implements CmmnTaskService
     
     @Override
     public TaskQuery createTaskQuery() {
-        return new CmmnTaskQueryImpl(commandExecutor);
+        return new TaskQueryImpl(commandExecutor);
     }
 
 }

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/behavior/impl/HumanTaskActivityBehavior.java

@@ -20,7 +20,6 @@ import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.cmmn.engine.impl.persistence.entity.PlanItemInstanceEntity;
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.cmmn.engine.runtime.PlanItemInstanceState;
 import org.flowable.cmmn.model.HumanTask;
 import org.flowable.engine.common.api.FlowableException;
@@ -32,6 +31,7 @@ import org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEnt
 import org.flowable.task.service.TaskService;
 import org.flowable.task.service.impl.persistence.CountingTaskEntity;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
+import org.flowable.variable.service.type.VariableScopeType;
 import org.joda.time.DateTime;
 import org.joda.time.Period;
 

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/cmd/GetVariableCmd.java

@@ -13,11 +13,11 @@
 package org.flowable.cmmn.engine.impl.cmd;
 
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.engine.common.api.FlowableIllegalArgumentException;
 import org.flowable.engine.common.impl.interceptor.Command;
 import org.flowable.engine.common.impl.interceptor.CommandContext;
 import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Joram Barrez

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/cmd/GetVariablesCmd.java

@@ -17,11 +17,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.engine.common.api.FlowableIllegalArgumentException;
 import org.flowable.engine.common.impl.interceptor.Command;
 import org.flowable.engine.common.impl.interceptor.CommandContext;
 import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Joram Barrez

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

@@ -16,11 +16,11 @@ import java.util.List;
 import java.util.Set;
 
 import org.flowable.cmmn.engine.history.HistoricVariableInstanceQuery;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.engine.common.api.query.QueryProperty;
 import org.flowable.engine.common.impl.interceptor.CommandExecutor;
 import org.flowable.variable.service.history.HistoricVariableInstance;
 import org.flowable.variable.service.impl.HistoricVariableInstanceQueryImpl;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * Wrapper class around the {@link HistoricVariableInstanceQueryImpl} from the variable service,

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

@@ -19,13 +19,13 @@ import org.flowable.cmmn.engine.CmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.persistence.entity.data.CaseDefinitionDataManager;
 import org.flowable.cmmn.engine.impl.repository.CaseDefinitionQueryImpl;
 import org.flowable.cmmn.engine.impl.runtime.CaseInstanceQueryImpl;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.cmmn.engine.repository.CaseDefinition;
 import org.flowable.cmmn.engine.repository.CaseDefinitionQuery;
 import org.flowable.cmmn.engine.runtime.CaseInstance;
 import org.flowable.engine.common.impl.persistence.entity.data.DataManager;
 import org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntity;
 import org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityManager;
+import org.flowable.variable.service.type.VariableScopeType;
 
 
 /**

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

@@ -20,9 +20,9 @@ import java.util.Map;
 
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity;
 import org.flowable.variable.service.impl.persistence.entity.VariableScopeImpl;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Joram Barrez

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

@@ -19,13 +19,13 @@ import org.flowable.cmmn.engine.CmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.persistence.entity.data.CaseInstanceDataManager;
 import org.flowable.cmmn.engine.impl.runtime.CaseInstanceQueryImpl;
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.cmmn.engine.runtime.CaseInstance;
 import org.flowable.cmmn.engine.runtime.CaseInstanceQuery;
 import org.flowable.engine.common.impl.interceptor.CommandContext;
 import org.flowable.engine.common.impl.persistence.entity.data.DataManager;
 import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity;
 import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityManager;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Joram Barrez

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

@@ -21,11 +21,11 @@ import java.util.Map;
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.repository.CaseDefinitionUtil;
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.cmmn.model.Case;
 import org.flowable.cmmn.model.PlanItem;
 import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity;
 import org.flowable.variable.service.impl.persistence.entity.VariableScopeImpl;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Joram Barrez

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/task/DefaultCmmnTaskVariableScopeResolver.java

@@ -14,10 +14,10 @@
 package org.flowable.cmmn.engine.impl.task;
 
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.task.service.InternalTaskVariableScopeResolver;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
 import org.flowable.variable.service.impl.persistence.entity.VariableScopeImpl;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Joram Barrez

modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/VariablesTest.java

@@ -25,12 +25,12 @@ import java.util.Map;
 import org.flowable.cmmn.engine.delegate.DelegatePlanItemInstance;
 import org.flowable.cmmn.engine.delegate.PlanItemJavaDelegate;
 import org.flowable.cmmn.engine.history.HistoricMilestoneInstance;
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.cmmn.engine.runtime.CaseInstance;
 import org.flowable.cmmn.engine.runtime.PlanItemInstance;
 import org.flowable.cmmn.engine.test.CmmnDeployment;
 import org.flowable.cmmn.engine.test.FlowableCmmnTestCase;
 import org.flowable.variable.service.history.HistoricVariableInstance;
+import org.flowable.variable.service.type.VariableScopeType;
 import org.junit.Test;
 
 /**

modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/task/CmmnTaskServiceTest.java

@@ -16,7 +16,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import org.flowable.cmmn.engine.impl.variable.VariableScopeType;
 import org.flowable.cmmn.engine.runtime.CaseInstance;
 import org.flowable.cmmn.engine.runtime.PlanItemInstance;
 import org.flowable.cmmn.engine.test.CmmnDeployment;
@@ -24,6 +23,7 @@ import org.flowable.cmmn.engine.test.FlowableCmmnTestCase;
 import org.flowable.engine.common.impl.history.HistoryLevel;
 import org.flowable.task.service.Task;
 import org.flowable.task.service.history.HistoricTaskInstance;
+import org.flowable.variable.service.type.VariableScopeType;
 import org.junit.Test;
 
 /**

modules/flowable-task-service-api/src/main/java/org/flowable/task/service/TaskInfoQuery.java

@@ -18,6 +18,7 @@ import java.util.List;
 
 import org.flowable.engine.common.api.FlowableIllegalArgumentException;
 import org.flowable.engine.common.api.query.Query;
+import org.flowable.identitylink.service.IdentityLink;
 import org.flowable.task.service.history.HistoricTaskInstanceQuery;
 
 /**
@@ -197,6 +198,21 @@ public interface TaskInfoQuery<T extends TaskInfoQuery<?, ?>, V extends TaskInfo
      */
     T executionId(String executionId);
     
+    /**
+     * Only select tasks for the given case instance.
+     */
+    T caseInstanceId(String caseInstanceId);
+    
+    /**
+     * Only select tasks for the given case definition.
+     */
+    T caseDefinitionId(String caseDefinitionId);
+    
+    /**
+     * Only select tasks for the given plan item instance. 
+     */
+    T planItemInstanceId(String planItemInstanceId);
+    
     /**
      * Only select tasks for the given scope identifier. 
      */

modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/HistoricTaskInstanceQueryImpl.java

@@ -30,6 +30,7 @@ import org.flowable.task.service.impl.util.CommandContextUtil;
 import org.flowable.variable.service.impl.AbstractVariableQueryImpl;
 import org.flowable.variable.service.impl.QueryVariableValue;
 import org.flowable.variable.service.impl.types.VariableTypes;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Tom Baeyens
@@ -227,6 +228,42 @@ public class HistoricTaskInstanceQueryImpl extends AbstractVariableQueryImpl<His
         return this;
     }
     
+    @Override
+    public HistoricTaskInstanceQueryImpl caseInstanceId(String caseInstanceId) {
+        if (inOrStatement) {
+            currentOrQueryObject.scopeId(caseInstanceId);
+            currentOrQueryObject.scopeType(VariableScopeType.CMMN);
+        } else {
+            this.scopeId(caseInstanceId);
+            this.scopeType(VariableScopeType.CMMN);
+        }
+        return this;
+    }
+    
+    @Override
+    public HistoricTaskInstanceQueryImpl caseDefinitionId(String caseDefinitionId) {
+        if (inOrStatement) {
+            currentOrQueryObject.scopeDefinitionId(caseDefinitionId);
+            currentOrQueryObject.scopeType(VariableScopeType.CMMN);
+        } else {
+            this.scopeDefinitionId(caseDefinitionId);
+            this.scopeType(VariableScopeType.CMMN);
+        }
+        return this;
+    }
+    
+    @Override
+    public HistoricTaskInstanceQueryImpl planItemInstanceId(String planItemInstanceId) {
+        if (inOrStatement) {
+            currentOrQueryObject.subScopeId(planItemInstanceId);
+            currentOrQueryObject.scopeType(VariableScopeType.CMMN);
+        } else {
+            this.subScopeId(planItemInstanceId);
+            this.scopeType(VariableScopeType.CMMN);
+        }
+        return this;
+    }
+    
     @Override
     public HistoricTaskInstanceQueryImpl scopeId(String scopeId) {
         if (inOrStatement) {

modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/TaskQueryImpl.java

@@ -31,6 +31,7 @@ import org.flowable.task.service.impl.util.CommandContextUtil;
 import org.flowable.variable.service.impl.AbstractVariableQueryImpl;
 import org.flowable.variable.service.impl.QueryVariableValue;
 import org.flowable.variable.service.impl.types.VariableTypes;
+import org.flowable.variable.service.type.VariableScopeType;
 
 /**
  * @author Joram Barrez
@@ -673,6 +674,42 @@ public class TaskQueryImpl extends AbstractVariableQueryImpl<TaskQuery, Task> im
         return this;
     }
     
+    @Override
+    public TaskQuery caseInstanceId(String caseInstanceId) {
+        if (orActive) {
+            currentOrQueryObject.scopeId(caseInstanceId);
+            currentOrQueryObject.scopeType(VariableScopeType.CMMN);
+        } else {
+            this.scopeId(caseInstanceId);
+            this.scopeType(VariableScopeType.CMMN);
+        }
+        return this;
+    }
+    
+    @Override
+    public TaskQuery caseDefinitionId(String caseDefinitionId) {
+        if (orActive) {
+            currentOrQueryObject.scopeDefinitionId(caseDefinitionId);
+            currentOrQueryObject.scopeType(VariableScopeType.CMMN);
+        } else {
+            this.scopeDefinitionId(caseDefinitionId);
+            this.scopeType(VariableScopeType.CMMN);
+        }
+        return this;
+    }
+    
+    @Override
+    public TaskQuery planItemInstanceId(String planItemInstanceId) {
+        if (orActive) {
+            currentOrQueryObject.subScopeId(planItemInstanceId);
+            currentOrQueryObject.scopeType(VariableScopeType.CMMN);
+        } else {
+            this.subScopeId(planItemInstanceId);
+            this.scopeType(VariableScopeType.CMMN);
+        }
+        return this;
+    }
+    
     @Override
     public TaskQueryImpl scopeId(String scopeId) {
         if (orActive) {

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/variable/VariableScopeType.java → modules/flowable-variable-service-api/src/main/java/org/flowable/variable/service/type/VariableScopeType.java

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.cmmn.engine.impl.variable;
+package org.flowable.variable.service.type;
 
 /**
  * @author Joram Barrez