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

TSK-865: extracted TaskanaEngine.Internal to dedicated Interface file

This commit is contained in:
Mustapha Zorgati 2019-10-18 16:43:46 +02:00
parent 06bfe215d4
commit 8bcde0a40b
37 changed files with 265 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
View File

@ -2,11 +2,8 @@ package pro.taskana;
import java.sql.SQLException; import java.sql.SQLException;
import org.apache.ibatis.session.SqlSession;
import pro.taskana.configuration.TaskanaEngineConfiguration; import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.history.HistoryEventProducer;
/** /**
* The TaskanaEngine represents an overall set of all needed services. * The TaskanaEngine represents an overall set of all needed services.
@ -127,59 +124,4 @@ public interface TaskanaEngine {
EXPLICIT EXPLICIT
} }
/**
* FOR INTERNAL USE ONLY.
*
* Contains all actions which are necessary within taskana.
*/
interface Internal {
/**
* Opens the connection to the database. Has to be called at the begin of each Api call that accesses the database
*/
void openConnection();
/**
* Returns the database connection into the pool. In the case of nested calls, simply pops the latest session from
* the session stack. Closes the connection if the session stack is empty. In mode AUTOCOMMIT commits before the
* connection is closed. To be called at the end of each Api call that accesses the database
*/
void returnConnection();
/**
* Initializes the SqlSessionManager.
*/
void initSqlSession();
/**
* Returns true if the given domain does exist in the configuration.
*
* @param domain
* the domain specified in the configuration
* @return <code>true</code> if the domain exists
*/
boolean domainExists(String domain);
/**
* retrieve the SqlSession used by taskana.
*
* @return the myBatis SqlSession object used by taskana
*/
SqlSession getSqlSession();
/**
* Retrieve TaskanaEngine.
* @return The nested TaskanaEngine.
*/
TaskanaEngine getEngine();
/**
* Retrieve HistoryEventProducer.
*
* @return the HistoryEventProducer instance.
*/
HistoryEventProducer getHistoryEventProducer();
}
} }

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

@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.AbstractWorkbasketAccessItemQuery; import pro.taskana.AbstractWorkbasketAccessItemQuery;
import pro.taskana.AccessItemQueryColumnName; import pro.taskana.AccessItemQueryColumnName;
import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketAccessItem; import pro.taskana.WorkbasketAccessItem;
import pro.taskana.exceptions.TaskanaRuntimeException; import pro.taskana.exceptions.TaskanaRuntimeException;
import pro.taskana.impl.util.LoggerUtils; import pro.taskana.impl.util.LoggerUtils;
@ -33,11 +32,11 @@ abstract class AbstractWorkbasketAccessItemQueryImpl<Q extends AbstractWorkbaske
private String[] workbasketIdIn; private String[] workbasketIdIn;
private String[] idIn; private String[] idIn;
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private List<String> orderBy; private List<String> orderBy;
private List<String> orderColumns; private List<String> orderColumns;
AbstractWorkbasketAccessItemQueryImpl(TaskanaEngine.Internal taskanaEngine) { AbstractWorkbasketAccessItemQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
orderBy = new ArrayList<>(); orderBy = new ArrayList<>();
orderColumns = new ArrayList<>(); orderColumns = new ArrayList<>();

3
lib/taskana-core/src/main/java/pro/taskana/impl/CategoryReportBuilderImpl.java
View File

@ -5,7 +5,6 @@ import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
@ -24,7 +23,7 @@ public class CategoryReportBuilderImpl
private static final Logger LOGGER = LoggerFactory.getLogger(CategoryReport.Builder.class); private static final Logger LOGGER = LoggerFactory.getLogger(CategoryReport.Builder.class);
CategoryReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) { CategoryReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper); super(taskanaEngine, taskMonitorMapper);
} }

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

@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.ClassificationQuery; import pro.taskana.ClassificationQuery;
import pro.taskana.ClassificationQueryColumnName; import pro.taskana.ClassificationQueryColumnName;
import pro.taskana.ClassificationSummary; import pro.taskana.ClassificationSummary;
import pro.taskana.TaskanaEngine;
import pro.taskana.TimeInterval; import pro.taskana.TimeInterval;
import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.TaskanaRuntimeException; import pro.taskana.exceptions.TaskanaRuntimeException;
@ -29,7 +28,7 @@ public class ClassificationQueryImpl implements ClassificationQuery {
private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryClassifications"; private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryClassifications";
private static final String LINK_TO_VALUEMAPPER = "pro.taskana.mappings.QueryMapper.queryClassificationColumnValues"; private static final String LINK_TO_VALUEMAPPER = "pro.taskana.mappings.QueryMapper.queryClassificationColumnValues";
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationQueryImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationQueryImpl.class);
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private ClassificationQueryColumnName columnName; private ClassificationQueryColumnName columnName;
private String[] key; private String[] key;
private String[] idIn; private String[] idIn;
@ -68,7 +67,7 @@ public class ClassificationQueryImpl implements ClassificationQuery {
private List<String> orderBy; private List<String> orderBy;
private List<String> orderColumns; private List<String> orderColumns;
ClassificationQueryImpl(TaskanaEngine.Internal taskanaEngine) { ClassificationQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.orderBy = new ArrayList<>(); this.orderBy = new ArrayList<>();
this.orderColumns = new ArrayList<>(); this.orderColumns = new ArrayList<>();

3
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationReportBuilderImpl.java
View File

@ -5,7 +5,6 @@ import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
@ -26,7 +25,7 @@ public class ClassificationReportBuilderImpl
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationReport.Builder.class); private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationReport.Builder.class);
ClassificationReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) { ClassificationReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper); super(taskanaEngine, taskMonitorMapper);
} }

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

@ -19,7 +19,6 @@ import pro.taskana.ClassificationQuery;
import pro.taskana.ClassificationService; import pro.taskana.ClassificationService;
import pro.taskana.ClassificationSummary; import pro.taskana.ClassificationSummary;
import pro.taskana.TaskSummary; import pro.taskana.TaskSummary;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.ClassificationAlreadyExistException; import pro.taskana.exceptions.ClassificationAlreadyExistException;
import pro.taskana.exceptions.ClassificationInUseException; import pro.taskana.exceptions.ClassificationInUseException;
@ -43,9 +42,9 @@ public class ClassificationServiceImpl implements ClassificationService {
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationServiceImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationServiceImpl.class);
private ClassificationMapper classificationMapper; private ClassificationMapper classificationMapper;
private TaskMapper taskMapper; private TaskMapper taskMapper;
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
ClassificationServiceImpl(TaskanaEngine.Internal taskanaEngine, ClassificationMapper classificationMapper, ClassificationServiceImpl(InternalTaskanaEngine taskanaEngine, ClassificationMapper classificationMapper,
TaskMapper taskMapper) { TaskMapper taskMapper) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.classificationMapper = classificationMapper; this.classificationMapper = classificationMapper;

3
lib/taskana-core/src/main/java/pro/taskana/impl/CustomFieldValueReportBuilderImpl.java
View File

@ -6,7 +6,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.CustomField; import pro.taskana.CustomField;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
@ -27,7 +26,7 @@ public class CustomFieldValueReportBuilderImpl
private CustomField customField; private CustomField customField;
CustomFieldValueReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper, CustomFieldValueReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper,
CustomField customField) { CustomField customField) {
super(taskanaEngine, taskMonitorMapper); super(taskanaEngine, taskMonitorMapper);
this.customField = customField; this.customField = customField;

61
lib/taskana-core/src/main/java/pro/taskana/impl/InternalTaskanaEngine.java Normal file
View File

@ -0,0 +1,61 @@
package pro.taskana.impl;
import org.apache.ibatis.session.SqlSession;
import pro.taskana.TaskanaEngine;
import pro.taskana.history.HistoryEventProducer;
/**
* FOR INTERNAL USE ONLY.
*
* Contains all actions which are necessary within taskana.
*/
public interface InternalTaskanaEngine {
/**
* Opens the connection to the database. Has to be called at the begin of each Api call that accesses the database
*/
void openConnection();
/**
* Returns the database connection into the pool. In the case of nested calls, simply pops the latest session from
* the session stack. Closes the connection if the session stack is empty. In mode AUTOCOMMIT commits before the
* connection is closed. To be called at the end of each Api call that accesses the database
*/
void returnConnection();
/**
* Initializes the SqlSessionManager.
*/
void initSqlSession();
/**
* Returns true if the given domain does exist in the configuration.
*
* @param domain
* the domain specified in the configuration
* @return <code>true</code> if the domain exists
*/
boolean domainExists(String domain);
/**
* retrieve the SqlSession used by taskana.
*
* @return the myBatis SqlSession object used by taskana
*/
SqlSession getSqlSession();
/**
* Retrieve TaskanaEngine.
* @return The nested TaskanaEngine.
*/
TaskanaEngine getEngine();
/**
* Retrieve HistoryEventProducer.
*
* @return the HistoryEventProducer instance.
*/
HistoryEventProducer getHistoryEventProducer();
}

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

@ -7,7 +7,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.JobService; import pro.taskana.JobService;
import pro.taskana.TaskanaEngine;
import pro.taskana.jobs.ScheduledJob; import pro.taskana.jobs.ScheduledJob;
import pro.taskana.mappings.JobMapper; import pro.taskana.mappings.JobMapper;
@ -21,9 +20,9 @@ public class JobServiceImpl implements JobService {
private static final Logger LOGGER = LoggerFactory.getLogger(JobServiceImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(JobServiceImpl.class);
private JobMapper jobMapper; private JobMapper jobMapper;
private TaskanaEngine.Internal taskanaEngineImpl; private InternalTaskanaEngine taskanaEngineImpl;
public JobServiceImpl(TaskanaEngine.Internal taskanaEngine, JobMapper jobMapper) { public JobServiceImpl(InternalTaskanaEngine taskanaEngine, JobMapper jobMapper) {
this.taskanaEngineImpl = taskanaEngine; this.taskanaEngineImpl = taskanaEngine;
this.jobMapper = jobMapper; this.jobMapper = jobMapper;
} }

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

@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.ObjectReference; import pro.taskana.ObjectReference;
import pro.taskana.ObjectReferenceQuery; import pro.taskana.ObjectReferenceQuery;
import pro.taskana.ObjectReferenceQueryColumnName; import pro.taskana.ObjectReferenceQueryColumnName;
import pro.taskana.TaskanaEngine;
import pro.taskana.exceptions.TaskanaRuntimeException; import pro.taskana.exceptions.TaskanaRuntimeException;
import pro.taskana.impl.util.LoggerUtils; import pro.taskana.impl.util.LoggerUtils;
@ -27,7 +26,7 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery {
private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryObjectReferences"; private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryObjectReferences";
private static final String LINK_TO_VALUEMAPPER = "pro.taskana.mappings.QueryMapper.queryObjectReferenceColumnValues"; private static final String LINK_TO_VALUEMAPPER = "pro.taskana.mappings.QueryMapper.queryObjectReferenceColumnValues";
private static final Logger LOGGER = LoggerFactory.getLogger(ObjectReferenceQueryImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(ObjectReferenceQueryImpl.class);
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private ObjectReferenceQueryColumnName columnName; private ObjectReferenceQueryColumnName columnName;
private String[] company; private String[] company;
private String[] system; private String[] system;
@ -36,7 +35,7 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery {
private String[] value; private String[] value;
private List<String> orderBy; private List<String> orderBy;
ObjectReferenceQueryImpl(TaskanaEngine.Internal taskanaEngine) { ObjectReferenceQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.orderBy = new ArrayList<>(); this.orderBy = new ArrayList<>();
} }

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

@ -2,7 +2,6 @@ package pro.taskana.impl;
import pro.taskana.CustomField; import pro.taskana.CustomField;
import pro.taskana.TaskMonitorService; import pro.taskana.TaskMonitorService;
import pro.taskana.TaskanaEngine;
import pro.taskana.mappings.TaskMonitorMapper; import pro.taskana.mappings.TaskMonitorMapper;
import pro.taskana.report.CategoryReport; import pro.taskana.report.CategoryReport;
import pro.taskana.report.ClassificationReport; import pro.taskana.report.ClassificationReport;
@ -16,10 +15,10 @@ import pro.taskana.report.WorkbasketReport;
*/ */
public class TaskMonitorServiceImpl implements TaskMonitorService { public class TaskMonitorServiceImpl implements TaskMonitorService {
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private TaskMonitorMapper taskMonitorMapper; private TaskMonitorMapper taskMonitorMapper;
TaskMonitorServiceImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) { TaskMonitorServiceImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(); super();
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.taskMonitorMapper = taskMonitorMapper; this.taskMonitorMapper = taskMonitorMapper;

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

@ -16,7 +16,6 @@ import pro.taskana.TaskQuery;
import pro.taskana.TaskQueryColumnName; import pro.taskana.TaskQueryColumnName;
import pro.taskana.TaskState; import pro.taskana.TaskState;
import pro.taskana.TaskSummary; import pro.taskana.TaskSummary;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.TimeInterval; import pro.taskana.TimeInterval;
import pro.taskana.WorkbasketPermission; import pro.taskana.WorkbasketPermission;
@ -41,7 +40,7 @@ public class TaskQueryImpl implements TaskQuery {
private static final String TIME_INTERVAL = "TimeInterval "; private static final String TIME_INTERVAL = "TimeInterval ";
private static final String IS_INVALID = " is invalid."; private static final String IS_INVALID = " is invalid.";
private static final Logger LOGGER = LoggerFactory.getLogger(TaskQueryImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(TaskQueryImpl.class);
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private TaskServiceImpl taskService; private TaskServiceImpl taskService;
private TaskQueryColumnName columnName; private TaskQueryColumnName columnName;
private String[] nameIn; private String[] nameIn;
@ -146,7 +145,7 @@ public class TaskQueryImpl implements TaskQuery {
private boolean addClassificationNameToSelectClauseForOrdering = false; private boolean addClassificationNameToSelectClauseForOrdering = false;
private boolean addAttachmentClassificationNameToSelectClauseForOrdering = false; private boolean addAttachmentClassificationNameToSelectClauseForOrdering = false;
TaskQueryImpl(TaskanaEngine.Internal taskanaEngine) { TaskQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.taskService = (TaskServiceImpl) taskanaEngine.getEngine().getTaskService(); this.taskService = (TaskServiceImpl) taskanaEngine.getEngine().getTaskService();
this.orderBy = new ArrayList<>(); this.orderBy = new ArrayList<>();

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

@ -28,7 +28,6 @@ import pro.taskana.TaskQuery;
import pro.taskana.TaskService; import pro.taskana.TaskService;
import pro.taskana.TaskState; import pro.taskana.TaskState;
import pro.taskana.TaskSummary; import pro.taskana.TaskSummary;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.Workbasket; import pro.taskana.Workbasket;
import pro.taskana.WorkbasketPermission; import pro.taskana.WorkbasketPermission;
@ -84,14 +83,14 @@ public class TaskServiceImpl implements TaskService {
private static final Set<String> ALLOWED_KEYS = private static final Set<String> ALLOWED_KEYS =
IntStream.rangeClosed(1, 16).mapToObj(String::valueOf).collect(Collectors.toSet()); IntStream.rangeClosed(1, 16).mapToObj(String::valueOf).collect(Collectors.toSet());
private DaysToWorkingDaysConverter converter; private DaysToWorkingDaysConverter converter;
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private WorkbasketService workbasketService; private WorkbasketService workbasketService;
private ClassificationService classificationService; private ClassificationService classificationService;
private TaskMapper taskMapper; private TaskMapper taskMapper;
private AttachmentMapper attachmentMapper; private AttachmentMapper attachmentMapper;
private HistoryEventProducer historyEventProducer; private HistoryEventProducer historyEventProducer;
TaskServiceImpl(TaskanaEngine.Internal taskanaEngine, TaskMapper taskMapper, TaskServiceImpl(InternalTaskanaEngine taskanaEngine, TaskMapper taskMapper,
AttachmentMapper attachmentMapper) { AttachmentMapper attachmentMapper) {
super(); super();
try { try {

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

@ -6,7 +6,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.TaskState; import pro.taskana.TaskState;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.report.item.TaskQueryItem; import pro.taskana.impl.report.item.TaskQueryItem;
@ -19,12 +18,12 @@ import pro.taskana.report.TaskStatusReport;
public class TaskStatusReportBuilderImpl implements TaskStatusReport.Builder { public class TaskStatusReportBuilderImpl implements TaskStatusReport.Builder {
private static final Logger LOGGER = LoggerFactory.getLogger(TaskStatusReportBuilderImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(TaskStatusReportBuilderImpl.class);
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private TaskMonitorMapper taskMonitorMapper; private TaskMonitorMapper taskMonitorMapper;
private List<String> domains; private List<String> domains;
private List<TaskState> states; private List<TaskState> states;
TaskStatusReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) { TaskStatusReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.taskMonitorMapper = taskMonitorMapper; this.taskMonitorMapper = taskMonitorMapper;
} }

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

@ -63,14 +63,14 @@ public class TaskanaEngineImpl implements TaskanaEngine {
protected ConnectionManagementMode mode = ConnectionManagementMode.PARTICIPATE; protected ConnectionManagementMode mode = ConnectionManagementMode.PARTICIPATE;
protected java.sql.Connection connection = null; protected java.sql.Connection connection = null;
private HistoryEventProducer historyEventProducer; private HistoryEventProducer historyEventProducer;
private Internal internal; private InternalTaskanaEngineImpl internalTaskanaEngineImpl;
protected TaskanaEngineImpl(TaskanaEngineConfiguration taskanaEngineConfiguration) { protected TaskanaEngineImpl(TaskanaEngineConfiguration taskanaEngineConfiguration) {
this.taskanaEngineConfiguration = taskanaEngineConfiguration; this.taskanaEngineConfiguration = taskanaEngineConfiguration;
createTransactionFactory(taskanaEngineConfiguration.getUseManagedTransactions()); createTransactionFactory(taskanaEngineConfiguration.getUseManagedTransactions());
this.sessionManager = createSqlSessionManager(); this.sessionManager = createSqlSessionManager();
historyEventProducer = HistoryEventProducer.getInstance(taskanaEngineConfiguration); historyEventProducer = HistoryEventProducer.getInstance(taskanaEngineConfiguration);
this.internal = new Internal(); this.internalTaskanaEngineImpl = new InternalTaskanaEngineImpl();
} }
public static TaskanaEngine createTaskanaEngine(TaskanaEngineConfiguration taskanaEngineConfiguration) { public static TaskanaEngine createTaskanaEngine(TaskanaEngineConfiguration taskanaEngineConfiguration) {
@ -132,21 +132,21 @@ public class TaskanaEngineImpl implements TaskanaEngine {
@Override @Override
public TaskService getTaskService() { public TaskService getTaskService() {
SqlSession session = this.sessionManager; SqlSession session = this.sessionManager;
return new TaskServiceImpl(internal, session.getMapper(TaskMapper.class), return new TaskServiceImpl(internalTaskanaEngineImpl, session.getMapper(TaskMapper.class),
session.getMapper(AttachmentMapper.class)); session.getMapper(AttachmentMapper.class));
} }
@Override @Override
public TaskMonitorService getTaskMonitorService() { public TaskMonitorService getTaskMonitorService() {
SqlSession session = this.sessionManager; SqlSession session = this.sessionManager;
return new TaskMonitorServiceImpl(internal, return new TaskMonitorServiceImpl(internalTaskanaEngineImpl,
session.getMapper(TaskMonitorMapper.class)); session.getMapper(TaskMonitorMapper.class));
} }
@Override @Override
public WorkbasketService getWorkbasketService() { public WorkbasketService getWorkbasketService() {
SqlSession session = this.sessionManager; SqlSession session = this.sessionManager;
return new WorkbasketServiceImpl(internal, return new WorkbasketServiceImpl(internalTaskanaEngineImpl,
session.getMapper(WorkbasketMapper.class), session.getMapper(WorkbasketMapper.class),
session.getMapper(DistributionTargetMapper.class), session.getMapper(DistributionTargetMapper.class),
session.getMapper(WorkbasketAccessMapper.class)); session.getMapper(WorkbasketAccessMapper.class));
@ -155,14 +155,14 @@ public class TaskanaEngineImpl implements TaskanaEngine {
@Override @Override
public ClassificationService getClassificationService() { public ClassificationService getClassificationService() {
SqlSession session = this.sessionManager; SqlSession session = this.sessionManager;
return new ClassificationServiceImpl(internal, session.getMapper(ClassificationMapper.class), return new ClassificationServiceImpl(internalTaskanaEngineImpl, session.getMapper(ClassificationMapper.class),
session.getMapper(TaskMapper.class)); session.getMapper(TaskMapper.class));
} }
@Override @Override
public JobService getJobService() { public JobService getJobService() {
SqlSession session = this.sessionManager; SqlSession session = this.sessionManager;
return new JobServiceImpl(internal, session.getMapper(JobMapper.class)); return new JobServiceImpl(internalTaskanaEngineImpl, session.getMapper(JobMapper.class));
} }
@Override @Override
@ -309,7 +309,7 @@ public class TaskanaEngineImpl implements TaskanaEngine {
/** /**
* Internal Engine for internal operations. * Internal Engine for internal operations.
*/ */
private class Internal implements TaskanaEngine.Internal { private class InternalTaskanaEngineImpl implements InternalTaskanaEngine {
@Override @Override
public void openConnection() { public void openConnection() {

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

@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.CustomField; import pro.taskana.CustomField;
import pro.taskana.TaskState; import pro.taskana.TaskState;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
@ -33,7 +32,7 @@ abstract class TimeIntervalReportBuilderImpl<B extends TimeIntervalReportBuilder
private static final Logger LOGGER = LoggerFactory.getLogger(TimeIntervalReportBuilder.class); private static final Logger LOGGER = LoggerFactory.getLogger(TimeIntervalReportBuilder.class);
protected TaskanaEngine.Internal taskanaEngine; protected InternalTaskanaEngine taskanaEngine;
protected TaskMonitorMapper taskMonitorMapper; protected TaskMonitorMapper taskMonitorMapper;
protected List<H> columnHeaders; protected List<H> columnHeaders;
protected boolean inWorkingDays; protected boolean inWorkingDays;
@ -45,7 +44,7 @@ abstract class TimeIntervalReportBuilderImpl<B extends TimeIntervalReportBuilder
protected List<String> excludedClassificationIds; protected List<String> excludedClassificationIds;
protected Map<CustomField, String> customAttributeFilter; protected Map<CustomField, String> customAttributeFilter;
TimeIntervalReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) { TimeIntervalReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.taskMonitorMapper = taskMonitorMapper; this.taskMonitorMapper = taskMonitorMapper;
this.columnHeaders = Collections.emptyList(); this.columnHeaders = Collections.emptyList();

3
lib/taskana-core/src/main/java/pro/taskana/impl/TimestampReportBuilderImpl.java
View File

@ -10,7 +10,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.TaskState; import pro.taskana.TaskState;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
@ -31,7 +30,7 @@ public class TimestampReportBuilderImpl extends
private static final Logger LOGGER = LoggerFactory.getLogger(TimestampReport.Builder.class); private static final Logger LOGGER = LoggerFactory.getLogger(TimestampReport.Builder.class);
private List<Timestamp> status = Arrays.asList(Timestamp.CREATED, Timestamp.COMPLETED); private List<Timestamp> status = Arrays.asList(Timestamp.CREATED, Timestamp.COMPLETED);
TimestampReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) { TimestampReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper); super(taskanaEngine, taskMonitorMapper);
} }

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

@ -10,7 +10,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.AccessItemQueryColumnName; import pro.taskana.AccessItemQueryColumnName;
import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketAccessItem; import pro.taskana.WorkbasketAccessItem;
import pro.taskana.WorkbasketAccessItemQuery; import pro.taskana.WorkbasketAccessItemQuery;
import pro.taskana.exceptions.TaskanaRuntimeException; import pro.taskana.exceptions.TaskanaRuntimeException;
@ -33,11 +32,11 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
private String[] workbasketKeyLike; private String[] workbasketKeyLike;
private String[] idIn; private String[] idIn;
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private List<String> orderBy; private List<String> orderBy;
private List<String> orderColumns; private List<String> orderColumns;
WorkbasketAccessItemQueryImpl(TaskanaEngine.Internal taskanaEngine) { WorkbasketAccessItemQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
orderBy = new ArrayList<>(); orderBy = new ArrayList<>();
orderColumns = new ArrayList<>(); orderColumns = new ArrayList<>();

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

@ -9,7 +9,6 @@ import org.apache.ibatis.session.RowBounds;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.TimeInterval; import pro.taskana.TimeInterval;
import pro.taskana.WorkbasketPermission; import pro.taskana.WorkbasketPermission;
@ -70,7 +69,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
private String[] orgLevel4Like; private String[] orgLevel4Like;
private boolean markedForDeletion; private boolean markedForDeletion;
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private List<String> orderBy; private List<String> orderBy;
private List<String> orderColumns; private List<String> orderColumns;
private boolean joinWithAccessList; private boolean joinWithAccessList;
@ -78,7 +77,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
private boolean usedToAugmentTasks; private boolean usedToAugmentTasks;
private boolean callerRolesAndAccessIdsAlreadyHandled; private boolean callerRolesAndAccessIdsAlreadyHandled;
WorkbasketQueryImpl(TaskanaEngine.Internal taskanaEngine) { WorkbasketQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.orderBy = new ArrayList<>(); this.orderBy = new ArrayList<>();
this.orderColumns = new ArrayList<>(); this.orderColumns = new ArrayList<>();

3
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketReportBuilderImpl.java
View File

@ -5,7 +5,6 @@ import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedException;
@ -26,7 +25,7 @@ public class WorkbasketReportBuilderImpl
private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketReportBuilderImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketReportBuilderImpl.class);
private List<CombinedClassificationFilter> combinedClassificationFilter; private List<CombinedClassificationFilter> combinedClassificationFilter;
WorkbasketReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) { WorkbasketReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper); super(taskanaEngine, taskMonitorMapper);
} }

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

@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.BulkOperationResults; import pro.taskana.BulkOperationResults;
import pro.taskana.TaskState; import pro.taskana.TaskState;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.Workbasket; import pro.taskana.Workbasket;
import pro.taskana.WorkbasketAccessItem; import pro.taskana.WorkbasketAccessItem;
@ -43,12 +42,12 @@ public class WorkbasketServiceImpl implements WorkbasketService {
private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketServiceImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketServiceImpl.class);
private static final String ID_PREFIX_WORKBASKET = "WBI"; private static final String ID_PREFIX_WORKBASKET = "WBI";
private static final String ID_PREFIX_WORKBASKET_AUTHORIZATION = "WAI"; private static final String ID_PREFIX_WORKBASKET_AUTHORIZATION = "WAI";
private TaskanaEngine.Internal taskanaEngine; private InternalTaskanaEngine taskanaEngine;
private WorkbasketMapper workbasketMapper; private WorkbasketMapper workbasketMapper;
private DistributionTargetMapper distributionTargetMapper; private DistributionTargetMapper distributionTargetMapper;
private WorkbasketAccessMapper workbasketAccessMapper; private WorkbasketAccessMapper workbasketAccessMapper;
WorkbasketServiceImpl(TaskanaEngine.Internal taskanaEngine, WorkbasketMapper workbasketMapper, WorkbasketServiceImpl(InternalTaskanaEngine taskanaEngine, WorkbasketMapper workbasketMapper,
DistributionTargetMapper distributionTargetMapper, WorkbasketAccessMapper workbasketAccessMapper) { DistributionTargetMapper distributionTargetMapper, WorkbasketAccessMapper workbasketAccessMapper) {
this.taskanaEngine = taskanaEngine; this.taskanaEngine = taskanaEngine;
this.workbasketMapper = workbasketMapper; this.workbasketMapper = workbasketMapper;

36
lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
View File

@ -44,7 +44,7 @@ public class CategoryReportBuilderImplTest {
private TaskMonitorServiceImpl cut; private TaskMonitorServiceImpl cut;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private TaskanaEngine taskanaEngineMock; private TaskanaEngine taskanaEngineMock;
@ -58,7 +58,7 @@ public class CategoryReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null); when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null);
} }
@ -92,16 +92,16 @@ public class CategoryReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter) .customAttributeFilterIn(customAttributeFilter)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfCategories(any(), any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfCategories(any(), any(), any(), any(), any(), any(),
any()); any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -144,16 +144,16 @@ public class CategoryReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfCategories(any(), any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfCategories(any(), any(), any(), any(), any(), any(),
any()); any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -198,16 +198,16 @@ public class CategoryReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.listTaskIdsForSelectedItems(selectedItems); .listTaskIdsForSelectedItems(selectedItems);
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false)); .getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false));
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -259,16 +259,16 @@ public class CategoryReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1); .listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any()); .getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);

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

@ -15,7 +15,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.ClassificationSummary; import pro.taskana.ClassificationSummary;
import pro.taskana.TaskanaEngine;
/** /**
* Test for ClassificationQueryImpl. * Test for ClassificationQueryImpl.
@ -29,14 +28,14 @@ public class ClassificationQueryImplTest {
private ClassificationQueryImpl classificationQueryImpl; private ClassificationQueryImpl classificationQueryImpl;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternal; private InternalTaskanaEngine internalTaskanaEngine;
@Mock @Mock
private SqlSession sqlSession; private SqlSession sqlSession;
@Test @Test
public void should_ReturnList_when_BuilderIsUsed() { public void should_ReturnList_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
List<ClassificationSummary> result = classificationQueryImpl.nameIn("test", "asd", "blubber") List<ClassificationSummary> result = classificationQueryImpl.nameIn("test", "asd", "blubber")
@ -49,7 +48,7 @@ public class ClassificationQueryImplTest {
@Test @Test
public void should_ReturnListWithOffset_when_BuilderIsUsed() { public void should_ReturnListWithOffset_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>());
List<ClassificationSummary> result = classificationQueryImpl.nameIn("test", "asd", "blubber") List<ClassificationSummary> result = classificationQueryImpl.nameIn("test", "asd", "blubber")
@ -62,7 +61,7 @@ public class ClassificationQueryImplTest {
@Test @Test
public void should_ReturnOneItem_when_BuilderIsUsed() { public void should_ReturnOneItem_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectOne(any(), any())).thenReturn(new ClassificationSummaryImpl()); when(sqlSession.selectOne(any(), any())).thenReturn(new ClassificationSummaryImpl());
ClassificationSummary result = classificationQueryImpl.nameIn("test", "asd", "blubber") ClassificationSummary result = classificationQueryImpl.nameIn("test", "asd", "blubber")

52
lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
View File

@ -47,7 +47,7 @@ public class ClassificationReportBuilderImplTest {
private TaskMonitorServiceImpl cut; private TaskMonitorServiceImpl cut;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private TaskanaEngine taskanaEngineMock; private TaskanaEngine taskanaEngineMock;
@ -60,7 +60,7 @@ public class ClassificationReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null); when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null);
@ -95,16 +95,16 @@ public class ClassificationReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter) .customAttributeFilterIn(customAttributeFilter)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfClassifications(any(), any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfClassifications(any(), any(), any(), any(), any(), any(),
any()); any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -148,17 +148,17 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfClassifications(any(), any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfClassifications(any(), any(), any(), any(), any(), any(),
any()); any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -199,17 +199,17 @@ public class ClassificationReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter) .customAttributeFilterIn(customAttributeFilter)
.buildDetailedReport(); .buildDetailedReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfDetailedClassifications(any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfDetailedClassifications(any(), any(), any(), any(), any(),
any(), any(),
any()); any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
FoldableRow<DetailedMonitorQueryItem> line = actualResult.getRow("CLI:000000000000000000000000000000000001"); FoldableRow<DetailedMonitorQueryItem> line = actualResult.getRow("CLI:000000000000000000000000000000000001");
@ -254,17 +254,17 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.buildDetailedReport(); .buildDetailedReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfDetailedClassifications(any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfDetailedClassifications(any(), any(), any(), any(), any(),
any(), any(),
any()); any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
FoldableRow<DetailedMonitorQueryItem> line = actualResult.getRow("CLI:000000000000000000000000000000000001"); FoldableRow<DetailedMonitorQueryItem> line = actualResult.getRow("CLI:000000000000000000000000000000000001");
@ -312,16 +312,16 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.listTaskIdsForSelectedItems(selectedItems); .listTaskIdsForSelectedItems(selectedItems);
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false)); .getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false));
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -375,16 +375,16 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1); .listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any()); .getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);

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

@ -37,19 +37,19 @@ public class ClassificationServiceImplTest {
@Mock @Mock
private TaskanaEngine taskanaEngineMock; private TaskanaEngine taskanaEngineMock;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private ClassificationQueryImpl classificationQueryImplMock; private ClassificationQueryImpl classificationQueryImplMock;
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
} }
@Test @Test
public void testCreateClassificationQuery() { public void testCreateClassificationQuery() {
cutSpy.createClassificationQuery(); cutSpy.createClassificationQuery();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineInternalMock, taskanaEngineMock, verifyNoMoreInteractions(classificationMapperMock, internalTaskanaEngineMock, taskanaEngineMock,
classificationQueryImplMock); classificationQueryImplMock);
} }
@ -59,7 +59,7 @@ public class ClassificationServiceImplTest {
NotAuthorizedException, ClassificationAlreadyExistException { NotAuthorizedException, ClassificationAlreadyExistException {
try { try {
Classification classification = createDummyClassification(); Classification classification = createDummyClassification();
when(taskanaEngineInternalMock.domainExists(any())).thenReturn(true); when(internalTaskanaEngineMock.domainExists(any())).thenReturn(true);
cutSpy.createClassification(classification); cutSpy.createClassification(classification);
} catch (InvalidArgumentException e) { } catch (InvalidArgumentException e) {
assertEquals(e.getMessage(), "ClassificationId should be null on creation"); assertEquals(e.getMessage(), "ClassificationId should be null on creation");

54
lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
View File

@ -43,23 +43,23 @@ public class CustomFieldValueReportBuilderImplTest {
private TaskMonitorServiceImpl cut; private TaskMonitorServiceImpl cut;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private TaskanaEngine taskanaEngineMock; private TaskanaEngine taskanaEngineMock;
@Mock @Mock
private TaskanaEngineConfiguration taskanaEngineConfiguration; private TaskanaEngineConfiguration taskanaEngineConfigurationMock;
@Mock @Mock
private TaskMonitorMapper taskMonitorMapperMock; private TaskMonitorMapper taskMonitorMapperMock;
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfigurationMock);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfigurationMock.isGermanPublicHolidaysEnabled()).thenReturn(true);
when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null); when(taskanaEngineConfigurationMock.getCustomHolidays()).thenReturn(null);
} }
@Test @Test
@ -92,18 +92,18 @@ public class CustomFieldValueReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter) .customAttributeFilterIn(customAttributeFilter)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfigurationMock, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfigurationMock, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfCustomFieldValues(any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfCustomFieldValues(any(), any(), any(), any(), any(),
any(), any(), any(), any(),
any()); any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfigurationMock);
assertNotNull(actualResult); assertNotNull(actualResult);
assertEquals(actualResult.getRow("Geschaeftsstelle A").getTotalValue(), 1); assertEquals(actualResult.getRow("Geschaeftsstelle A").getTotalValue(), 1);
@ -145,17 +145,17 @@ public class CustomFieldValueReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfigurationMock, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfigurationMock, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getTaskCountOfCustomFieldValues(any(), any(), any(), any(), any(), any(), any(), any()); .getTaskCountOfCustomFieldValues(any(), any(), any(), any(), any(), any(), any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfigurationMock);
assertNotNull(actualResult); assertNotNull(actualResult);
assertEquals(actualResult.getRow("Geschaeftsstelle A").getTotalValue(), 1); assertEquals(actualResult.getRow("Geschaeftsstelle A").getTotalValue(), 1);
@ -199,17 +199,17 @@ public class CustomFieldValueReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1); .listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfigurationMock, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfigurationMock, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any()); .getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfigurationMock);
assertNotNull(actualResult); assertNotNull(actualResult);
assertEquals(expectedResult, actualResult); assertEquals(expectedResult, actualResult);

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

@ -15,7 +15,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.ObjectReference; import pro.taskana.ObjectReference;
import pro.taskana.TaskanaEngine;
/** /**
* Test for ObjectReferenceQueryImpl. * Test for ObjectReferenceQueryImpl.
@ -28,7 +27,7 @@ public class ObjectReferenceQueryImplTest {
ObjectReferenceQueryImpl objectReferenceQueryImpl; ObjectReferenceQueryImpl objectReferenceQueryImpl;
@Mock @Mock
TaskanaEngine.Internal taskanaEngine; InternalTaskanaEngine taskanaEngine;
@Mock @Mock
SqlSession sqlSession; SqlSession sqlSession;

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

@ -32,7 +32,7 @@ public class TaskQueryImplTest {
private TaskQueryImpl taskQueryImpl; private TaskQueryImpl taskQueryImpl;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternal; private InternalTaskanaEngine internalTaskanaEngine;
@Mock @Mock
private TaskanaEngine taskanaEngine; private TaskanaEngine taskanaEngine;
@Mock @Mock
@ -40,15 +40,15 @@ public class TaskQueryImplTest {
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternal.getEngine()).thenReturn(taskanaEngine); when(internalTaskanaEngine.getEngine()).thenReturn(taskanaEngine);
when(taskanaEngine.getTaskService()).thenReturn(taskServiceMock); when(taskanaEngine.getTaskService()).thenReturn(taskServiceMock);
Configuration configuration = new org.apache.ibatis.session.Configuration(); Configuration configuration = new org.apache.ibatis.session.Configuration();
configuration.setDatabaseId("h2"); configuration.setDatabaseId("h2");
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.getConfiguration()).thenReturn(configuration); when(sqlSession.getConfiguration()).thenReturn(configuration);
taskQueryImpl = new TaskQueryImpl(taskanaEngineInternal); taskQueryImpl = new TaskQueryImpl(internalTaskanaEngine);
} }
@Test @Test

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

@ -60,7 +60,7 @@ public class TaskServiceImplTest {
private TaskanaEngineConfiguration taskanaEngineConfigurationMock; private TaskanaEngineConfiguration taskanaEngineConfigurationMock;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private TaskanaEngine taskanaEngineMock; private TaskanaEngine taskanaEngineMock;
@ -88,10 +88,10 @@ public class TaskServiceImplTest {
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getWorkbasketService()).thenReturn(workbasketServiceMock); when(taskanaEngineMock.getWorkbasketService()).thenReturn(workbasketServiceMock);
when(taskanaEngineMock.getClassificationService()).thenReturn(classificationServiceImplMock); when(taskanaEngineMock.getClassificationService()).thenReturn(classificationServiceImplMock);
cut = new TaskServiceImpl(taskanaEngineInternalMock, taskMapperMock, attachmentMapperMock); cut = new TaskServiceImpl(internalTaskanaEngineMock, taskMapperMock, attachmentMapperMock);
} }
@Test @Test
@ -112,20 +112,20 @@ public class TaskServiceImplTest {
Task actualTask = cutSpy.transfer(task.getId(), destinationWorkbasket.getId()); Task actualTask = cutSpy.transfer(task.getId(), destinationWorkbasket.getId());
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasket.getId(), verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasket.getId(),
WorkbasketPermission.APPEND); WorkbasketPermission.APPEND);
verify(workbasketServiceMock, times(1)).checkAuthorization(sourceWorkbasket.getId(), verify(workbasketServiceMock, times(1)).checkAuthorization(sourceWorkbasket.getId(),
WorkbasketPermission.TRANSFER); WorkbasketPermission.TRANSFER);
verify(workbasketServiceMock, times(1)).getWorkbasket(destinationWorkbasket.getId()); verify(workbasketServiceMock, times(1)).getWorkbasket(destinationWorkbasket.getId());
verify(taskMapperMock, times(1)).update(any()); verify(taskMapperMock, times(1)).update(any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verify(taskanaEngineInternalMock, times(2)).getEngine(); verify(internalTaskanaEngineMock, times(2)).getEngine();
verify(taskanaEngineInternalMock).getHistoryEventProducer(); verify(internalTaskanaEngineMock).getHistoryEventProducer();
verify(taskanaEngineMock).getWorkbasketService(); verify(taskanaEngineMock).getWorkbasketService();
verify(taskanaEngineMock).getClassificationService(); verify(taskanaEngineMock).getClassificationService();
verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock, taskanaEngineMock, verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock, taskanaEngineMock,
taskanaEngineInternalMock, taskMapperMock, objectReferenceMapperMock, workbasketServiceMock, internalTaskanaEngineMock, taskMapperMock, objectReferenceMapperMock, workbasketServiceMock,
sqlSessionMock, classificationQueryImplMock); sqlSessionMock, classificationQueryImplMock);
assertThat(actualTask.isRead(), equalTo(false)); assertThat(actualTask.isRead(), equalTo(false));

24
lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
View File

@ -39,7 +39,7 @@ public class TaskStatusReportBuilderImplTest {
private TaskMonitorServiceImpl cut; private TaskMonitorServiceImpl cut;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private TaskanaEngine taskanaEngineMock; private TaskanaEngine taskanaEngineMock;
@ -49,7 +49,7 @@ public class TaskStatusReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
} }
@Test @Test
@ -70,14 +70,14 @@ public class TaskStatusReportBuilderImplTest {
TaskStatusReport report = cut.createTaskStatusReportBuilder().buildReport(); TaskStatusReport report = cut.createTaskStatusReportBuilder().buildReport();
// then // then
InOrder inOrder = inOrder(taskanaEngineMock, taskanaEngineInternalMock, taskMonitorMapperMock); InOrder inOrder = inOrder(taskanaEngineMock, internalTaskanaEngineMock, taskMonitorMapperMock);
inOrder.verify(taskanaEngineInternalMock).getEngine(); inOrder.verify(internalTaskanaEngineMock).getEngine();
inOrder.verify(taskanaEngineMock).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN); inOrder.verify(taskanaEngineMock).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN);
inOrder.verify(taskanaEngineInternalMock).openConnection(); inOrder.verify(internalTaskanaEngineMock).openConnection();
inOrder.verify(taskMonitorMapperMock).getTasksCountByState(eq(null), eq(null)); inOrder.verify(taskMonitorMapperMock).getTasksCountByState(eq(null), eq(null));
inOrder.verify(taskanaEngineInternalMock).returnConnection(); inOrder.verify(internalTaskanaEngineMock).returnConnection();
inOrder.verifyNoMoreInteractions(); inOrder.verifyNoMoreInteractions();
verifyNoMoreInteractions(taskanaEngineMock, taskanaEngineInternalMock, taskMonitorMapperMock); verifyNoMoreInteractions(taskanaEngineMock, internalTaskanaEngineMock, taskMonitorMapperMock);
assertNotNull(report); assertNotNull(report);
assertEquals(1, report.rowSize()); assertEquals(1, report.rowSize());
@ -105,14 +105,14 @@ public class TaskStatusReportBuilderImplTest {
TaskStatusReport report = cut.createTaskStatusReportBuilder().stateIn(Collections.emptyList()).buildReport(); TaskStatusReport report = cut.createTaskStatusReportBuilder().stateIn(Collections.emptyList()).buildReport();
// then // then
InOrder inOrder = inOrder(taskanaEngineMock, taskMonitorMapperMock, taskanaEngineInternalMock); InOrder inOrder = inOrder(taskanaEngineMock, taskMonitorMapperMock, internalTaskanaEngineMock);
inOrder.verify(taskanaEngineInternalMock).getEngine(); inOrder.verify(internalTaskanaEngineMock).getEngine();
inOrder.verify(taskanaEngineMock).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN); inOrder.verify(taskanaEngineMock).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN);
inOrder.verify(taskanaEngineInternalMock).openConnection(); inOrder.verify(internalTaskanaEngineMock).openConnection();
inOrder.verify(taskMonitorMapperMock).getTasksCountByState(eq(null), eq(Collections.emptyList())); inOrder.verify(taskMonitorMapperMock).getTasksCountByState(eq(null), eq(Collections.emptyList()));
inOrder.verify(taskanaEngineInternalMock).returnConnection(); inOrder.verify(internalTaskanaEngineMock).returnConnection();
inOrder.verifyNoMoreInteractions(); inOrder.verifyNoMoreInteractions();
verifyNoMoreInteractions(taskanaEngineMock, taskMonitorMapperMock, taskanaEngineInternalMock); verifyNoMoreInteractions(taskanaEngineMock, taskMonitorMapperMock, internalTaskanaEngineMock);
assertNotNull(report); assertNotNull(report);
assertEquals(1, report.rowSize()); assertEquals(1, report.rowSize());

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

@ -13,12 +13,12 @@ import pro.taskana.TaskanaEngine;
*/ */
public class TaskanaEngineProxyForTest { public class TaskanaEngineProxyForTest {
TaskanaEngine.Internal engine; private InternalTaskanaEngine engine;
public TaskanaEngineProxyForTest(TaskanaEngine taskanaEngine) throws NoSuchFieldException, IllegalAccessException { public TaskanaEngineProxyForTest(TaskanaEngine taskanaEngine) throws NoSuchFieldException, IllegalAccessException {
Field internal = TaskanaEngineImpl.class.getDeclaredField("internal"); Field internal = TaskanaEngineImpl.class.getDeclaredField("internalTaskanaEngineImpl");
internal.setAccessible(true); internal.setAccessible(true);
engine = (TaskanaEngine.Internal) internal.get(taskanaEngine); engine = (InternalTaskanaEngine) internal.get(taskanaEngine);
} }
public SqlSession getSqlSession() { public SqlSession getSqlSession() {

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

@ -14,7 +14,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketAccessItem; import pro.taskana.WorkbasketAccessItem;
/** /**
@ -29,14 +28,14 @@ public class WorkbasketAccessItemQueryImplTest {
private WorkbasketAccessItemQueryImpl workbasketAccessItemQueryImpl; private WorkbasketAccessItemQueryImpl workbasketAccessItemQueryImpl;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternal; private InternalTaskanaEngine internalTaskanaEngine;
@Mock @Mock
private SqlSession sqlSession; private SqlSession sqlSession;
@Test @Test
public void should_ReturnList_when_BuilderIsUsed() { public void should_ReturnList_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
List<WorkbasketAccessItem> result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd") List<WorkbasketAccessItem> result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd")
@ -46,7 +45,7 @@ public class WorkbasketAccessItemQueryImplTest {
@Test @Test
public void should_ReturnListWithOffset_when_BuilderIsUsed() { public void should_ReturnListWithOffset_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>());
List<WorkbasketAccessItem> result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd") List<WorkbasketAccessItem> result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd")
@ -56,7 +55,7 @@ public class WorkbasketAccessItemQueryImplTest {
@Test @Test
public void should_ReturnOneItem_when_BuilderIsUsed() { public void should_ReturnOneItem_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectOne(any(), any())).thenReturn(new WorkbasketAccessItemImpl()); when(sqlSession.selectOne(any(), any())).thenReturn(new WorkbasketAccessItemImpl());
WorkbasketAccessItem result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd") WorkbasketAccessItem result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd")

10
lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketQueryImplTest.java
View File

@ -30,7 +30,7 @@ public class WorkbasketQueryImplTest {
private WorkbasketQueryImpl workbasketQueryImpl; private WorkbasketQueryImpl workbasketQueryImpl;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternal; private InternalTaskanaEngine internalTaskanaEngine;
@Mock @Mock
private TaskanaEngine taskanaEngine; private TaskanaEngine taskanaEngine;
@ -40,12 +40,12 @@ public class WorkbasketQueryImplTest {
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternal.getEngine()).thenReturn(taskanaEngine); when(internalTaskanaEngine.getEngine()).thenReturn(taskanaEngine);
} }
@Test @Test
public void should_ReturnList_when_BuilderIsUsed() { public void should_ReturnList_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
List<WorkbasketSummary> result = workbasketQueryImpl List<WorkbasketSummary> result = workbasketQueryImpl
@ -57,7 +57,7 @@ public class WorkbasketQueryImplTest {
@Test @Test
public void should_ReturnListWithOffset_when_BuilderIsUsed() { public void should_ReturnListWithOffset_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>());
List<WorkbasketSummary> result = workbasketQueryImpl List<WorkbasketSummary> result = workbasketQueryImpl
@ -69,7 +69,7 @@ public class WorkbasketQueryImplTest {
@Test @Test
public void should_ReturnOneItem_when_BuilderIsUsed() { public void should_ReturnOneItem_when_BuilderIsUsed() {
when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession); when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectOne(any(), any())).thenReturn(new WorkbasketSummaryImpl()); when(sqlSession.selectOne(any(), any())).thenReturn(new WorkbasketSummaryImpl());
WorkbasketSummary result = workbasketQueryImpl WorkbasketSummary result = workbasketQueryImpl

44
lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
View File

@ -46,7 +46,7 @@ public class WorkbasketReportBuilderImplTest {
private TaskMonitorServiceImpl cut; private TaskMonitorServiceImpl cut;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private TaskanaEngine taskanaEngineMock; private TaskanaEngine taskanaEngineMock;
@ -59,7 +59,7 @@ public class WorkbasketReportBuilderImplTest {
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration); when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true); when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null); when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null);
@ -100,17 +100,17 @@ public class WorkbasketReportBuilderImplTest {
.combinedClassificationFilterIn(combinedClassificationFilter) .combinedClassificationFilterIn(combinedClassificationFilter)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)) verify(internalTaskanaEngineMock, times(1))
.openConnection(); .openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbaskets(any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbaskets(any(), any(), any(), any(),
any(), any(), any(), any()); any(), any(), any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -158,16 +158,16 @@ public class WorkbasketReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.buildReport(); .buildReport();
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbaskets(any(), any(), any(), any(), any(), any(), verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbaskets(any(), any(), any(), any(), any(), any(),
any(), any()); any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -213,16 +213,16 @@ public class WorkbasketReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.listTaskIdsForSelectedItems(selectedItems); .listTaskIdsForSelectedItems(selectedItems);
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false)); .getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false));
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -275,16 +275,16 @@ public class WorkbasketReportBuilderImplTest {
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1); .listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any()); verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)) verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any()); .getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);
@ -335,11 +335,11 @@ public class WorkbasketReportBuilderImplTest {
.combinedClassificationFilterIn(combinedClassificationFilter) .combinedClassificationFilterIn(combinedClassificationFilter)
.buildPlannedDateBasedReport(); .buildPlannedDateBasedReport();
verify(taskanaEngineInternalMock, times(1)) verify(internalTaskanaEngineMock, times(1))
.openConnection(); .openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN); verify(taskanaEngineMock, times(1)).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN);
verify(taskanaEngineMock, times(2)).getConfiguration(); verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineInternalMock, times(3)).getEngine(); verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled(); verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays(); verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbasketsBasedOnPlannedDate( verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbasketsBasedOnPlannedDate(
@ -351,8 +351,8 @@ public class WorkbasketReportBuilderImplTest {
excludedClassificationIds, excludedClassificationIds,
customAttributeFilter, customAttributeFilter,
combinedClassificationFilter); combinedClassificationFilter);
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock, verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration); taskanaEngineConfiguration);
assertNotNull(actualResult); assertNotNull(actualResult);

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

@ -74,14 +74,14 @@ public class WorkbasketServiceImplTest {
private TaskanaEngine taskanaEngine; private TaskanaEngine taskanaEngine;
@Mock @Mock
private TaskanaEngine.Internal taskanaEngineInternalMock; private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock @Mock
private TaskanaEngineConfiguration taskanaEngineConfigurationMock; private TaskanaEngineConfiguration taskanaEngineConfigurationMock;
@Before @Before
public void setup() { public void setup() {
when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngine); when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngine);
} }
@Test @Test
@ -91,25 +91,25 @@ public class WorkbasketServiceImplTest {
final int distTargetAmount = 2; final int distTargetAmount = 2;
WorkbasketImpl expectedWb = createTestWorkbasket(null, "Key-1"); WorkbasketImpl expectedWb = createTestWorkbasket(null, "Key-1");
doReturn(expectedWb).when(cutSpy).getWorkbasket(any()); doReturn(expectedWb).when(cutSpy).getWorkbasket(any());
when(taskanaEngineInternalMock.domainExists(any())).thenReturn(true); when(internalTaskanaEngineMock.domainExists(any())).thenReturn(true);
Workbasket actualWb = cutSpy.createWorkbasket(expectedWb); Workbasket actualWb = cutSpy.createWorkbasket(expectedWb);
cutSpy.setDistributionTargets(expectedWb.getId(), createTestDistributionTargets(distTargetAmount)); cutSpy.setDistributionTargets(expectedWb.getId(), createTestDistributionTargets(distTargetAmount));
verify(taskanaEngineInternalMock, times(4)).openConnection(); verify(internalTaskanaEngineMock, times(4)).openConnection();
verify(workbasketMapperMock, times(3)).insert(any()); verify(workbasketMapperMock, times(3)).insert(any());
verify(cutSpy, times(distTargetAmount + 1)).getWorkbasket(any()); verify(cutSpy, times(distTargetAmount + 1)).getWorkbasket(any());
verify(distributionTargetMapperMock, times(1)).deleteAllDistributionTargetsBySourceId(any()); verify(distributionTargetMapperMock, times(1)).deleteAllDistributionTargetsBySourceId(any());
verify(distributionTargetMapperMock, times(distTargetAmount)).insert(any(), any()); verify(distributionTargetMapperMock, times(distTargetAmount)).insert(any(), any());
verify(workbasketMapperMock, times(3)).findByKeyAndDomain(any(), any()); verify(workbasketMapperMock, times(3)).findByKeyAndDomain(any(), any());
verify(workbasketMapperMock, times(1)).update(any()); verify(workbasketMapperMock, times(1)).update(any());
verify(taskanaEngineInternalMock, times(4)).returnConnection(); verify(internalTaskanaEngineMock, times(4)).returnConnection();
verify(taskanaEngine, times(4)).checkRoleMembership(any()); verify(taskanaEngine, times(4)).checkRoleMembership(any());
verify(taskanaEngineInternalMock, times(4)).getEngine(); verify(internalTaskanaEngineMock, times(4)).getEngine();
verify(taskanaEngineInternalMock, times(3)).domainExists(any()); verify(internalTaskanaEngineMock, times(3)).domainExists(any());
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock, verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
distributionTargetMapperMock, distributionTargetMapperMock,
taskanaEngineInternalMock, taskanaEngine, taskanaEngineConfigurationMock); internalTaskanaEngineMock, taskanaEngine, taskanaEngineConfigurationMock);
assertThat(actualWb.getId(), not(equalTo(null))); assertThat(actualWb.getId(), not(equalTo(null)));
assertThat(actualWb.getId(), startsWith("WBI")); assertThat(actualWb.getId(), startsWith("WBI"));
assertThat(actualWb.getCreated(), not(equalTo(null))); assertThat(actualWb.getCreated(), not(equalTo(null)));
@ -121,7 +121,7 @@ public class WorkbasketServiceImplTest {
throws WorkbasketNotFoundException, NotAuthorizedException, InvalidWorkbasketException, throws WorkbasketNotFoundException, NotAuthorizedException, InvalidWorkbasketException,
WorkbasketAlreadyExistException, DomainNotFoundException { WorkbasketAlreadyExistException, DomainNotFoundException {
WorkbasketImpl expectedWb = createTestWorkbasket("ID-1", "Key-1"); WorkbasketImpl expectedWb = createTestWorkbasket("ID-1", "Key-1");
when(taskanaEngineInternalMock.domainExists(any())).thenReturn(true); when(internalTaskanaEngineMock.domainExists(any())).thenReturn(true);
try { try {
cutSpy.createWorkbasket(expectedWb); cutSpy.createWorkbasket(expectedWb);
@ -131,18 +131,18 @@ public class WorkbasketServiceImplTest {
doThrow(WorkbasketNotFoundException.class).when(cutSpy).getDistributionTargets(expectedWb.getId()).get(0); doThrow(WorkbasketNotFoundException.class).when(cutSpy).getDistributionTargets(expectedWb.getId()).get(0);
} catch (WorkbasketNotFoundException e) { } catch (WorkbasketNotFoundException e) {
verify(taskanaEngineInternalMock, times(3)).openConnection(); verify(internalTaskanaEngineMock, times(3)).openConnection();
verify(workbasketMapperMock, times(1)).insert(expectedWb); verify(workbasketMapperMock, times(1)).insert(expectedWb);
verify(workbasketMapperMock, times(1)).findById(any()); verify(workbasketMapperMock, times(1)).findById(any());
verify(workbasketMapperMock, times(1)).findByKeyAndDomain(any(), any()); verify(workbasketMapperMock, times(1)).findByKeyAndDomain(any(), any());
verify(cutSpy, times(1)).getWorkbasket(any()); verify(cutSpy, times(1)).getWorkbasket(any());
verify(taskanaEngineInternalMock, times(3)).returnConnection(); verify(internalTaskanaEngineMock, times(3)).returnConnection();
verify(taskanaEngine, times(2)).checkRoleMembership(any()); verify(taskanaEngine, times(2)).checkRoleMembership(any());
verify(taskanaEngineInternalMock, times(2)).getEngine(); verify(internalTaskanaEngineMock, times(2)).getEngine();
verify(taskanaEngineInternalMock, times(1)).domainExists(any()); verify(internalTaskanaEngineMock, times(1)).domainExists(any());
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock, verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
distributionTargetMapperMock, distributionTargetMapperMock,
taskanaEngineInternalMock, taskanaEngine, taskanaEngineConfigurationMock); internalTaskanaEngineMock, taskanaEngine, taskanaEngineConfigurationMock);
throw e; throw e;
} }
} }
@ -158,13 +158,13 @@ public class WorkbasketServiceImplTest {
try { try {
cutSpy.createWorkbasket(expectedWb); cutSpy.createWorkbasket(expectedWb);
} catch (Exception e) { } catch (Exception e) {
verify(taskanaEngineInternalMock, times(1)).openConnection(); verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(workbasketMapperMock, times(1)).insert(expectedWb); verify(workbasketMapperMock, times(1)).insert(expectedWb);
verify(workbasketMapperMock, times(1)).findById(expectedWb.getId()); verify(workbasketMapperMock, times(1)).findById(expectedWb.getId());
verify(taskanaEngineInternalMock, times(1)).returnConnection(); verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock, verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
distributionTargetMapperMock, distributionTargetMapperMock,
taskanaEngineInternalMock, taskanaEngineConfigurationMock); internalTaskanaEngineMock, taskanaEngineConfigurationMock);
throw e; throw e;
} }
} }
@ -178,13 +178,13 @@ public class WorkbasketServiceImplTest {
try { try {
cutSpy.deleteWorkbasket(wb.getId()); cutSpy.deleteWorkbasket(wb.getId());
} catch (WorkbasketNotFoundException e) { } catch (WorkbasketNotFoundException e) {
verify(taskanaEngineInternalMock, times(2)).openConnection(); verify(internalTaskanaEngineMock, times(2)).openConnection();
verify(cutSpy, times(1)).getWorkbasket(wb.getId()); verify(cutSpy, times(1)).getWorkbasket(wb.getId());
verify(taskanaEngine, times(0)).getTaskService(); verify(taskanaEngine, times(0)).getTaskService();
verify(taskServiceMock, times(0)).createTaskQuery(); verify(taskServiceMock, times(0)).createTaskQuery();
verify(taskQueryMock, times(0)).workbasketIdIn(wb.getId()); verify(taskQueryMock, times(0)).workbasketIdIn(wb.getId());
verify(taskQueryMock, times(0)).count(); verify(taskQueryMock, times(0)).count();
verify(taskanaEngineInternalMock, times(2)).returnConnection(); verify(internalTaskanaEngineMock, times(2)).returnConnection();
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketAccessMapperMock, verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketAccessMapperMock,
distributionTargetMapperMock, taskanaEngineConfigurationMock); distributionTargetMapperMock, taskanaEngineConfigurationMock);
throw e; throw e;

2
rest/taskana-rest-spring-example/pom.xml
View File

@ -180,7 +180,7 @@
<outputDirectory> <outputDirectory>
${project.build.outputDirectory}/static/docs/java/taskana-cdi ${project.build.outputDirectory}/static/docs/java/taskana-cdi
</outputDirectory> </outputDirectory>
C <resources> <resources>
<resource> <resource>
<directory> <directory>
../../lib/taskana-cdi/target/apidocs ../../lib/taskana-cdi/target/apidocs

18
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java
View File

@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
import pro.taskana.TaskanaEngine; import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole; import pro.taskana.TaskanaRole;
import pro.taskana.configuration.TaskanaEngineConfiguration; import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.rest.resource.TaskanaUserInfoResource; import pro.taskana.rest.resource.TaskanaUserInfoResource;
import pro.taskana.rest.resource.VersionResource; import pro.taskana.rest.resource.VersionResource;
import pro.taskana.security.CurrentUserContext; import pro.taskana.security.CurrentUserContext;
@ -28,20 +27,17 @@ public class TaskanaEngineController {
private static final Logger LOGGER = LoggerFactory.getLogger(TaskanaEngineController.class); private static final Logger LOGGER = LoggerFactory.getLogger(TaskanaEngineController.class);
TaskanaEngineConfiguration taskanaEngineConfiguration; private TaskanaEngineConfiguration taskanaEngineConfiguration;
TaskanaEngine taskanaEngine;
TaskanaEngineController(
TaskanaEngineConfiguration taskanaEngineConfiguration, TaskanaEngine taskanaEngine) {
this.taskanaEngineConfiguration = taskanaEngineConfiguration;
this.taskanaEngine = taskanaEngine;
}
private TaskanaEngine taskanaEngine;
@Value("${version:Local build}") @Value("${version:Local build}")
private String version; private String version;
TaskanaEngineController(TaskanaEngineConfiguration taskanaEngineConfiguration, TaskanaEngine taskanaEngine) {
this.taskanaEngineConfiguration = taskanaEngineConfiguration;
this.taskanaEngine = taskanaEngine;
}
@GetMapping(path = "/domains") @GetMapping(path = "/domains")
public ResponseEntity<List<String>> getDomains() { public ResponseEntity<List<String>> getDomains() {
ResponseEntity<List<String>> response = ResponseEntity.ok(taskanaEngineConfiguration.getDomains()); ResponseEntity<List<String>> response = ResponseEntity.ok(taskanaEngineConfiguration.getDomains());