nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Marcel Lengl 2018-02-15 12:18:23 +01:00 committed by BerndBreier
parent df91aa28ae
commit 6a644b7db2
84 changed files with 254 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

2
lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java
View File

@ -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 {

4
lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java
View File

@ -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.model.WorkbasketType;
import pro.taskana.impl.ObjectReference;
import pro.taskana.impl.WorkbasketType;
@Path("/test")
public class TaskanaRestTest {

2
lib/taskana-core/src/main/java/pro/taskana/Attachment.java
View File

@ -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.

2
lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java
View File

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

4
lib/taskana-core/src/main/java/pro/taskana/Task.java
View File

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

6
lib/taskana-core/src/main/java/pro/taskana/TaskMonitorService.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/TaskService.java
View File

@ -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.

4
lib/taskana-core/src/main/java/pro/taskana/TaskSummary.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/Workbasket.java
View File

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

4
lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java
View File

@ -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.

2
lib/taskana-core/src/main/java/pro/taskana/WorkbasketSummary.java
View File

@ -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

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

@ -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.

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

@ -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_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryClassifications";
private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryClassification";
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;

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

@ -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.

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

@ -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

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

@ -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.
*/

2
lib/taskana-core/src/main/java/pro/taskana/model/MonitorQueryItem.java → lib/taskana-core/src/main/java/pro/taskana/impl/MonitorQueryItem.java
View File

@ -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.

2
lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java → lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReference.java
View File

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

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

@ -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_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryObjectReferences";
private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryObjectReference";
private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryObjectReferences";
private static final Logger LOGGER = LoggerFactory.getLogger(ObjectReferenceQueryImpl.class);
private TaskanaEngineImpl taskanaEngineImpl;

2
lib/taskana-core/src/main/java/pro/taskana/model/Report.java → lib/taskana-core/src/main/java/pro/taskana/impl/Report.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/model/ReportLine.java → lib/taskana-core/src/main/java/pro/taskana/impl/ReportLine.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItem.java → lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItem.java
View File

@ -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

2
lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItemDefinition.java → lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItemDefinition.java
View File

@ -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

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

@ -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.

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

@ -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.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;
import pro.taskana.mappings.TaskMonitorMapper;
/**
* This is the implementation of TaskMonitorService.

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

@ -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_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryTasks";
private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryTasks";
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;

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

@ -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.model.TaskState;
import pro.taskana.model.WorkbasketAuthorization;
import pro.taskana.model.mappings.AttachmentMapper;
import pro.taskana.model.mappings.TaskMapper;
import pro.taskana.mappings.AttachmentMapper;
import pro.taskana.mappings.TaskMapper;
import pro.taskana.security.CurrentUserContext;
/**

2
lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java → lib/taskana-core/src/main/java/pro/taskana/impl/TaskState.java
View File

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

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

@ -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.

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

@ -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.model.mappings.ClassificationMapper;
import pro.taskana.model.mappings.DistributionTargetMapper;
import pro.taskana.model.mappings.ObjectReferenceMapper;
import pro.taskana.model.mappings.QueryMapper;
import pro.taskana.model.mappings.TaskMapper;
import pro.taskana.model.mappings.TaskMonitorMapper;
import pro.taskana.model.mappings.WorkbasketAccessMapper;
import pro.taskana.model.mappings.WorkbasketMapper;
import pro.taskana.mappings.AttachmentMapper;
import pro.taskana.mappings.ClassificationMapper;
import pro.taskana.mappings.DistributionTargetMapper;
import pro.taskana.mappings.ObjectReferenceMapper;
import pro.taskana.mappings.QueryMapper;
import pro.taskana.mappings.TaskMapper;
import pro.taskana.mappings.TaskMonitorMapper;
import pro.taskana.mappings.WorkbasketAccessMapper;
import pro.taskana.mappings.WorkbasketMapper;
/**
* This is the implementation of TaskanaEngine.

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

@ -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_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryWorkbasketAccessItems";
private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryWorkbasketAccessItem";
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;

2
lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java → lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAuthorization.java
View File

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

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

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

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

@ -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_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryWorkbaskets";
private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryWorkbasket";
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;

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

@ -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.model.mappings.DistributionTargetMapper;
import pro.taskana.model.mappings.WorkbasketAccessMapper;
import pro.taskana.model.mappings.WorkbasketMapper;
import pro.taskana.mappings.DistributionTargetMapper;
import pro.taskana.mappings.WorkbasketAccessMapper;
import pro.taskana.mappings.WorkbasketMapper;
import pro.taskana.security.CurrentUserContext;
/**

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

@ -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.

2
lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketType.java → lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketType.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/model/mappings/AttachmentMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/AttachmentMapper.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java
View File

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

2
lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/DistributionTargetMapper.java
View File

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

5
lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java
View File

@ -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.
*/

12
lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java
View File

@ -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 CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByKeyAndDomain";
String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById";
String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.model.mappings.WorkbasketMapper.findSummaryByKey";
String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.mappings.ClassificationMapper.findByKeyAndDomain";
String CLASSIFICATION_FINDBYID = "pro.taskana.mappings.ClassificationMapper.findById";
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 "

12
lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMapper.java
View File

@ -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 CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByKeyAndDomain";
String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.model.mappings.WorkbasketMapper.findSummaryByKey";
String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById";
String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.mappings.ClassificationMapper.findByKeyAndDomain";
String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.mappings.WorkbasketMapper.findSummaryByKey";
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 "

6
lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMonitorMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMonitorMapper.java
View File

@ -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.model.TaskState;
import pro.taskana.impl.MonitorQueryItem;
import pro.taskana.impl.TaskState;
/**
* This class is the mybatis mapping of task monitoring.

2
lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketAccessMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketAccessMapper.java
View File

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

4
lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java → lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java
View File

@ -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.

2
lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java
View File

@ -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.

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;
/**

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;
/**

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

@ -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.model.WorkbasketType;
import pro.taskana.impl.WorkbasketAuthorization;
import pro.taskana.impl.WorkbasketType;
import pro.taskana.security.JAASRunner;
import pro.taskana.security.WithAccessId;

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

@ -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;
/**

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

@ -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;

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

@ -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;

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

@ -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.

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

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

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

@ -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.

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

@ -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.

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

@ -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.model.Report;
import pro.taskana.model.ReportLineItemDefinition;
import pro.taskana.model.TaskState;
import pro.taskana.model.mappings.ObjectReferenceMapper;
import pro.taskana.model.mappings.TaskMonitorMapper;
import pro.taskana.mappings.ObjectReferenceMapper;
import pro.taskana.mappings.TaskMonitorMapper;
/**
* Unit Test for TaskMonitorServiceImpl.

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

@ -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.

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

@ -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.model.TaskState;
import pro.taskana.model.WorkbasketAuthorization;
import pro.taskana.model.mappings.AttachmentMapper;
import pro.taskana.model.mappings.ObjectReferenceMapper;
import pro.taskana.model.mappings.TaskMapper;
import pro.taskana.mappings.AttachmentMapper;
import pro.taskana.mappings.ObjectReferenceMapper;
import pro.taskana.mappings.TaskMapper;
import pro.taskana.security.CurrentUserContext;
/**

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

@ -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.model.WorkbasketType;
import pro.taskana.model.mappings.DistributionTargetMapper;
import pro.taskana.model.mappings.WorkbasketAccessMapper;
import pro.taskana.model.mappings.WorkbasketMapper;
import pro.taskana.mappings.DistributionTargetMapper;
import pro.taskana.mappings.WorkbasketAccessMapper;
import pro.taskana.mappings.WorkbasketMapper;
/**
* Unit Test for workbasketServiceImpl.

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

@ -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;

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

@ -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;

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

@ -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.model.WorkbasketType;
import pro.taskana.model.mappings.WorkbasketMapper;
import pro.taskana.mappings.WorkbasketMapper;
import pro.taskana.security.CurrentUserContext;
import pro.taskana.security.JAASRunner;
import pro.taskana.security.WithAccessId;

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

@ -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;

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

@ -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

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

@ -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)

2
lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java
View File

@ -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

2
rest/src/main/java/pro/taskana/rest/MonitorController.java
View File

@ -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 })

2
rest/src/main/java/pro/taskana/rest/TaskController.java
View File

@ -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

221
rest/src/main/java/pro/taskana/rest/WorkbasketController.java
View File

@ -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,28 +11,40 @@ 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.exceptions.*;
import pro.taskana.model.WorkbasketAuthorization;
import pro.taskana.model.WorkbasketType;
import pro.taskana.BaseQuery;
import pro.taskana.Workbasket;
import pro.taskana.WorkbasketAccessItem;
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 {
private static final String LIKE = "%";
private static final String NAME = "name";
private static final String KEY = "key";
private static final String DESCRIPTION = "description";
private static final String OWNER = "owner";
private static final String TYPE = "type";
private static final String KEY = "key";
private static final String DESCRIPTION = "description";
private static final String OWNER = "owner";
private static final String TYPE = "type";
private static final String DESC = "desc";
@Autowired
@ -37,22 +52,22 @@ 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 ,
@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 ,
@RequestParam(value = "descLike", defaultValue = "", required = false) String descLike ,
@RequestParam(value = "owner", defaultValue = "", required = false) String owner ,
@RequestParam(value = "ownerLike", defaultValue = "", required = false) String ownerLike ,
@RequestParam(value = "type", defaultValue = "", required = false) String type ,
@RequestParam(value = "requiredPermission", defaultValue = "", required = false) String requiredPermission) {
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,
@RequestParam(value = "descLike", defaultValue = "", required = false) String descLike,
@RequestParam(value = "owner", defaultValue = "", required = false) String owner,
@RequestParam(value = "ownerLike", defaultValue = "", required = false) String ownerLike,
@RequestParam(value = "type", defaultValue = "", required = false) String type,
@RequestParam(value = "requiredPermission", defaultValue = "", required = false) String requiredPermission) {
List<WorkbasketSummary> workbasketsSummary;
WorkbasketQuery query = workbasketService.createWorkbasketQuery();
try{
try {
AddSortByQuery(query, sortBy, order);
AddFilterQuery(query, name, nameLike, descLike, owner, ownerLike, type);
@ -67,9 +82,10 @@ public class WorkbasketController {
return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
}
return new ResponseEntity<>(workbasketsSummary.stream().map(workbasket -> workbasketSummaryMapper.convertToDto(workbasket))
.map(WorkbasketController::WorkbasketSummaryLink).collect(Collectors.toList()), HttpStatus.OK);
return new ResponseEntity<>(workbasketsSummary.stream()
.map(workbasket -> workbasketSummaryMapper.convertToDto(workbasket))
.map(WorkbasketController::WorkbasketSummaryLink)
.collect(Collectors.toList()), HttpStatus.OK);
}
@RequestMapping(value = "/{workbasketid}")
@ -133,68 +149,69 @@ 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();
String[] accessIds = GetCurrentUserAccessIds();
for (String authorization : Arrays.asList(requiredPermission.split(","))) {
try {
switch (authorization.trim()) {
case "READ":
query.accessIdsHavePermission(WorkbasketAuthorization.READ, accessIds);
break;
case "OPEN":
query.accessIdsHavePermission(WorkbasketAuthorization.OPEN, accessIds);
break;
case "APPEND":
query.accessIdsHavePermission(WorkbasketAuthorization.APPEND, accessIds);
break;
case "TRANSFER":
query.accessIdsHavePermission(WorkbasketAuthorization.TRANSFER, accessIds);
break;
case "DISTRIBUTE":
query.accessIdsHavePermission(WorkbasketAuthorization.DISTRIBUTE, accessIds);
break;
case "DELETE":
query.accessIdsHavePermission(WorkbasketAuthorization.DELETE, accessIds);
break;
case "CUSTOM_1":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_1, accessIds);
break;
case "CUSTOM_2":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_2, accessIds);
break;
case "CUSTOM_3":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_3, accessIds);
break;
case "CUSTOM_4":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_4, accessIds);
break;
case "CUSTOM_5":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_5, accessIds);
break;
case "CUSTOM_6":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_6, accessIds);
break;
case "CUSTOM_7":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_7, accessIds);
break;
case "CUSTOM_8":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_8, accessIds);
break;
case "CUSTOM_9":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_9, accessIds);
break;
case "CUSTOM_10":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_10, accessIds);
break;
case "CUSTOM_11":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_11, accessIds);
break;
case "CUSTOM_12":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_12, accessIds);
break;
case "READ":
query.accessIdsHavePermission(WorkbasketAuthorization.READ, accessIds);
break;
case "OPEN":
query.accessIdsHavePermission(WorkbasketAuthorization.OPEN, accessIds);
break;
case "APPEND":
query.accessIdsHavePermission(WorkbasketAuthorization.APPEND, accessIds);
break;
case "TRANSFER":
query.accessIdsHavePermission(WorkbasketAuthorization.TRANSFER, accessIds);
break;
case "DISTRIBUTE":
query.accessIdsHavePermission(WorkbasketAuthorization.DISTRIBUTE, accessIds);
break;
case "DELETE":
query.accessIdsHavePermission(WorkbasketAuthorization.DELETE, accessIds);
break;
case "CUSTOM_1":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_1, accessIds);
break;
case "CUSTOM_2":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_2, accessIds);
break;
case "CUSTOM_3":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_3, accessIds);
break;
case "CUSTOM_4":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_4, accessIds);
break;
case "CUSTOM_5":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_5, accessIds);
break;
case "CUSTOM_6":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_6, accessIds);
break;
case "CUSTOM_7":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_7, accessIds);
break;
case "CUSTOM_8":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_8, accessIds);
break;
case "CUSTOM_9":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_9, accessIds);
break;
case "CUSTOM_10":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_10, accessIds);
break;
case "CUSTOM_11":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_11, accessIds);
break;
case "CUSTOM_12":
query.accessIdsHavePermission(WorkbasketAuthorization.CUSTOM_12, accessIds);
break;
}
} catch (InvalidArgumentException e) {
e.printStackTrace();
@ -202,40 +219,44 @@ public class WorkbasketController {
}
}
private void AddSortByQuery(WorkbasketQuery query, String sortBy, String order) throws InvalidRequestException, InvalidArgumentException {
private void AddSortByQuery(WorkbasketQuery query, String sortBy, String order)
throws InvalidRequestException, InvalidArgumentException {
BaseQuery.SortDirection sortDirection = GetSortDirecction(order);
if (sortBy.equals(NAME)) {
query.orderByKey(sortDirection);
} else if (sortBy.equals(KEY)){
} else if (sortBy.equals(KEY)) {
query.orderByKey(sortDirection);
} else if (sortBy.equals(DESCRIPTION)){
} else if (sortBy.equals(DESCRIPTION)) {
query.orderByDescription(sortDirection);
} else if (sortBy.equals(OWNER)){
} else if (sortBy.equals(OWNER)) {
query.orderByOwner(sortDirection);
} else if (sortBy.equals(TYPE)){
} else if (sortBy.equals(TYPE)) {
query.orderByType(sortDirection);
}
}
private BaseQuery.SortDirection GetSortDirecction(String order) throws InvalidRequestException {
if (order.equals(DESC)){
if (order.equals(DESC)) {
return BaseQuery.SortDirection.DESCENDING;
}
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(!nameLike.isEmpty())query.nameLike(LIKE + nameLike + LIKE);
if(!owner.isEmpty())query.ownerIn(owner);
if(!ownerLike.isEmpty())query.ownerLike(LIKE + ownerLike + LIKE);
if(!descLike.isEmpty())query.descriptionLike(LIKE + descLike + LIKE);
String name, String nameLike,
String descLike, String owner,
String ownerLike, String type) throws NotAuthorizedException, InvalidArgumentException {
if (!name.isEmpty())
query.nameIn(name);
if (!nameLike.isEmpty())
query.nameLike(LIKE + nameLike + 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);
@ -248,7 +269,7 @@ public class WorkbasketController {
}
}
private String[] GetCurrentUserAccessIds() throws InvalidArgumentException{
private String[] GetCurrentUserAccessIds() throws InvalidArgumentException {
String[] accessIds;
List<String> ucAccessIds = CurrentUserContext.getAccessIds();
if (ucAccessIds != null && !ucAccessIds.isEmpty()) {
@ -260,7 +281,7 @@ public class WorkbasketController {
return accessIds;
}
private static WorkbasketSummaryDto WorkbasketSummaryLink(WorkbasketSummaryDto workbasketSummaryDto){
private static WorkbasketSummaryDto WorkbasketSummaryLink(WorkbasketSummaryDto workbasketSummaryDto) {
Link selfLink = linkTo(WorkbasketController.class).slash(workbasketSummaryDto.getWorkbasketId()).withSelfRel();
workbasketSummaryDto.add(selfLink);

5
rest/src/main/java/pro/taskana/rest/dto/WorkbasketSummaryDto.java
View File

@ -1,9 +1,10 @@
package pro.taskana.rest.dto;
import org.springframework.hateoas.ResourceSupport;
import pro.taskana.model.WorkbasketType;
public class WorkbasketSummaryDto extends ResourceSupport{
import pro.taskana.impl.WorkbasketType;
public class WorkbasketSummaryDto extends ResourceSupport {
private String workbasketId;
private String key;

2
rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
View File

@ -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 {