TSK-248: Moved models to IMPL, resigned hardcoded Strings, deleted model-package.

lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java

@@ -15,7 +15,7 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskAlreadyExistException;
 import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
 
 @ApplicationScoped
 public class ExampleBootstrap {

lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java

@@ -9,7 +9,7 @@ import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskAlreadyExistException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
 
 @Stateless
 public class TaskanaEjb {

lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java

@@ -22,8 +22,8 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskAlreadyExistException;
 import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 
 @Path("/test")
 public class TaskanaRestTest {

lib/taskana-core/src/main/java/pro/taskana/Attachment.java

@@ -3,7 +3,7 @@ package pro.taskana;
 import java.time.Instant;
 import java.util.Map;
 
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
 
 /**
  * Attachment-Interface to specify Attachment Attributes.

lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
 
 /**
  * ObjectReferenceQuery for generating dynamic sql.

lib/taskana-core/src/main/java/pro/taskana/Task.java

@@ -4,8 +4,8 @@ import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 /**
  * task-Interface to specify attribute interactions.

lib/taskana-core/src/main/java/pro/taskana/TaskMonitorService.java

@@ -3,9 +3,9 @@ package pro.taskana;
 import java.util.List;
 
 import pro.taskana.impl.CustomField;
-import pro.taskana.model.Report;
+import pro.taskana.impl.Report;
-import pro.taskana.model.ReportLineItemDefinition;
+import pro.taskana.impl.ReportLineItemDefinition;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 /**
  * The Task Monitor Service manages operations on tasks regarding the monitoring.

lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 /**
  * TaskQuery for generating dynamic sql.

lib/taskana-core/src/main/java/pro/taskana/TaskService.java

@@ -15,7 +15,7 @@ import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.TaskanaException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.BulkOperationResults;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 /**
  * The Task Service manages all operations on tasks.

lib/taskana-core/src/main/java/pro/taskana/TaskSummary.java

@@ -2,8 +2,8 @@ package pro.taskana;
 
 import java.time.Instant;
 
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 /**
  * Interface for TaskSummary. This is a specific short model-object which only contains the most important information.

lib/taskana-core/src/main/java/pro/taskana/Workbasket.java

@@ -2,7 +2,7 @@ package pro.taskana;
 
 import java.time.Instant;
 
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 
 /**
  * Workbasket entity interface.

lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java

@@ -3,8 +3,8 @@ package pro.taskana;
 import java.time.Instant;
 
 import pro.taskana.exceptions.InvalidArgumentException;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.impl.WorkbasketAuthorization;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 
 /**
  * WorkitemQuery for generating dynamic sql.

lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java

@@ -7,7 +7,7 @@ import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketInUseException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.impl.WorkbasketAuthorization;
 
 /**
  * This service manages Workbaskets.

lib/taskana-core/src/main/java/pro/taskana/WorkbasketSummary.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 
 /**
  * Interface for WorkbasketSummary. This is a specific short model-object which only contains the most important

lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentImpl.java

@@ -7,7 +7,6 @@ import java.util.Map;
 import pro.taskana.Attachment;
 import pro.taskana.AttachmentSummary;
 import pro.taskana.ClassificationSummary;
-import pro.taskana.model.ObjectReference;
 
 /**
  * Attachment entity.

lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java

@@ -22,8 +22,8 @@ import pro.taskana.impl.util.LoggerUtils;
  */
 public class ClassificationQueryImpl implements ClassificationQuery {
 
-    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryClassification";
+    private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryClassification";
-    private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryClassifications";
+    private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryClassifications";
     private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationQueryImpl.class);
     private TaskanaEngineImpl taskanaEngineImpl;
     private String[] key;

lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java

@@ -22,7 +22,7 @@ import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException;
 import pro.taskana.exceptions.SystemException;
 import pro.taskana.impl.util.IdGenerator;
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.mappings.ClassificationMapper;
+import pro.taskana.mappings.ClassificationMapper;
 
 /**
  * This is the implementation of ClassificationService.

lib/taskana-core/src/main/java/pro/taskana/impl/DaysToWorkingDaysConverter.java

@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.ReportLineItemDefinition;
 
 /**
  * The DaysToWorkingDaysConverter provides a method to convert an age in days into an age in working days. Before the

lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java

@@ -1,7 +1,5 @@
 package pro.taskana.impl;
 
-import pro.taskana.model.TaskState;
-
 /**
  * A convenience class to represent pairs of task id and task state.
  */

lib/taskana-core/src/main/java/pro/taskana/impl/MonitorQueryItem.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 /**
  * The MonitorQueryItem entity contains the number of tasks for a key (e.g. workbasketKey) and age in days.

lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReference.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 /**
  * ObjectReference entity.

lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java

@@ -12,7 +12,6 @@ import pro.taskana.ObjectReferenceQuery;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.exceptions.TaskanaRuntimeException;
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.ObjectReference;
 
 /**
  * Implementation of ObjectReferenceQuery interface.
@@ -21,8 +20,8 @@ import pro.taskana.model.ObjectReference;
  */
 public class ObjectReferenceQueryImpl implements ObjectReferenceQuery {
 
-    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryObjectReference";
+    private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryObjectReference";
-    private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryObjectReferences";
+    private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryObjectReferences";
     private static final Logger LOGGER = LoggerFactory.getLogger(ObjectReferenceQueryImpl.class);
 
     private TaskanaEngineImpl taskanaEngineImpl;

lib/taskana-core/src/main/java/pro/taskana/impl/Report.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;

lib/taskana-core/src/main/java/pro/taskana/impl/ReportLine.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 import java.util.ArrayList;
 import java.util.List;

lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItem.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 /**
  * Each ReportLineItem consists of a {@link ReportLineItemDefinition} that defines the upper and lower age limits of

lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItemDefinition.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 /**
  * A ReportLineItemDefinition has a lower and an upper age limit which subdivide the count of tasks into different

lib/taskana-core/src/main/java/pro/taskana/impl/TaskImpl.java

@@ -13,8 +13,6 @@ import pro.taskana.ClassificationSummary;
 import pro.taskana.Task;
 import pro.taskana.TaskSummary;
 import pro.taskana.WorkbasketSummary;
-import pro.taskana.model.ObjectReference;
-import pro.taskana.model.TaskState;
 
 /**
  * Task entity.

lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java

@@ -9,13 +9,7 @@ import pro.taskana.TaskMonitorService;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.Workbasket;
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.MonitorQueryItem;
+import pro.taskana.mappings.TaskMonitorMapper;
-import pro.taskana.model.Report;
-import pro.taskana.model.ReportLine;
-import pro.taskana.model.ReportLineItem;
-import pro.taskana.model.ReportLineItemDefinition;
-import pro.taskana.model.TaskState;
-import pro.taskana.model.mappings.TaskMonitorMapper;
 
 /**
  * This is the implementation of TaskMonitorService.

lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java

@@ -18,16 +18,14 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException;
 import pro.taskana.exceptions.TaskanaRuntimeException;
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.TaskState;
-import pro.taskana.model.WorkbasketAuthorization;
 
 /**
  * TaskQuery for generating dynamic sql.
  */
 public class TaskQueryImpl implements TaskQuery {
 
-    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryTasks";
+    private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryTasks";
-    private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryTasks";
+    private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryTasks";
     private static final Logger LOGGER = LoggerFactory.getLogger(TaskQueryImpl.class);
     private TaskanaEngineImpl taskanaEngineImpl;
     private TaskServiceImpl taskService;

lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java

@@ -40,11 +40,8 @@ import pro.taskana.exceptions.TaskanaException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.util.IdGenerator;
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.mappings.AttachmentMapper;
-import pro.taskana.model.TaskState;
+import pro.taskana.mappings.TaskMapper;
-import pro.taskana.model.WorkbasketAuthorization;
-import pro.taskana.model.mappings.AttachmentMapper;
-import pro.taskana.model.mappings.TaskMapper;
 import pro.taskana.security.CurrentUserContext;
 
 /**

lib/taskana-core/src/main/java/pro/taskana/impl/TaskState.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 /**
  * This enum contains all status of the tasks.

lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java

@@ -8,8 +8,6 @@ import pro.taskana.AttachmentSummary;
 import pro.taskana.ClassificationSummary;
 import pro.taskana.TaskSummary;
 import pro.taskana.WorkbasketSummary;
-import pro.taskana.model.ObjectReference;
-import pro.taskana.model.TaskState;
 
 /**
  * Entity which contains the most important informations about a Task.

lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java

@@ -28,15 +28,15 @@ import pro.taskana.exceptions.ConnectionNotSetException;
 import pro.taskana.exceptions.SystemException;
 import pro.taskana.exceptions.UnsupportedDatabaseException;
 import pro.taskana.impl.persistence.MapTypeHandler;
-import pro.taskana.model.mappings.AttachmentMapper;
+import pro.taskana.mappings.AttachmentMapper;
-import pro.taskana.model.mappings.ClassificationMapper;
+import pro.taskana.mappings.ClassificationMapper;
-import pro.taskana.model.mappings.DistributionTargetMapper;
+import pro.taskana.mappings.DistributionTargetMapper;
-import pro.taskana.model.mappings.ObjectReferenceMapper;
+import pro.taskana.mappings.ObjectReferenceMapper;
-import pro.taskana.model.mappings.QueryMapper;
+import pro.taskana.mappings.QueryMapper;
-import pro.taskana.model.mappings.TaskMapper;
+import pro.taskana.mappings.TaskMapper;
-import pro.taskana.model.mappings.TaskMonitorMapper;
+import pro.taskana.mappings.TaskMonitorMapper;
-import pro.taskana.model.mappings.WorkbasketAccessMapper;
+import pro.taskana.mappings.WorkbasketAccessMapper;
-import pro.taskana.model.mappings.WorkbasketMapper;
+import pro.taskana.mappings.WorkbasketMapper;
 
 /**
  * This is the implementation of TaskanaEngine.

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java

@@ -22,8 +22,8 @@ import pro.taskana.impl.util.LoggerUtils;
  */
 public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery {
 
-    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryWorkbasketAccessItem";
+    private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryWorkbasketAccessItem";
-    private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryWorkbasketAccessItems";
+    private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryWorkbasketAccessItems";
     private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketQueryImpl.class);
     private String[] accessIdIn;
     private String[] workbasketKeyIn;

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAuthorization.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 /**
  * This enum contains all permission values for the workbaskets.

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketImpl.java

@@ -4,7 +4,6 @@ import java.time.Instant;
 
 import pro.taskana.Workbasket;
 import pro.taskana.WorkbasketSummary;
-import pro.taskana.model.WorkbasketType;
 
 /**
  * Workbasket entity.

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java

@@ -17,8 +17,6 @@ import pro.taskana.configuration.TaskanaEngineConfiguration;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.TaskanaRuntimeException;
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.WorkbasketAuthorization;
-import pro.taskana.model.WorkbasketType;
 import pro.taskana.security.CurrentUserContext;
 
 /**
@@ -28,8 +26,8 @@ import pro.taskana.security.CurrentUserContext;
  */
 public class WorkbasketQueryImpl implements WorkbasketQuery {
 
-    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryWorkbasket";
+    private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryWorkbasket";
-    private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryWorkbaskets";
+    private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryWorkbaskets";
     private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketQueryImpl.class);
     private String[] accessId;
     private WorkbasketAuthorization authorization;

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java

@@ -25,10 +25,9 @@ import pro.taskana.exceptions.WorkbasketInUseException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.util.IdGenerator;
 import pro.taskana.impl.util.LoggerUtils;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.mappings.DistributionTargetMapper;
-import pro.taskana.model.mappings.DistributionTargetMapper;
+import pro.taskana.mappings.WorkbasketAccessMapper;
-import pro.taskana.model.mappings.WorkbasketAccessMapper;
+import pro.taskana.mappings.WorkbasketMapper;
-import pro.taskana.model.mappings.WorkbasketMapper;
 import pro.taskana.security.CurrentUserContext;
 
 /**

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java

@@ -1,7 +1,6 @@
 package pro.taskana.impl;
 
 import pro.taskana.WorkbasketSummary;
-import pro.taskana.model.WorkbasketType;
 
 /**
  * This entity contains the most important information about a workbasket.

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketType.java

@@ -1,4 +1,4 @@
-package pro.taskana.model;
+package pro.taskana.impl;
 
 /**
  * This enum contains the supported work basket types.

lib/taskana-core/src/main/java/pro/taskana/mappings/AttachmentMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 import java.util.Map;

lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 

lib/taskana-core/src/main/java/pro/taskana/mappings/DistributionTargetMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 

lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 
@@ -9,7 +9,8 @@ import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import pro.taskana.model.ObjectReference;
+
+import pro.taskana.impl.ObjectReference;
 /**
  * This class is the mybatis mapping of ObjectReference.
  */

lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 
@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Select;
 
 import pro.taskana.impl.ClassificationQueryImpl;
 import pro.taskana.impl.ClassificationSummaryImpl;
+import pro.taskana.impl.ObjectReference;
 import pro.taskana.impl.ObjectReferenceQueryImpl;
 import pro.taskana.impl.TaskQueryImpl;
 import pro.taskana.impl.TaskSummaryImpl;
@@ -15,17 +16,16 @@ import pro.taskana.impl.WorkbasketAccessItemImpl;
 import pro.taskana.impl.WorkbasketAccessItemQueryImpl;
 import pro.taskana.impl.WorkbasketQueryImpl;
 import pro.taskana.impl.WorkbasketSummaryImpl;
-import pro.taskana.model.ObjectReference;
 
 /**
  * This class provides a mapper for all queries.
  */
 public interface QueryMapper {
 
-    String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
+    String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.mappings.ObjectReferenceMapper.findById";
-    String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByKeyAndDomain";
+    String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.mappings.ClassificationMapper.findByKeyAndDomain";
-    String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById";
+    String CLASSIFICATION_FINDBYID = "pro.taskana.mappings.ClassificationMapper.findById";
-    String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.model.mappings.WorkbasketMapper.findSummaryByKey";
+    String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.mappings.WorkbasketMapper.findSummaryByKey";
 
     @Select("<script>SELECT t.ID, t.CREATED, t.CLAIMED, t.COMPLETED, t.MODIFIED, t.PLANNED, t.DUE, t.NAME, t.DESCRIPTION, t.NOTE, t.PRIORITY, t.STATE, t.CLASSIFICATION_KEY, t.DOMAIN, t.WORKBASKET_KEY, t.BUSINESS_PROCESS_ID, t.PARENT_BUSINESS_PROCESS_ID, t.OWNER, t.POR_COMPANY, t.POR_SYSTEM, t.POR_INSTANCE, t.POR_TYPE, t.POR_VALUE, t.IS_READ, t.IS_TRANSFERRED, t.CUSTOM_1, t.CUSTOM_2, t.CUSTOM_3, t.CUSTOM_4, t.CUSTOM_5, t.CUSTOM_6, t.CUSTOM_7, t.CUSTOM_8, t.CUSTOM_9, t.CUSTOM_10 "
         + "FROM TASK t "

lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 import java.util.Map;
@@ -16,20 +16,20 @@ import org.apache.ibatis.type.JdbcType;
 
 import pro.taskana.impl.MinimalTaskSummary;
 import pro.taskana.impl.TaskImpl;
+import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskSummaryImpl;
 import pro.taskana.impl.WorkbasketSummaryImpl;
 import pro.taskana.impl.persistence.MapTypeHandler;
-import pro.taskana.model.TaskState;
 
 /**
  * This class is the mybatis mapping of task.
  */
 public interface TaskMapper {
 
-    String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
+    String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.mappings.ObjectReferenceMapper.findById";
-    String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByKeyAndDomain";
+    String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.mappings.ClassificationMapper.findByKeyAndDomain";
-    String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.model.mappings.WorkbasketMapper.findSummaryByKey";
+    String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.mappings.WorkbasketMapper.findSummaryByKey";
-    String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById";
+    String CLASSIFICATION_FINDBYID = "pro.taskana.mappings.ClassificationMapper.findById";
 
     @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, NOTE, PRIORITY, STATE, CLASSIFICATION_KEY, WORKBASKET_KEY, DOMAIN, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
         + "FROM TASK "

lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMonitorMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 
@@ -9,8 +9,8 @@ import org.apache.ibatis.annotations.Select;
 
 import pro.taskana.Workbasket;
 import pro.taskana.impl.CustomField;
-import pro.taskana.model.MonitorQueryItem;
+import pro.taskana.impl.MonitorQueryItem;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 /**
  * This class is the mybatis mapping of task monitoring.

lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketAccessMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 

lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java

@@ -1,4 +1,4 @@
-package pro.taskana.model.mappings;
+package pro.taskana.mappings;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import pro.taskana.impl.WorkbasketAuthorization;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.WorkbasketSummaryImpl;
-import pro.taskana.model.WorkbasketAuthorization;
 
 /**
  * This class is the mybatis mapping of workbaskets.

lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java

@@ -20,10 +20,10 @@ import pro.taskana.configuration.TaskanaEngineConfiguration;
 import pro.taskana.database.TestDataGenerator;
 import pro.taskana.exceptions.ClassificationNotFoundException;
 import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.ObjectReference;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import pro.taskana.model.ObjectReference;
 
 /**
  * Base class for all acceptance tests.

lib/taskana-core/src/test/java/acceptance/monitoring/ProvideCategoryReportAccTest.java

@@ -26,13 +26,13 @@ import pro.taskana.configuration.TaskanaEngineConfiguration;
 import pro.taskana.database.TestDataGenerator;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.impl.Report;
+import pro.taskana.impl.ReportLineItemDefinition;
+import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import pro.taskana.model.Report;
-import pro.taskana.model.ReportLineItemDefinition;
-import pro.taskana.model.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/monitoring/ProvideClassificationReportAccTest.java

@@ -30,14 +30,14 @@ import pro.taskana.exceptions.ClassificationNotFoundException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.ClassificationImpl;
+import pro.taskana.impl.Report;
+import pro.taskana.impl.ReportLineItem;
+import pro.taskana.impl.ReportLineItemDefinition;
+import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import pro.taskana.model.Report;
-import pro.taskana.model.ReportLineItem;
-import pro.taskana.model.ReportLineItemDefinition;
-import pro.taskana.model.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/monitoring/ProvideCustomFieldValueReportAccTest.java

@@ -28,14 +28,14 @@ import pro.taskana.exceptions.ClassificationNotFoundException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.CustomField;
+import pro.taskana.impl.Report;
+import pro.taskana.impl.ReportLineItem;
+import pro.taskana.impl.ReportLineItemDefinition;
+import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import pro.taskana.model.Report;
-import pro.taskana.model.ReportLineItem;
-import pro.taskana.model.ReportLineItemDefinition;
-import pro.taskana.model.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/monitoring/ProvideWorkbasketLevelReportAccTest.java

@@ -26,13 +26,13 @@ import pro.taskana.configuration.TaskanaEngineConfiguration;
 import pro.taskana.database.TestDataGenerator;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.impl.Report;
+import pro.taskana.impl.ReportLineItemDefinition;
+import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import pro.taskana.model.Report;
-import pro.taskana.model.ReportLineItemDefinition;
-import pro.taskana.model.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java

@@ -18,7 +18,7 @@ import pro.taskana.TaskQuery;
 import pro.taskana.TaskService;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskanaRuntimeException;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
 import pro.taskana.security.JAASRunner;
 
 /**

lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java

@@ -24,7 +24,7 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskAlreadyExistException;
 import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java

@@ -18,7 +18,7 @@ import pro.taskana.TaskService;
 import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java

@@ -33,7 +33,7 @@ import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.TaskanaException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.BulkOperationResults;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java

@@ -36,7 +36,7 @@ import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.TaskanaException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.BulkOperationResults;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java

@@ -15,7 +15,7 @@ import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.security.JAASRunner;
 
 /**

lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java

@@ -16,8 +16,8 @@ import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.impl.WorkbasketAuthorization;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java

@@ -16,7 +16,7 @@ import pro.taskana.WorkbasketSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.InvalidRequestException;
 import pro.taskana.exceptions.NotAuthorizedException;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.security.JAASRunner;
 
 /**

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java

@@ -17,7 +17,7 @@ import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.InvalidRequestException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.SystemException;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.impl.WorkbasketAuthorization;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java

@@ -17,7 +17,7 @@ import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java

@@ -31,7 +31,7 @@ import pro.taskana.exceptions.ClassificationAlreadyExistException;
 import pro.taskana.exceptions.ClassificationNotFoundException;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
-import pro.taskana.model.mappings.ClassificationMapper;
+import pro.taskana.mappings.ClassificationMapper;
 
 /**
  * Unit Test for ClassificationServiceImpl.

lib/taskana-core/src/test/java/pro/taskana/impl/DaysToWorkingDaysConverterTest.java

@@ -9,8 +9,6 @@ import java.util.List;
 
 import org.junit.Test;
 
-import pro.taskana.model.ReportLineItemDefinition;
-
 /**
  * Test for the DaysToWorkingDaysConverter.
  */

lib/taskana-core/src/test/java/pro/taskana/impl/JunitHelper.java

@@ -1,7 +1,6 @@
 package pro.taskana.impl;
 
 import pro.taskana.Attachment;
-import pro.taskana.model.ObjectReference;
 
 /**
  * This class contains helper methods for Junit Tests.

lib/taskana-core/src/test/java/pro/taskana/impl/ObjectReferenceQueryImplTest.java

@@ -16,7 +16,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
-import pro.taskana.model.ObjectReference;
 
 /**
  * Test for ObjectReferenceQueryImpl.

lib/taskana-core/src/test/java/pro/taskana/impl/TaskMonitorServiceImplTest.java

@@ -24,12 +24,8 @@ import org.mockito.junit.MockitoJUnitRunner;
 import pro.taskana.Workbasket;
 import pro.taskana.WorkbasketService;
 import pro.taskana.configuration.TaskanaEngineConfiguration;
-import pro.taskana.model.MonitorQueryItem;
+import pro.taskana.mappings.ObjectReferenceMapper;
-import pro.taskana.model.Report;
+import pro.taskana.mappings.TaskMonitorMapper;
-import pro.taskana.model.ReportLineItemDefinition;
-import pro.taskana.model.TaskState;
-import pro.taskana.model.mappings.ObjectReferenceMapper;
-import pro.taskana.model.mappings.TaskMonitorMapper;
 
 /**
  * Unit Test for TaskMonitorServiceImpl.

lib/taskana-core/src/test/java/pro/taskana/impl/TaskQueryImplTest.java

@@ -19,7 +19,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
-import pro.taskana.model.TaskState;
 
 /**
  * Test for TaskQueryImpl.

lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java

@@ -56,12 +56,9 @@ import pro.taskana.exceptions.SystemException;
 import pro.taskana.exceptions.TaskAlreadyExistException;
 import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.mappings.AttachmentMapper;
-import pro.taskana.model.TaskState;
+import pro.taskana.mappings.ObjectReferenceMapper;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.mappings.TaskMapper;
-import pro.taskana.model.mappings.AttachmentMapper;
-import pro.taskana.model.mappings.ObjectReferenceMapper;
-import pro.taskana.model.mappings.TaskMapper;
 import pro.taskana.security.CurrentUserContext;
 
 /**

lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java

@@ -37,11 +37,9 @@ import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketInUseException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.mappings.DistributionTargetMapper;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.mappings.WorkbasketAccessMapper;
-import pro.taskana.model.mappings.DistributionTargetMapper;
+import pro.taskana.mappings.WorkbasketMapper;
-import pro.taskana.model.mappings.WorkbasketAccessMapper;
-import pro.taskana.model.mappings.WorkbasketMapper;
 
 /**
  * Unit Test for workbasketServiceImpl.

lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java

@@ -43,16 +43,16 @@ import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.ClassificationImpl;
 import pro.taskana.impl.JunitHelper;
+import pro.taskana.impl.ObjectReference;
 import pro.taskana.impl.TaskImpl;
 import pro.taskana.impl.TaskServiceImpl;
+import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskSummaryImpl;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import pro.taskana.model.ObjectReference;
-import pro.taskana.model.TaskState;
-import pro.taskana.model.WorkbasketType;
 import pro.taskana.security.CurrentUserContext;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;

lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java

@@ -47,16 +47,16 @@ import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.ClassificationImpl;
 import pro.taskana.impl.ClassificationServiceImpl;
 import pro.taskana.impl.JunitHelper;
+import pro.taskana.impl.ObjectReference;
 import pro.taskana.impl.TaskImpl;
 import pro.taskana.impl.TaskServiceImpl;
+import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.WorkbasketServiceImpl;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import pro.taskana.model.ObjectReference;
-import pro.taskana.model.TaskState;
-import pro.taskana.model.WorkbasketType;
 import pro.taskana.security.CurrentUserContext;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;

lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java

@@ -36,13 +36,13 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.TaskanaEngineProxyForTest;
+import pro.taskana.impl.WorkbasketAuthorization;
 import pro.taskana.impl.WorkbasketImpl;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
 import pro.taskana.impl.util.IdGenerator;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.mappings.WorkbasketMapper;
-import pro.taskana.model.WorkbasketType;
-import pro.taskana.model.mappings.WorkbasketMapper;
 import pro.taskana.security.CurrentUserContext;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;

lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java

@@ -31,10 +31,10 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
 import pro.taskana.impl.util.IdGenerator;
-import pro.taskana.model.WorkbasketType;
 import pro.taskana.security.JAASRunner;
 import pro.taskana.security.WithAccessId;
 

lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java

@@ -15,7 +15,7 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskAlreadyExistException;
 import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
 
 @Component
 @Transactional

lib/taskana-spring-txtest/src/main/java/pro/taskana/springtx/TaskanaTestController.java

@@ -14,8 +14,8 @@ import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.WorkbasketImpl;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.impl.util.IdGenerator;
-import pro.taskana.model.WorkbasketType;
 
 /**
  * @author Titus Meyer (v081065)

lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java

@@ -10,7 +10,7 @@ import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskAlreadyExistException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.ObjectReference;
+import pro.taskana.impl.ObjectReference;
 
 @Component
 @Transactional

rest/src/main/java/pro/taskana/rest/MonitorController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 @RestController
 @RequestMapping(path = "/v1/monitor", produces = { MediaType.APPLICATION_JSON_VALUE })

rest/src/main/java/pro/taskana/rest/TaskController.java

@@ -29,7 +29,7 @@ import pro.taskana.exceptions.InvalidStateException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 import pro.taskana.rest.query.TaskFilter;
 
 @RestController

rest/src/main/java/pro/taskana/rest/WorkbasketController.java

@@ -1,4 +1,7 @@
 package pro.taskana.rest;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -8,18 +11,30 @@ import org.springframework.hateoas.Link;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import pro.taskana.*;
+import pro.taskana.BaseQuery;
-import pro.taskana.exceptions.*;
+import pro.taskana.Workbasket;
-import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.WorkbasketAccessItem;
-import pro.taskana.model.WorkbasketType;
+import pro.taskana.WorkbasketQuery;
+import pro.taskana.WorkbasketService;
+import pro.taskana.WorkbasketSummary;
+import pro.taskana.exceptions.InvalidArgumentException;
+import pro.taskana.exceptions.InvalidRequestException;
+import pro.taskana.exceptions.InvalidWorkbasketException;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.impl.WorkbasketAuthorization;
+import pro.taskana.impl.WorkbasketType;
 import pro.taskana.rest.dto.WorkbasketSummaryDto;
 import pro.taskana.rest.mapper.WorkbasketSummaryMapper;
 import pro.taskana.security.CurrentUserContext;
 
-import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
-
 @RestController
 @RequestMapping(path = "/v1/workbaskets", produces = {MediaType.APPLICATION_JSON_VALUE})
 public class WorkbasketController {
@@ -37,9 +52,9 @@ public class WorkbasketController {
     @Autowired
     private WorkbasketSummaryMapper workbasketSummaryMapper;
 
-
     @RequestMapping(method = RequestMethod.GET)
-    public ResponseEntity<List<WorkbasketSummaryDto>> GetWorkbaskets(@RequestParam(value = "sortBy", defaultValue = "name", required = false) String sortBy ,
+    public ResponseEntity<List<WorkbasketSummaryDto>> GetWorkbaskets(
+        @RequestParam(value = "sortBy", defaultValue = "name", required = false) String sortBy,
         @RequestParam(value = "order", defaultValue = "asc", required = false) String order,
         @RequestParam(value = "name", defaultValue = "", required = false) String name,
         @RequestParam(value = "nameLike", defaultValue = "", required = false) String nameLike,
@@ -67,9 +82,10 @@ public class WorkbasketController {
             return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
         }
 
-
+        return new ResponseEntity<>(workbasketsSummary.stream()
-        return new ResponseEntity<>(workbasketsSummary.stream().map(workbasket -> workbasketSummaryMapper.convertToDto(workbasket))
+            .map(workbasket -> workbasketSummaryMapper.convertToDto(workbasket))
-                                                               .map(WorkbasketController::WorkbasketSummaryLink).collect(Collectors.toList()), HttpStatus.OK);
+            .map(WorkbasketController::WorkbasketSummaryLink)
+            .collect(Collectors.toList()), HttpStatus.OK);
     }
 
     @RequestMapping(value = "/{workbasketid}")
@@ -133,9 +149,10 @@ public class WorkbasketController {
         return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
     }
 
-
     private void AddAuthorization(WorkbasketQuery query, String requiredPermission) throws InvalidArgumentException {
-       if (requiredPermission.isEmpty()) {return;}
+        if (requiredPermission.isEmpty()) {
+            return;
+        }
 
         String[] accessIds = GetCurrentUserAccessIds();
         for (String authorization : Arrays.asList(requiredPermission.split(","))) {
@@ -202,8 +219,8 @@ public class WorkbasketController {
         }
     }
 
-
+    private void AddSortByQuery(WorkbasketQuery query, String sortBy, String order)
-    private void AddSortByQuery(WorkbasketQuery query, String sortBy, String order) throws InvalidRequestException, InvalidArgumentException {
+        throws InvalidRequestException, InvalidArgumentException {
         BaseQuery.SortDirection sortDirection = GetSortDirecction(order);
 
         if (sortBy.equals(NAME)) {
@@ -226,16 +243,20 @@ public class WorkbasketController {
         return BaseQuery.SortDirection.ASCENDING;
     }
 
-
     private void AddFilterQuery(WorkbasketQuery query,
         String name, String nameLike,
         String descLike, String owner,
         String ownerLike, String type) throws NotAuthorizedException, InvalidArgumentException {
-        if(!name.isEmpty())query.nameIn(name);
+        if (!name.isEmpty())
-        if(!nameLike.isEmpty())query.nameLike(LIKE + nameLike + LIKE);
+            query.nameIn(name);
-        if(!owner.isEmpty())query.ownerIn(owner);
+        if (!nameLike.isEmpty())
-        if(!ownerLike.isEmpty())query.ownerLike(LIKE + ownerLike + LIKE);
+            query.nameLike(LIKE + nameLike + LIKE);
-        if(!descLike.isEmpty())query.descriptionLike(LIKE + descLike + LIKE);
+        if (!owner.isEmpty())
+            query.ownerIn(owner);
+        if (!ownerLike.isEmpty())
+            query.ownerLike(LIKE + ownerLike + LIKE);
+        if (!descLike.isEmpty())
+            query.descriptionLike(LIKE + descLike + LIKE);
         switch (type) {
             case "PERSONAL":
                 query.typeIn(WorkbasketType.PERSONAL);

rest/src/main/java/pro/taskana/rest/dto/WorkbasketSummaryDto.java

@@ -1,7 +1,8 @@
 package pro.taskana.rest.dto;
 
 import org.springframework.hateoas.ResourceSupport;
-import pro.taskana.model.WorkbasketType;
+
+import pro.taskana.impl.WorkbasketType;
 
 public class WorkbasketSummaryDto extends ResourceSupport {
 

rest/src/main/java/pro/taskana/rest/query/TaskFilter.java

@@ -14,7 +14,7 @@ import pro.taskana.TaskService;
 import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
-import pro.taskana.model.TaskState;
+import pro.taskana.impl.TaskState;
 
 @Component
 public class TaskFilter {