diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
index 6fd5bf9be..019a0f423 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
@@ -2,11 +2,8 @@ package pro.taskana;
import java.sql.SQLException;
-import org.apache.ibatis.session.SqlSession;
-
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.NotAuthorizedException;
-import pro.taskana.history.HistoryEventProducer;
/**
* The TaskanaEngine represents an overall set of all needed services.
@@ -127,59 +124,4 @@ public interface TaskanaEngine {
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 true 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();
-
- }
-
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java
index 01889bb7c..58066b751 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java
@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.AbstractWorkbasketAccessItemQuery;
import pro.taskana.AccessItemQueryColumnName;
-import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketAccessItem;
import pro.taskana.exceptions.TaskanaRuntimeException;
import pro.taskana.impl.util.LoggerUtils;
@@ -33,11 +32,11 @@ abstract class AbstractWorkbasketAccessItemQueryImpl orderBy;
private List orderColumns;
- AbstractWorkbasketAccessItemQueryImpl(TaskanaEngine.Internal taskanaEngine) {
+ AbstractWorkbasketAccessItemQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine;
orderBy = new ArrayList<>();
orderColumns = new ArrayList<>();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/CategoryReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/CategoryReportBuilderImpl.java
index e15ee61e3..caa6dadd9 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/CategoryReportBuilderImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/CategoryReportBuilderImpl.java
@@ -5,7 +5,6 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
@@ -24,7 +23,7 @@ public class CategoryReportBuilderImpl
private static final Logger LOGGER = LoggerFactory.getLogger(CategoryReport.Builder.class);
- CategoryReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
+ CategoryReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper);
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
index cf9241727..f23211358 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
@@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.ClassificationQuery;
import pro.taskana.ClassificationQueryColumnName;
import pro.taskana.ClassificationSummary;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TimeInterval;
import pro.taskana.exceptions.InvalidArgumentException;
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_VALUEMAPPER = "pro.taskana.mappings.QueryMapper.queryClassificationColumnValues";
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationQueryImpl.class);
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private ClassificationQueryColumnName columnName;
private String[] key;
private String[] idIn;
@@ -68,7 +67,7 @@ public class ClassificationQueryImpl implements ClassificationQuery {
private List orderBy;
private List orderColumns;
- ClassificationQueryImpl(TaskanaEngine.Internal taskanaEngine) {
+ ClassificationQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine;
this.orderBy = new ArrayList<>();
this.orderColumns = new ArrayList<>();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationReportBuilderImpl.java
index d910047e1..c1424514d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationReportBuilderImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationReportBuilderImpl.java
@@ -5,7 +5,6 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
@@ -26,7 +25,7 @@ public class ClassificationReportBuilderImpl
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationReport.Builder.class);
- ClassificationReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
+ ClassificationReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper);
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
index 1210ab960..051546e69 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
@@ -19,7 +19,6 @@ import pro.taskana.ClassificationQuery;
import pro.taskana.ClassificationService;
import pro.taskana.ClassificationSummary;
import pro.taskana.TaskSummary;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.ClassificationAlreadyExistException;
import pro.taskana.exceptions.ClassificationInUseException;
@@ -43,9 +42,9 @@ public class ClassificationServiceImpl implements ClassificationService {
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationServiceImpl.class);
private ClassificationMapper classificationMapper;
private TaskMapper taskMapper;
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
- ClassificationServiceImpl(TaskanaEngine.Internal taskanaEngine, ClassificationMapper classificationMapper,
+ ClassificationServiceImpl(InternalTaskanaEngine taskanaEngine, ClassificationMapper classificationMapper,
TaskMapper taskMapper) {
this.taskanaEngine = taskanaEngine;
this.classificationMapper = classificationMapper;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/CustomFieldValueReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/CustomFieldValueReportBuilderImpl.java
index 291dc0f4a..9e36b22e4 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/CustomFieldValueReportBuilderImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/CustomFieldValueReportBuilderImpl.java
@@ -6,7 +6,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.CustomField;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
@@ -27,7 +26,7 @@ public class CustomFieldValueReportBuilderImpl
private CustomField customField;
- CustomFieldValueReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper,
+ CustomFieldValueReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper,
CustomField customField) {
super(taskanaEngine, taskMonitorMapper);
this.customField = customField;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/InternalTaskanaEngine.java b/lib/taskana-core/src/main/java/pro/taskana/impl/InternalTaskanaEngine.java
new file mode 100644
index 000000000..59b2c1997
--- /dev/null
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/InternalTaskanaEngine.java
@@ -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 true 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();
+
+}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/JobServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/JobServiceImpl.java
index 49c167363..4bee3e0a7 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/JobServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/JobServiceImpl.java
@@ -7,7 +7,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.JobService;
-import pro.taskana.TaskanaEngine;
import pro.taskana.jobs.ScheduledJob;
import pro.taskana.mappings.JobMapper;
@@ -21,9 +20,9 @@ public class JobServiceImpl implements JobService {
private static final Logger LOGGER = LoggerFactory.getLogger(JobServiceImpl.class);
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.jobMapper = jobMapper;
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java
index 21140f033..6313f7132 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java
@@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.ObjectReference;
import pro.taskana.ObjectReferenceQuery;
import pro.taskana.ObjectReferenceQueryColumnName;
-import pro.taskana.TaskanaEngine;
import pro.taskana.exceptions.TaskanaRuntimeException;
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_VALUEMAPPER = "pro.taskana.mappings.QueryMapper.queryObjectReferenceColumnValues";
private static final Logger LOGGER = LoggerFactory.getLogger(ObjectReferenceQueryImpl.class);
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private ObjectReferenceQueryColumnName columnName;
private String[] company;
private String[] system;
@@ -36,7 +35,7 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery {
private String[] value;
private List orderBy;
- ObjectReferenceQueryImpl(TaskanaEngine.Internal taskanaEngine) {
+ ObjectReferenceQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine;
this.orderBy = new ArrayList<>();
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java
index f2945a098..a6a52d010 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java
@@ -2,7 +2,6 @@ package pro.taskana.impl;
import pro.taskana.CustomField;
import pro.taskana.TaskMonitorService;
-import pro.taskana.TaskanaEngine;
import pro.taskana.mappings.TaskMonitorMapper;
import pro.taskana.report.CategoryReport;
import pro.taskana.report.ClassificationReport;
@@ -16,10 +15,10 @@ import pro.taskana.report.WorkbasketReport;
*/
public class TaskMonitorServiceImpl implements TaskMonitorService {
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private TaskMonitorMapper taskMonitorMapper;
- TaskMonitorServiceImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
+ TaskMonitorServiceImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super();
this.taskanaEngine = taskanaEngine;
this.taskMonitorMapper = taskMonitorMapper;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
index edaa7dcb6..8a25501cb 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
@@ -16,7 +16,6 @@ import pro.taskana.TaskQuery;
import pro.taskana.TaskQueryColumnName;
import pro.taskana.TaskState;
import pro.taskana.TaskSummary;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.TimeInterval;
import pro.taskana.WorkbasketPermission;
@@ -41,7 +40,7 @@ public class TaskQueryImpl implements TaskQuery {
private static final String TIME_INTERVAL = "TimeInterval ";
private static final String IS_INVALID = " is invalid.";
private static final Logger LOGGER = LoggerFactory.getLogger(TaskQueryImpl.class);
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private TaskServiceImpl taskService;
private TaskQueryColumnName columnName;
private String[] nameIn;
@@ -146,7 +145,7 @@ public class TaskQueryImpl implements TaskQuery {
private boolean addClassificationNameToSelectClauseForOrdering = false;
private boolean addAttachmentClassificationNameToSelectClauseForOrdering = false;
- TaskQueryImpl(TaskanaEngine.Internal taskanaEngine) {
+ TaskQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine;
this.taskService = (TaskServiceImpl) taskanaEngine.getEngine().getTaskService();
this.orderBy = new ArrayList<>();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
index 1c05147a3..bca7e6a52 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@@ -28,7 +28,6 @@ import pro.taskana.TaskQuery;
import pro.taskana.TaskService;
import pro.taskana.TaskState;
import pro.taskana.TaskSummary;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.Workbasket;
import pro.taskana.WorkbasketPermission;
@@ -84,14 +83,14 @@ public class TaskServiceImpl implements TaskService {
private static final Set ALLOWED_KEYS =
IntStream.rangeClosed(1, 16).mapToObj(String::valueOf).collect(Collectors.toSet());
private DaysToWorkingDaysConverter converter;
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private WorkbasketService workbasketService;
private ClassificationService classificationService;
private TaskMapper taskMapper;
private AttachmentMapper attachmentMapper;
private HistoryEventProducer historyEventProducer;
- TaskServiceImpl(TaskanaEngine.Internal taskanaEngine, TaskMapper taskMapper,
+ TaskServiceImpl(InternalTaskanaEngine taskanaEngine, TaskMapper taskMapper,
AttachmentMapper attachmentMapper) {
super();
try {
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskStatusReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskStatusReportBuilderImpl.java
index 1054b71c5..af0156295 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskStatusReportBuilderImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskStatusReportBuilderImpl.java
@@ -6,7 +6,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.TaskState;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.report.item.TaskQueryItem;
@@ -19,12 +18,12 @@ import pro.taskana.report.TaskStatusReport;
public class TaskStatusReportBuilderImpl implements TaskStatusReport.Builder {
private static final Logger LOGGER = LoggerFactory.getLogger(TaskStatusReportBuilderImpl.class);
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private TaskMonitorMapper taskMonitorMapper;
private List domains;
private List states;
- TaskStatusReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
+ TaskStatusReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
this.taskanaEngine = taskanaEngine;
this.taskMonitorMapper = taskMonitorMapper;
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
index 53ef14d1e..58b6798d2 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
@@ -63,14 +63,14 @@ public class TaskanaEngineImpl implements TaskanaEngine {
protected ConnectionManagementMode mode = ConnectionManagementMode.PARTICIPATE;
protected java.sql.Connection connection = null;
private HistoryEventProducer historyEventProducer;
- private Internal internal;
+ private InternalTaskanaEngineImpl internalTaskanaEngineImpl;
protected TaskanaEngineImpl(TaskanaEngineConfiguration taskanaEngineConfiguration) {
this.taskanaEngineConfiguration = taskanaEngineConfiguration;
createTransactionFactory(taskanaEngineConfiguration.getUseManagedTransactions());
this.sessionManager = createSqlSessionManager();
historyEventProducer = HistoryEventProducer.getInstance(taskanaEngineConfiguration);
- this.internal = new Internal();
+ this.internalTaskanaEngineImpl = new InternalTaskanaEngineImpl();
}
public static TaskanaEngine createTaskanaEngine(TaskanaEngineConfiguration taskanaEngineConfiguration) {
@@ -132,21 +132,21 @@ public class TaskanaEngineImpl implements TaskanaEngine {
@Override
public TaskService getTaskService() {
SqlSession session = this.sessionManager;
- return new TaskServiceImpl(internal, session.getMapper(TaskMapper.class),
+ return new TaskServiceImpl(internalTaskanaEngineImpl, session.getMapper(TaskMapper.class),
session.getMapper(AttachmentMapper.class));
}
@Override
public TaskMonitorService getTaskMonitorService() {
SqlSession session = this.sessionManager;
- return new TaskMonitorServiceImpl(internal,
+ return new TaskMonitorServiceImpl(internalTaskanaEngineImpl,
session.getMapper(TaskMonitorMapper.class));
}
@Override
public WorkbasketService getWorkbasketService() {
SqlSession session = this.sessionManager;
- return new WorkbasketServiceImpl(internal,
+ return new WorkbasketServiceImpl(internalTaskanaEngineImpl,
session.getMapper(WorkbasketMapper.class),
session.getMapper(DistributionTargetMapper.class),
session.getMapper(WorkbasketAccessMapper.class));
@@ -155,14 +155,14 @@ public class TaskanaEngineImpl implements TaskanaEngine {
@Override
public ClassificationService getClassificationService() {
SqlSession session = this.sessionManager;
- return new ClassificationServiceImpl(internal, session.getMapper(ClassificationMapper.class),
+ return new ClassificationServiceImpl(internalTaskanaEngineImpl, session.getMapper(ClassificationMapper.class),
session.getMapper(TaskMapper.class));
}
@Override
public JobService getJobService() {
SqlSession session = this.sessionManager;
- return new JobServiceImpl(internal, session.getMapper(JobMapper.class));
+ return new JobServiceImpl(internalTaskanaEngineImpl, session.getMapper(JobMapper.class));
}
@Override
@@ -309,7 +309,7 @@ public class TaskanaEngineImpl implements TaskanaEngine {
/**
* Internal Engine for internal operations.
*/
- private class Internal implements TaskanaEngine.Internal {
+ private class InternalTaskanaEngineImpl implements InternalTaskanaEngine {
@Override
public void openConnection() {
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TimeIntervalReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TimeIntervalReportBuilderImpl.java
index 71e8a7d1d..4e07545e5 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TimeIntervalReportBuilderImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TimeIntervalReportBuilderImpl.java
@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.CustomField;
import pro.taskana.TaskState;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
@@ -33,7 +32,7 @@ abstract class TimeIntervalReportBuilderImpl columnHeaders;
protected boolean inWorkingDays;
@@ -45,7 +44,7 @@ abstract class TimeIntervalReportBuilderImpl excludedClassificationIds;
protected Map customAttributeFilter;
- TimeIntervalReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
+ TimeIntervalReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
this.taskanaEngine = taskanaEngine;
this.taskMonitorMapper = taskMonitorMapper;
this.columnHeaders = Collections.emptyList();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TimestampReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TimestampReportBuilderImpl.java
index 5b5a1675e..f3d75b9cb 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TimestampReportBuilderImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TimestampReportBuilderImpl.java
@@ -10,7 +10,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.TaskState;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
@@ -31,7 +30,7 @@ public class TimestampReportBuilderImpl extends
private static final Logger LOGGER = LoggerFactory.getLogger(TimestampReport.Builder.class);
private List status = Arrays.asList(Timestamp.CREATED, Timestamp.COMPLETED);
- TimestampReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
+ TimestampReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper);
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java
index 2627a04ba..34e4e29bd 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java
@@ -10,7 +10,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.AccessItemQueryColumnName;
-import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketAccessItem;
import pro.taskana.WorkbasketAccessItemQuery;
import pro.taskana.exceptions.TaskanaRuntimeException;
@@ -33,11 +32,11 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
private String[] workbasketKeyLike;
private String[] idIn;
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private List orderBy;
private List orderColumns;
- WorkbasketAccessItemQueryImpl(TaskanaEngine.Internal taskanaEngine) {
+ WorkbasketAccessItemQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine;
orderBy = new ArrayList<>();
orderColumns = new ArrayList<>();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
index 17d4141f5..2641b5474 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
@@ -9,7 +9,6 @@ import org.apache.ibatis.session.RowBounds;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.TimeInterval;
import pro.taskana.WorkbasketPermission;
@@ -70,7 +69,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
private String[] orgLevel4Like;
private boolean markedForDeletion;
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private List orderBy;
private List orderColumns;
private boolean joinWithAccessList;
@@ -78,7 +77,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
private boolean usedToAugmentTasks;
private boolean callerRolesAndAccessIdsAlreadyHandled;
- WorkbasketQueryImpl(TaskanaEngine.Internal taskanaEngine) {
+ WorkbasketQueryImpl(InternalTaskanaEngine taskanaEngine) {
this.taskanaEngine = taskanaEngine;
this.orderBy = new ArrayList<>();
this.orderColumns = new ArrayList<>();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketReportBuilderImpl.java
index dbbccad9f..b580716be 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketReportBuilderImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketReportBuilderImpl.java
@@ -5,7 +5,6 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
@@ -26,7 +25,7 @@ public class WorkbasketReportBuilderImpl
private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketReportBuilderImpl.class);
private List combinedClassificationFilter;
- WorkbasketReportBuilderImpl(TaskanaEngine.Internal taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
+ WorkbasketReportBuilderImpl(InternalTaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) {
super(taskanaEngine, taskMonitorMapper);
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
index 693b9038c..2f9f88851 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.BulkOperationResults;
import pro.taskana.TaskState;
-import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.Workbasket;
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 String ID_PREFIX_WORKBASKET = "WBI";
private static final String ID_PREFIX_WORKBASKET_AUTHORIZATION = "WAI";
- private TaskanaEngine.Internal taskanaEngine;
+ private InternalTaskanaEngine taskanaEngine;
private WorkbasketMapper workbasketMapper;
private DistributionTargetMapper distributionTargetMapper;
private WorkbasketAccessMapper workbasketAccessMapper;
- WorkbasketServiceImpl(TaskanaEngine.Internal taskanaEngine, WorkbasketMapper workbasketMapper,
+ WorkbasketServiceImpl(InternalTaskanaEngine taskanaEngine, WorkbasketMapper workbasketMapper,
DistributionTargetMapper distributionTargetMapper, WorkbasketAccessMapper workbasketAccessMapper) {
this.taskanaEngine = taskanaEngine;
this.workbasketMapper = workbasketMapper;
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
index e3f88c741..ad0a10bba 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
@@ -44,7 +44,7 @@ public class CategoryReportBuilderImplTest {
private TaskMonitorServiceImpl cut;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private TaskanaEngine taskanaEngineMock;
@@ -58,7 +58,7 @@ public class CategoryReportBuilderImplTest {
@Before
public void setup() {
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null);
}
@@ -92,16 +92,16 @@ public class CategoryReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter)
.buildReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfCategories(any(), any(), any(), any(), any(), any(),
any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -144,16 +144,16 @@ public class CategoryReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.buildReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfCategories(any(), any(), any(), any(), any(), any(),
any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -198,16 +198,16 @@ public class CategoryReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.listTaskIdsForSelectedItems(selectedItems);
- verify(taskanaEngineInternalMock, times(1)).openConnection();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false));
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -259,16 +259,16 @@ public class CategoryReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
- verify(taskanaEngineInternalMock, times(1)).openConnection();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java
index 8fb9ddc86..8842539bf 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java
@@ -15,7 +15,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.ClassificationSummary;
-import pro.taskana.TaskanaEngine;
/**
* Test for ClassificationQueryImpl.
@@ -29,14 +28,14 @@ public class ClassificationQueryImplTest {
private ClassificationQueryImpl classificationQueryImpl;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternal;
+ private InternalTaskanaEngine internalTaskanaEngine;
@Mock
private SqlSession sqlSession;
@Test
public void should_ReturnList_when_BuilderIsUsed() {
- when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession);
+ when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
List result = classificationQueryImpl.nameIn("test", "asd", "blubber")
@@ -49,7 +48,7 @@ public class ClassificationQueryImplTest {
@Test
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<>());
List result = classificationQueryImpl.nameIn("test", "asd", "blubber")
@@ -62,7 +61,7 @@ public class ClassificationQueryImplTest {
@Test
public void should_ReturnOneItem_when_BuilderIsUsed() {
- when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession);
+ when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectOne(any(), any())).thenReturn(new ClassificationSummaryImpl());
ClassificationSummary result = classificationQueryImpl.nameIn("test", "asd", "blubber")
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
index 0cbe29755..f95cf3f7e 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
@@ -47,7 +47,7 @@ public class ClassificationReportBuilderImplTest {
private TaskMonitorServiceImpl cut;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private TaskanaEngine taskanaEngineMock;
@@ -60,7 +60,7 @@ public class ClassificationReportBuilderImplTest {
@Before
public void setup() {
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null);
@@ -95,16 +95,16 @@ public class ClassificationReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter)
.buildReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfClassifications(any(), any(), any(), any(), any(), any(),
any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -148,17 +148,17 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.buildReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfClassifications(any(), any(), any(), any(), any(), any(),
any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -199,17 +199,17 @@ public class ClassificationReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter)
.buildDetailedReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfDetailedClassifications(any(), any(), any(), any(), any(),
any(),
any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
FoldableRow line = actualResult.getRow("CLI:000000000000000000000000000000000001");
@@ -254,17 +254,17 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.buildDetailedReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfDetailedClassifications(any(), any(), any(), any(), any(),
any(),
any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
FoldableRow line = actualResult.getRow("CLI:000000000000000000000000000000000001");
@@ -312,16 +312,16 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.listTaskIdsForSelectedItems(selectedItems);
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false));
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -375,16 +375,16 @@ public class ClassificationReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
index 703292e50..de926d2dd 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
@@ -37,19 +37,19 @@ public class ClassificationServiceImplTest {
@Mock
private TaskanaEngine taskanaEngineMock;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private ClassificationQueryImpl classificationQueryImplMock;
@Before
public void setup() {
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
}
@Test
public void testCreateClassificationQuery() {
cutSpy.createClassificationQuery();
- verifyNoMoreInteractions(classificationMapperMock, taskanaEngineInternalMock, taskanaEngineMock,
+ verifyNoMoreInteractions(classificationMapperMock, internalTaskanaEngineMock, taskanaEngineMock,
classificationQueryImplMock);
}
@@ -59,7 +59,7 @@ public class ClassificationServiceImplTest {
NotAuthorizedException, ClassificationAlreadyExistException {
try {
Classification classification = createDummyClassification();
- when(taskanaEngineInternalMock.domainExists(any())).thenReturn(true);
+ when(internalTaskanaEngineMock.domainExists(any())).thenReturn(true);
cutSpy.createClassification(classification);
} catch (InvalidArgumentException e) {
assertEquals(e.getMessage(), "ClassificationId should be null on creation");
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
index 6f11c91a0..c1267af2a 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
@@ -43,23 +43,23 @@ public class CustomFieldValueReportBuilderImplTest {
private TaskMonitorServiceImpl cut;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private TaskanaEngine taskanaEngineMock;
@Mock
- private TaskanaEngineConfiguration taskanaEngineConfiguration;
+ private TaskanaEngineConfiguration taskanaEngineConfigurationMock;
@Mock
private TaskMonitorMapper taskMonitorMapperMock;
@Before
public void setup() {
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
- when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
- when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
- when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
+ when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfigurationMock);
+ when(taskanaEngineConfigurationMock.isGermanPublicHolidaysEnabled()).thenReturn(true);
+ when(taskanaEngineConfigurationMock.getCustomHolidays()).thenReturn(null);
}
@Test
@@ -92,18 +92,18 @@ public class CustomFieldValueReportBuilderImplTest {
.customAttributeFilterIn(customAttributeFilter)
.buildReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
- verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
- verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
+ verify(taskanaEngineConfigurationMock, times(1)).isGermanPublicHolidaysEnabled();
+ verify(taskanaEngineConfigurationMock, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfCustomFieldValues(any(), any(), any(), any(), any(),
any(), any(),
any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
- taskanaEngineConfiguration);
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
+ taskanaEngineConfigurationMock);
assertNotNull(actualResult);
assertEquals(actualResult.getRow("Geschaeftsstelle A").getTotalValue(), 1);
@@ -145,17 +145,17 @@ public class CustomFieldValueReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.buildReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
- verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
- verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
+ verify(taskanaEngineConfigurationMock, times(1)).isGermanPublicHolidaysEnabled();
+ verify(taskanaEngineConfigurationMock, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getTaskCountOfCustomFieldValues(any(), any(), any(), any(), any(), any(), any(), any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
- taskanaEngineConfiguration);
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
+ taskanaEngineConfigurationMock);
assertNotNull(actualResult);
assertEquals(actualResult.getRow("Geschaeftsstelle A").getTotalValue(), 1);
@@ -199,17 +199,17 @@ public class CustomFieldValueReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
- verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
- verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
+ verify(taskanaEngineConfigurationMock, times(1)).isGermanPublicHolidaysEnabled();
+ verify(taskanaEngineConfigurationMock, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
- taskanaEngineConfiguration);
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
+ taskanaEngineConfigurationMock);
assertNotNull(actualResult);
assertEquals(expectedResult, actualResult);
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ObjectReferenceQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ObjectReferenceQueryImplTest.java
index c1f6ab9e1..f9978444d 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/ObjectReferenceQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ObjectReferenceQueryImplTest.java
@@ -15,7 +15,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.ObjectReference;
-import pro.taskana.TaskanaEngine;
/**
* Test for ObjectReferenceQueryImpl.
@@ -28,7 +27,7 @@ public class ObjectReferenceQueryImplTest {
ObjectReferenceQueryImpl objectReferenceQueryImpl;
@Mock
- TaskanaEngine.Internal taskanaEngine;
+ InternalTaskanaEngine taskanaEngine;
@Mock
SqlSession sqlSession;
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskQueryImplTest.java
index 4bd6b3041..d74b163d4 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskQueryImplTest.java
@@ -32,7 +32,7 @@ public class TaskQueryImplTest {
private TaskQueryImpl taskQueryImpl;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternal;
+ private InternalTaskanaEngine internalTaskanaEngine;
@Mock
private TaskanaEngine taskanaEngine;
@Mock
@@ -40,15 +40,15 @@ public class TaskQueryImplTest {
@Before
public void setup() {
- when(taskanaEngineInternal.getEngine()).thenReturn(taskanaEngine);
+ when(internalTaskanaEngine.getEngine()).thenReturn(taskanaEngine);
when(taskanaEngine.getTaskService()).thenReturn(taskServiceMock);
Configuration configuration = new org.apache.ibatis.session.Configuration();
configuration.setDatabaseId("h2");
- when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession);
+ when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.getConfiguration()).thenReturn(configuration);
- taskQueryImpl = new TaskQueryImpl(taskanaEngineInternal);
+ taskQueryImpl = new TaskQueryImpl(internalTaskanaEngine);
}
@Test
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
index ab7b08143..d5983ae53 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
@@ -60,7 +60,7 @@ public class TaskServiceImplTest {
private TaskanaEngineConfiguration taskanaEngineConfigurationMock;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private TaskanaEngine taskanaEngineMock;
@@ -88,10 +88,10 @@ public class TaskServiceImplTest {
@Before
public void setup() {
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getWorkbasketService()).thenReturn(workbasketServiceMock);
when(taskanaEngineMock.getClassificationService()).thenReturn(classificationServiceImplMock);
- cut = new TaskServiceImpl(taskanaEngineInternalMock, taskMapperMock, attachmentMapperMock);
+ cut = new TaskServiceImpl(internalTaskanaEngineMock, taskMapperMock, attachmentMapperMock);
}
@Test
@@ -112,20 +112,20 @@ public class TaskServiceImplTest {
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(),
WorkbasketPermission.APPEND);
verify(workbasketServiceMock, times(1)).checkAuthorization(sourceWorkbasket.getId(),
WorkbasketPermission.TRANSFER);
verify(workbasketServiceMock, times(1)).getWorkbasket(destinationWorkbasket.getId());
verify(taskMapperMock, times(1)).update(any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verify(taskanaEngineInternalMock, times(2)).getEngine();
- verify(taskanaEngineInternalMock).getHistoryEventProducer();
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verify(internalTaskanaEngineMock, times(2)).getEngine();
+ verify(internalTaskanaEngineMock).getHistoryEventProducer();
verify(taskanaEngineMock).getWorkbasketService();
verify(taskanaEngineMock).getClassificationService();
verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock, taskanaEngineMock,
- taskanaEngineInternalMock, taskMapperMock, objectReferenceMapperMock, workbasketServiceMock,
+ internalTaskanaEngineMock, taskMapperMock, objectReferenceMapperMock, workbasketServiceMock,
sqlSessionMock, classificationQueryImplMock);
assertThat(actualTask.isRead(), equalTo(false));
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
index b3a326a10..d8aca2295 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
@@ -39,7 +39,7 @@ public class TaskStatusReportBuilderImplTest {
private TaskMonitorServiceImpl cut;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private TaskanaEngine taskanaEngineMock;
@@ -49,7 +49,7 @@ public class TaskStatusReportBuilderImplTest {
@Before
public void setup() {
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
}
@Test
@@ -70,14 +70,14 @@ public class TaskStatusReportBuilderImplTest {
TaskStatusReport report = cut.createTaskStatusReportBuilder().buildReport();
// then
- InOrder inOrder = inOrder(taskanaEngineMock, taskanaEngineInternalMock, taskMonitorMapperMock);
- inOrder.verify(taskanaEngineInternalMock).getEngine();
+ InOrder inOrder = inOrder(taskanaEngineMock, internalTaskanaEngineMock, taskMonitorMapperMock);
+ inOrder.verify(internalTaskanaEngineMock).getEngine();
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(taskanaEngineInternalMock).returnConnection();
+ inOrder.verify(internalTaskanaEngineMock).returnConnection();
inOrder.verifyNoMoreInteractions();
- verifyNoMoreInteractions(taskanaEngineMock, taskanaEngineInternalMock, taskMonitorMapperMock);
+ verifyNoMoreInteractions(taskanaEngineMock, internalTaskanaEngineMock, taskMonitorMapperMock);
assertNotNull(report);
assertEquals(1, report.rowSize());
@@ -105,14 +105,14 @@ public class TaskStatusReportBuilderImplTest {
TaskStatusReport report = cut.createTaskStatusReportBuilder().stateIn(Collections.emptyList()).buildReport();
// then
- InOrder inOrder = inOrder(taskanaEngineMock, taskMonitorMapperMock, taskanaEngineInternalMock);
- inOrder.verify(taskanaEngineInternalMock).getEngine();
+ InOrder inOrder = inOrder(taskanaEngineMock, taskMonitorMapperMock, internalTaskanaEngineMock);
+ inOrder.verify(internalTaskanaEngineMock).getEngine();
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(taskanaEngineInternalMock).returnConnection();
+ inOrder.verify(internalTaskanaEngineMock).returnConnection();
inOrder.verifyNoMoreInteractions();
- verifyNoMoreInteractions(taskanaEngineMock, taskMonitorMapperMock, taskanaEngineInternalMock);
+ verifyNoMoreInteractions(taskanaEngineMock, taskMonitorMapperMock, internalTaskanaEngineMock);
assertNotNull(report);
assertEquals(1, report.rowSize());
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskanaEngineProxyForTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskanaEngineProxyForTest.java
index d037cd95c..26109b642 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskanaEngineProxyForTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskanaEngineProxyForTest.java
@@ -13,12 +13,12 @@ import pro.taskana.TaskanaEngine;
*/
public class TaskanaEngineProxyForTest {
- TaskanaEngine.Internal engine;
+ private InternalTaskanaEngine engine;
public TaskanaEngineProxyForTest(TaskanaEngine taskanaEngine) throws NoSuchFieldException, IllegalAccessException {
- Field internal = TaskanaEngineImpl.class.getDeclaredField("internal");
+ Field internal = TaskanaEngineImpl.class.getDeclaredField("internalTaskanaEngineImpl");
internal.setAccessible(true);
- engine = (TaskanaEngine.Internal) internal.get(taskanaEngine);
+ engine = (InternalTaskanaEngine) internal.get(taskanaEngine);
}
public SqlSession getSqlSession() {
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketAccessItemQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketAccessItemQueryImplTest.java
index d0ab9bf01..8ba549239 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketAccessItemQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketAccessItemQueryImplTest.java
@@ -14,7 +14,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketAccessItem;
/**
@@ -29,14 +28,14 @@ public class WorkbasketAccessItemQueryImplTest {
private WorkbasketAccessItemQueryImpl workbasketAccessItemQueryImpl;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternal;
+ private InternalTaskanaEngine internalTaskanaEngine;
@Mock
private SqlSession sqlSession;
@Test
public void should_ReturnList_when_BuilderIsUsed() {
- when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession);
+ when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
List result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd")
@@ -46,7 +45,7 @@ public class WorkbasketAccessItemQueryImplTest {
@Test
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<>());
List result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd")
@@ -56,7 +55,7 @@ public class WorkbasketAccessItemQueryImplTest {
@Test
public void should_ReturnOneItem_when_BuilderIsUsed() {
- when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession);
+ when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectOne(any(), any())).thenReturn(new WorkbasketAccessItemImpl());
WorkbasketAccessItem result = workbasketAccessItemQueryImpl.accessIdIn("test", "asd")
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketQueryImplTest.java
index 6d8bc096b..347215e0e 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketQueryImplTest.java
@@ -30,7 +30,7 @@ public class WorkbasketQueryImplTest {
private WorkbasketQueryImpl workbasketQueryImpl;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternal;
+ private InternalTaskanaEngine internalTaskanaEngine;
@Mock
private TaskanaEngine taskanaEngine;
@@ -40,12 +40,12 @@ public class WorkbasketQueryImplTest {
@Before
public void setup() {
- when(taskanaEngineInternal.getEngine()).thenReturn(taskanaEngine);
+ when(internalTaskanaEngine.getEngine()).thenReturn(taskanaEngine);
}
@Test
public void should_ReturnList_when_BuilderIsUsed() {
- when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession);
+ when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
List result = workbasketQueryImpl
@@ -57,7 +57,7 @@ public class WorkbasketQueryImplTest {
@Test
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<>());
List result = workbasketQueryImpl
@@ -69,7 +69,7 @@ public class WorkbasketQueryImplTest {
@Test
public void should_ReturnOneItem_when_BuilderIsUsed() {
- when(taskanaEngineInternal.getSqlSession()).thenReturn(sqlSession);
+ when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSession);
when(sqlSession.selectOne(any(), any())).thenReturn(new WorkbasketSummaryImpl());
WorkbasketSummary result = workbasketQueryImpl
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
index ea80d16e8..b0d244686 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
@@ -46,7 +46,7 @@ public class WorkbasketReportBuilderImplTest {
private TaskMonitorServiceImpl cut;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private TaskanaEngine taskanaEngineMock;
@@ -59,7 +59,7 @@ public class WorkbasketReportBuilderImplTest {
@Before
public void setup() {
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngineMock);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngineMock);
when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaEngineConfiguration);
when(taskanaEngineConfiguration.isGermanPublicHolidaysEnabled()).thenReturn(true);
when(taskanaEngineConfiguration.getCustomHolidays()).thenReturn(null);
@@ -100,17 +100,17 @@ public class WorkbasketReportBuilderImplTest {
.combinedClassificationFilterIn(combinedClassificationFilter)
.buildReport();
- verify(taskanaEngineInternalMock, times(1))
+ verify(internalTaskanaEngineMock, times(1))
.openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbaskets(any(), any(), any(), any(),
any(), any(), any(), any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -158,16 +158,16 @@ public class WorkbasketReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.buildReport();
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbaskets(any(), any(), any(), any(), any(), any(),
any(), any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -213,16 +213,16 @@ public class WorkbasketReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.listTaskIdsForSelectedItems(selectedItems);
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getTaskIdsForSelectedItems(any(), any(), any(), any(), any(), any(), any(), any(), any(), eq(false));
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -275,16 +275,16 @@ public class WorkbasketReportBuilderImplTest {
.withColumnHeaders(columnHeaders)
.listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_1);
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1))
.getCustomAttributeValuesForReport(any(), any(), any(), any(), any(), any(), any(), any());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
@@ -335,11 +335,11 @@ public class WorkbasketReportBuilderImplTest {
.combinedClassificationFilterIn(combinedClassificationFilter)
.buildPlannedDateBasedReport();
- verify(taskanaEngineInternalMock, times(1))
+ verify(internalTaskanaEngineMock, times(1))
.openConnection();
verify(taskanaEngineMock, times(1)).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN);
verify(taskanaEngineMock, times(2)).getConfiguration();
- verify(taskanaEngineInternalMock, times(3)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).getEngine();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbasketsBasedOnPlannedDate(
@@ -351,8 +351,8 @@ public class WorkbasketReportBuilderImplTest {
excludedClassificationIds,
customAttributeFilter,
combinedClassificationFilter);
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
- verifyNoMoreInteractions(taskanaEngineInternalMock, taskanaEngineMock, taskMonitorMapperMock,
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
+ verifyNoMoreInteractions(internalTaskanaEngineMock, taskanaEngineMock, taskMonitorMapperMock,
taskanaEngineConfiguration);
assertNotNull(actualResult);
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
index feb7e911f..99eb8ca2a 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
@@ -74,14 +74,14 @@ public class WorkbasketServiceImplTest {
private TaskanaEngine taskanaEngine;
@Mock
- private TaskanaEngine.Internal taskanaEngineInternalMock;
+ private InternalTaskanaEngine internalTaskanaEngineMock;
@Mock
private TaskanaEngineConfiguration taskanaEngineConfigurationMock;
@Before
public void setup() {
- when(taskanaEngineInternalMock.getEngine()).thenReturn(taskanaEngine);
+ when(internalTaskanaEngineMock.getEngine()).thenReturn(taskanaEngine);
}
@Test
@@ -91,25 +91,25 @@ public class WorkbasketServiceImplTest {
final int distTargetAmount = 2;
WorkbasketImpl expectedWb = createTestWorkbasket(null, "Key-1");
doReturn(expectedWb).when(cutSpy).getWorkbasket(any());
- when(taskanaEngineInternalMock.domainExists(any())).thenReturn(true);
+ when(internalTaskanaEngineMock.domainExists(any())).thenReturn(true);
Workbasket actualWb = cutSpy.createWorkbasket(expectedWb);
cutSpy.setDistributionTargets(expectedWb.getId(), createTestDistributionTargets(distTargetAmount));
- verify(taskanaEngineInternalMock, times(4)).openConnection();
+ verify(internalTaskanaEngineMock, times(4)).openConnection();
verify(workbasketMapperMock, times(3)).insert(any());
verify(cutSpy, times(distTargetAmount + 1)).getWorkbasket(any());
verify(distributionTargetMapperMock, times(1)).deleteAllDistributionTargetsBySourceId(any());
verify(distributionTargetMapperMock, times(distTargetAmount)).insert(any(), any());
verify(workbasketMapperMock, times(3)).findByKeyAndDomain(any(), any());
verify(workbasketMapperMock, times(1)).update(any());
- verify(taskanaEngineInternalMock, times(4)).returnConnection();
+ verify(internalTaskanaEngineMock, times(4)).returnConnection();
verify(taskanaEngine, times(4)).checkRoleMembership(any());
- verify(taskanaEngineInternalMock, times(4)).getEngine();
- verify(taskanaEngineInternalMock, times(3)).domainExists(any());
+ verify(internalTaskanaEngineMock, times(4)).getEngine();
+ verify(internalTaskanaEngineMock, times(3)).domainExists(any());
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
distributionTargetMapperMock,
- taskanaEngineInternalMock, taskanaEngine, taskanaEngineConfigurationMock);
+ internalTaskanaEngineMock, taskanaEngine, taskanaEngineConfigurationMock);
assertThat(actualWb.getId(), not(equalTo(null)));
assertThat(actualWb.getId(), startsWith("WBI"));
assertThat(actualWb.getCreated(), not(equalTo(null)));
@@ -121,7 +121,7 @@ public class WorkbasketServiceImplTest {
throws WorkbasketNotFoundException, NotAuthorizedException, InvalidWorkbasketException,
WorkbasketAlreadyExistException, DomainNotFoundException {
WorkbasketImpl expectedWb = createTestWorkbasket("ID-1", "Key-1");
- when(taskanaEngineInternalMock.domainExists(any())).thenReturn(true);
+ when(internalTaskanaEngineMock.domainExists(any())).thenReturn(true);
try {
cutSpy.createWorkbasket(expectedWb);
@@ -131,18 +131,18 @@ public class WorkbasketServiceImplTest {
doThrow(WorkbasketNotFoundException.class).when(cutSpy).getDistributionTargets(expectedWb.getId()).get(0);
} catch (WorkbasketNotFoundException e) {
- verify(taskanaEngineInternalMock, times(3)).openConnection();
+ verify(internalTaskanaEngineMock, times(3)).openConnection();
verify(workbasketMapperMock, times(1)).insert(expectedWb);
verify(workbasketMapperMock, times(1)).findById(any());
verify(workbasketMapperMock, times(1)).findByKeyAndDomain(any(), any());
verify(cutSpy, times(1)).getWorkbasket(any());
- verify(taskanaEngineInternalMock, times(3)).returnConnection();
+ verify(internalTaskanaEngineMock, times(3)).returnConnection();
verify(taskanaEngine, times(2)).checkRoleMembership(any());
- verify(taskanaEngineInternalMock, times(2)).getEngine();
- verify(taskanaEngineInternalMock, times(1)).domainExists(any());
+ verify(internalTaskanaEngineMock, times(2)).getEngine();
+ verify(internalTaskanaEngineMock, times(1)).domainExists(any());
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
distributionTargetMapperMock,
- taskanaEngineInternalMock, taskanaEngine, taskanaEngineConfigurationMock);
+ internalTaskanaEngineMock, taskanaEngine, taskanaEngineConfigurationMock);
throw e;
}
}
@@ -158,13 +158,13 @@ public class WorkbasketServiceImplTest {
try {
cutSpy.createWorkbasket(expectedWb);
} catch (Exception e) {
- verify(taskanaEngineInternalMock, times(1)).openConnection();
+ verify(internalTaskanaEngineMock, times(1)).openConnection();
verify(workbasketMapperMock, times(1)).insert(expectedWb);
verify(workbasketMapperMock, times(1)).findById(expectedWb.getId());
- verify(taskanaEngineInternalMock, times(1)).returnConnection();
+ verify(internalTaskanaEngineMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
distributionTargetMapperMock,
- taskanaEngineInternalMock, taskanaEngineConfigurationMock);
+ internalTaskanaEngineMock, taskanaEngineConfigurationMock);
throw e;
}
}
@@ -178,13 +178,13 @@ public class WorkbasketServiceImplTest {
try {
cutSpy.deleteWorkbasket(wb.getId());
} catch (WorkbasketNotFoundException e) {
- verify(taskanaEngineInternalMock, times(2)).openConnection();
+ verify(internalTaskanaEngineMock, times(2)).openConnection();
verify(cutSpy, times(1)).getWorkbasket(wb.getId());
verify(taskanaEngine, times(0)).getTaskService();
verify(taskServiceMock, times(0)).createTaskQuery();
verify(taskQueryMock, times(0)).workbasketIdIn(wb.getId());
verify(taskQueryMock, times(0)).count();
- verify(taskanaEngineInternalMock, times(2)).returnConnection();
+ verify(internalTaskanaEngineMock, times(2)).returnConnection();
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketAccessMapperMock,
distributionTargetMapperMock, taskanaEngineConfigurationMock);
throw e;
diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml
index f0f6a59c3..bf6d8d8f5 100644
--- a/rest/taskana-rest-spring-example/pom.xml
+++ b/rest/taskana-rest-spring-example/pom.xml
@@ -180,7 +180,7 @@
${project.build.outputDirectory}/static/docs/java/taskana-cdi
- C
+
../../lib/taskana-cdi/target/apidocs
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java
index 783657add..80be7876a 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java
@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.configuration.TaskanaEngineConfiguration;
-import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.rest.resource.TaskanaUserInfoResource;
import pro.taskana.rest.resource.VersionResource;
import pro.taskana.security.CurrentUserContext;
@@ -28,20 +27,17 @@ public class TaskanaEngineController {
private static final Logger LOGGER = LoggerFactory.getLogger(TaskanaEngineController.class);
- TaskanaEngineConfiguration taskanaEngineConfiguration;
-
- TaskanaEngine taskanaEngine;
-
- TaskanaEngineController(
- TaskanaEngineConfiguration taskanaEngineConfiguration, TaskanaEngine taskanaEngine) {
- this.taskanaEngineConfiguration = taskanaEngineConfiguration;
- this.taskanaEngine = taskanaEngine;
-
- }
+ private TaskanaEngineConfiguration taskanaEngineConfiguration;
+ private TaskanaEngine taskanaEngine;
@Value("${version:Local build}")
private String version;
+ TaskanaEngineController(TaskanaEngineConfiguration taskanaEngineConfiguration, TaskanaEngine taskanaEngine) {
+ this.taskanaEngineConfiguration = taskanaEngineConfiguration;
+ this.taskanaEngine = taskanaEngine;
+ }
+
@GetMapping(path = "/domains")
public ResponseEntity> getDomains() {
ResponseEntity> response = ResponseEntity.ok(taskanaEngineConfiguration.getDomains());