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

TSK-1101 minor refactoring of method names and javadoc

This commit is contained in:
Jörg Heffner 2020-02-12 14:45:17 +01:00 committed by Mustapha Zorgati
parent a26e536b91
commit 507a37ba70
18 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java
View File

@ -21,23 +21,23 @@ public interface TaskanaEngine {
TaskService getTaskService(); TaskService getTaskService();
/** /**
* The TaskMonitorService can be used for monitoring Tasks. * The MonitorService can be used for monitoring Tasks.
* *
* @return the TaskMonitorService * @return the MonitorService
*/ */
MonitorService getTaskMonitorService(); MonitorService getMonitorService();
/** /**
* The WorkbasketService can be used for operations on all Workbaskets. * The WorkbasketService can be used for operations on all Workbaskets.
* *
* @return the TaskService * @return the WorbasketService
*/ */
WorkbasketService getWorkbasketService(); WorkbasketService getWorkbasketService();
/** /**
* The ClassificationService can be used for operations on all Categories. * The ClassificationService can be used for operations on all Categories.
* *
* @return the TaskService * @return the ClassificationService
*/ */
ClassificationService getClassificationService(); ClassificationService getClassificationService();

2
lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java
View File

@ -102,7 +102,7 @@ public class TaskanaEngineImpl implements TaskanaEngine {
} }
@Override @Override
public MonitorService getTaskMonitorService() { public MonitorService getMonitorService() {
SqlSession session = this.sessionManager; SqlSession session = this.sessionManager;
return new MonitorServiceImpl( return new MonitorServiceImpl(
internalTaskanaEngineImpl, session.getMapper(MonitorMapper.class)); internalTaskanaEngineImpl, session.getMapper(MonitorMapper.class));

2
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java
View File

@ -17,7 +17,7 @@ import pro.taskana.monitor.internal.reports.TimestampReportBuilderImpl;
import pro.taskana.monitor.internal.reports.WorkbasketReportBuilderImpl; import pro.taskana.monitor.internal.reports.WorkbasketReportBuilderImpl;
import pro.taskana.task.api.CustomField; import pro.taskana.task.api.CustomField;
/** This is the implementation of TaskMonitorService. */ /** This is the implementation of MonitorService. */
public class MonitorServiceImpl implements MonitorService { public class MonitorServiceImpl implements MonitorService {
private InternalTaskanaEngine taskanaEngine; private InternalTaskanaEngine taskanaEngine;

10
lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java
View File

@ -25,7 +25,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Assertions.assertThrows( Assertions.assertThrows(
NotAuthorizedException.class, NotAuthorizedException.class,
@ -38,7 +38,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testGetCustomAttributeValuesForOneWorkbasket() throws NotAuthorizedException { void testGetCustomAttributeValuesForOneWorkbasket() throws NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> values = List<String> values =
monitorService monitorService
@ -55,7 +55,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testGetCustomAttributeValuesForOneDomain() throws NotAuthorizedException { void testGetCustomAttributeValuesForOneDomain() throws NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> values = List<String> values =
monitorService monitorService
@ -69,7 +69,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testGetCustomAttributeValuesForCustomAttribute() throws NotAuthorizedException { void testGetCustomAttributeValuesForCustomAttribute() throws NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Map<CustomField, String> customAttributeFilter = new HashMap<>(); Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_2, "Vollkasko"); customAttributeFilter.put(CustomField.CUSTOM_2, "Vollkasko");
@ -88,7 +88,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testGetCustomAttributeValuesForExcludedClassifications() throws NotAuthorizedException { void testGetCustomAttributeValuesForExcludedClassifications() throws NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> domains = new ArrayList<>(); List<String> domains = new ArrayList<>();
domains.add("DOMAIN_A"); domains.add("DOMAIN_A");

16
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java
View File

@ -29,7 +29,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<SelectedItem> selectedItems = new ArrayList<>(); List<SelectedItem> selectedItems = new ArrayList<>();
@ -44,7 +44,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testGetTaskIdsOfCategoryReport() throws InvalidArgumentException, NotAuthorizedException { void testGetTaskIdsOfCategoryReport() throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -93,7 +93,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCategoryReportWithWorkbasketFilter() void testGetTaskIdsOfCategoryReportWithWorkbasketFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<String> workbasketIds = final List<String> workbasketIds =
Collections.singletonList("WBI:000000000000000000000000000000000001"); Collections.singletonList("WBI:000000000000000000000000000000000001");
@ -138,7 +138,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCategoryReportWithStateFilter() void testGetTaskIdsOfCategoryReportWithStateFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TaskState> states = Collections.singletonList(TaskState.READY); final List<TaskState> states = Collections.singletonList(TaskState.READY);
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -189,7 +189,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCategoryReportWithCategoryFilter() void testGetTaskIdsOfCategoryReportWithCategoryFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL"); final List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL");
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -226,7 +226,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCategoryReportWithDomainFilter() void testGetTaskIdsOfCategoryReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<String> domains = Collections.singletonList("DOMAIN_A"); final List<String> domains = Collections.singletonList("DOMAIN_A");
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -270,7 +270,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCategoryReportWithCustomFieldValueFilter() void testGetTaskIdsOfCategoryReportWithCustomFieldValueFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
Map<CustomField, String> customAttributeFilter = new HashMap<>(); Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A");
@ -315,7 +315,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testThrowsExceptionIfSubKeysAreUsed() { void testThrowsExceptionIfSubKeysAreUsed() {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();

8
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java
View File

@ -23,7 +23,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<SelectedItem> selectedItems = new ArrayList<>(); final List<SelectedItem> selectedItems = new ArrayList<>();
@ -57,7 +57,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfClassificationReport() void testGetTaskIdsOfClassificationReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -101,7 +101,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfClassificationReportWithAttachments() void testGetTaskIdsOfClassificationReportWithAttachments()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -143,7 +143,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfClassificationReportWithDomainFilter() void testGetTaskIdsOfClassificationReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();

16
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java
View File

@ -29,7 +29,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<SelectedItem> selectedItems = new ArrayList<>(); List<SelectedItem> selectedItems = new ArrayList<>();
@ -45,7 +45,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCustomFieldValueReport() void testGetTaskIdsOfCustomFieldValueReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -91,7 +91,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCustomFieldValueReportWithWorkbasketFilter() void testGetTaskIdsOfCustomFieldValueReportWithWorkbasketFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<String> workbasketIds = final List<String> workbasketIds =
Collections.singletonList("WBI:000000000000000000000000000000000001"); Collections.singletonList("WBI:000000000000000000000000000000000001");
@ -135,7 +135,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCustomFieldValueReportWithStateFilter() void testGetTaskIdsOfCustomFieldValueReportWithStateFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -182,7 +182,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCustomFieldValueReportWithCategoryFilter() void testGetTaskIdsOfCustomFieldValueReportWithCategoryFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL"); final List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL");
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -225,7 +225,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCustomFieldValueReportWithDomainFilter() void testGetTaskIdsOfCustomFieldValueReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -267,7 +267,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfCustomFieldValueReportWithCustomFieldValueFilter() void testGetTaskIdsOfCustomFieldValueReportWithCustomFieldValueFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final Map<CustomField, String> customAttributeFilter = new HashMap<>(); final Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A");
@ -311,7 +311,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testThrowsExceptionIfSubKeysAreUsed() { void testThrowsExceptionIfSubKeysAreUsed() {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();

6
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java
View File

@ -24,7 +24,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<SelectedItem> selectedItems = new ArrayList<>(); List<SelectedItem> selectedItems = new ArrayList<>();
@ -39,7 +39,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testGetTaskIdsOfWorkbasketReport() throws InvalidArgumentException, NotAuthorizedException { void testGetTaskIdsOfWorkbasketReport() throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -84,7 +84,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTaskIdsOfWorkbasketReportWithExcludedClassifications() void testGetTaskIdsOfWorkbasketReportWithExcludedClassifications()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); final MonitorService monitorService = taskanaEngine.getMonitorService();
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();

20
lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java
View File

@ -35,7 +35,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Assertions.assertThrows( Assertions.assertThrows(
NotAuthorizedException.class, NotAuthorizedException.class,
@ -46,7 +46,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfCategoryReport() void testGetTotalNumbersOfTasksOfCategoryReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
CategoryReport report = monitorService.createCategoryReportBuilder().buildReport(); CategoryReport report = monitorService.createCategoryReportBuilder().buildReport();
@ -70,7 +70,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetCategoryReportWithReportLineItemDefinitions() void testGetCategoryReportWithReportLineItemDefinitions()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -103,7 +103,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testEachItemOfCategoryReport() throws InvalidArgumentException, NotAuthorizedException { void testEachItemOfCategoryReport() throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -135,7 +135,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCategoryReportNotInWorkingDays() void testEachItemOfCategoryReportNotInWorkingDays()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -166,7 +166,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCategoryReportWithWorkbasketFilter() void testEachItemOfCategoryReportWithWorkbasketFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> workbasketIds = List<String> workbasketIds =
Collections.singletonList("WBI:000000000000000000000000000000000001"); Collections.singletonList("WBI:000000000000000000000000000000000001");
@ -201,7 +201,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCategoryReportWithStateFilter() void testEachItemOfCategoryReportWithStateFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TaskState> states = Collections.singletonList(TaskState.READY); List<TaskState> states = Collections.singletonList(TaskState.READY);
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -235,7 +235,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCategoryReportWithCategoryFilter() void testEachItemOfCategoryReportWithCategoryFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL"); List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -266,7 +266,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCategoryReportWithDomainFilter() void testEachItemOfCategoryReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> domains = Collections.singletonList("DOMAIN_A"); List<String> domains = Collections.singletonList("DOMAIN_A");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -300,7 +300,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCategoryReportWithCustomFieldValueFilter() void testEachItemOfCategoryReportWithCustomFieldValueFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Map<CustomField, String> customAttributeFilter = new HashMap<>(); Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A");

20
lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java
View File

@ -36,7 +36,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Assertions.assertThrows( Assertions.assertThrows(
NotAuthorizedException.class, NotAuthorizedException.class,
@ -47,7 +47,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfClassificationReport() void testGetTotalNumbersOfTasksOfClassificationReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
ClassificationReport report = ClassificationReport report =
monitorService.createClassificationReportBuilder().buildReport(); monitorService.createClassificationReportBuilder().buildReport();
@ -76,7 +76,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetClassificationReportWithReportLineItemDefinitions() void testGetClassificationReportWithReportLineItemDefinitions()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnsHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnsHeaders();
@ -119,7 +119,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfClassificationReport() void testEachItemOfClassificationReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -157,7 +157,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfClassificationReportNotInWorkingDays() void testEachItemOfClassificationReportNotInWorkingDays()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -194,7 +194,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfClassificationReportWithWorkbasketFilter() void testEachItemOfClassificationReportWithWorkbasketFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> workbasketIds = List<String> workbasketIds =
Collections.singletonList("WBI:000000000000000000000000000000000001"); Collections.singletonList("WBI:000000000000000000000000000000000001");
@ -235,7 +235,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfClassificationReportWithStateFilter() void testEachItemOfClassificationReportWithStateFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TaskState> states = Collections.singletonList(TaskState.READY); List<TaskState> states = Collections.singletonList(TaskState.READY);
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -275,7 +275,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfClassificationReportWithCategoryFilter() void testEachItemOfClassificationReportWithCategoryFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL"); List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -306,7 +306,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfClassificationReportWithDomainFilter() void testEachItemOfClassificationReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> domains = Collections.singletonList("DOMAIN_A"); List<String> domains = Collections.singletonList("DOMAIN_A");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -346,7 +346,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfClassificationReportWithCustomFieldValueFilter() void testEachItemOfClassificationReportWithCustomFieldValueFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Map<CustomField, String> customAttributeFilter = new HashMap<>(); Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A");

22
lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java
View File

@ -35,7 +35,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Assertions.assertThrows( Assertions.assertThrows(
NotAuthorizedException.class, NotAuthorizedException.class,
@ -49,7 +49,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom1() void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom1()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
CustomFieldValueReport report = CustomFieldValueReport report =
monitorService monitorService
@ -77,7 +77,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom2() void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom2()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
CustomFieldValueReport report = CustomFieldValueReport report =
monitorService monitorService
@ -104,7 +104,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetCustomFieldValueReportWithReportLineItemDefinitions() void testGetCustomFieldValueReportWithReportLineItemDefinitions()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
CustomField customField = CustomField.CUSTOM_1; CustomField customField = CustomField.CUSTOM_1;
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -136,7 +136,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCustomFieldValueReport() void testEachItemOfCustomFieldValueReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -168,7 +168,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCustomFieldValueReportNotInWorkingDays() void testEachItemOfCustomFieldValueReportNotInWorkingDays()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -199,7 +199,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCustomFieldValueReportWithWorkbasketFilter() void testEachItemOfCustomFieldValueReportWithWorkbasketFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> workbasketIds = List<String> workbasketIds =
Collections.singletonList("WBI:000000000000000000000000000000000001"); Collections.singletonList("WBI:000000000000000000000000000000000001");
@ -234,7 +234,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCustomFieldValueReportWithStateFilter() void testEachItemOfCustomFieldValueReportWithStateFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TaskState> states = Collections.singletonList(TaskState.READY); List<TaskState> states = Collections.singletonList(TaskState.READY);
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -268,7 +268,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCustomFieldValueReportWithCategoryFilter() void testEachItemOfCustomFieldValueReportWithCategoryFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL"); List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -302,7 +302,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCustomFieldValueReportWithDomainFilter() void testEachItemOfCustomFieldValueReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> domains = Collections.singletonList("DOMAIN_A"); List<String> domains = Collections.singletonList("DOMAIN_A");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -336,7 +336,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfCustomFieldValueReportWithCustomFieldValueFilter() void testEachItemOfCustomFieldValueReportWithCustomFieldValueFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Map<CustomField, String> customAttributeFilter = new HashMap<>(); Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A");

20
lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java
View File

@ -38,7 +38,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Assertions.assertThrows( Assertions.assertThrows(
NotAuthorizedException.class, NotAuthorizedException.class,
@ -49,7 +49,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfDetailedClassificationReport() void testGetTotalNumbersOfTasksOfDetailedClassificationReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
DetailedClassificationReport report = DetailedClassificationReport report =
monitorService.createClassificationReportBuilder().buildDetailedReport(); monitorService.createClassificationReportBuilder().buildDetailedReport();
@ -102,7 +102,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetDetailedClassificationReportWithReportLineItemDefinitions() void testGetDetailedClassificationReportWithReportLineItemDefinitions()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -135,7 +135,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfDetailedClassificationReport() void testEachItemOfDetailedClassificationReport()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -200,7 +200,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfDetailedClassificationReportWithWorkbasketFilter() void testEachItemOfDetailedClassificationReportWithWorkbasketFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> workbasketIds = List<String> workbasketIds =
Collections.singletonList("WBI:000000000000000000000000000000000001"); Collections.singletonList("WBI:000000000000000000000000000000000001");
@ -265,7 +265,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfDetailedClassificationReportWithStateFilter() void testEachItemOfDetailedClassificationReportWithStateFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TaskState> states = Collections.singletonList(TaskState.READY); List<TaskState> states = Collections.singletonList(TaskState.READY);
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -329,7 +329,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfDetailedClassificationReportNotInWorkingDays() void testEachItemOfDetailedClassificationReportNotInWorkingDays()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -393,7 +393,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfDetailedClassificationReportWithCategoryFilter() void testEachItemOfDetailedClassificationReportWithCategoryFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL"); List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -436,7 +436,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfDetailedClassificationReportWithDomainFilter() void testEachItemOfDetailedClassificationReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> domains = Collections.singletonList("DOMAIN_A"); List<String> domains = Collections.singletonList("DOMAIN_A");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -500,7 +500,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfDetailedClassificationReportWithCustomFieldValueFilter() void testEachItemOfDetailedClassificationReportWithCustomFieldValueFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Map<CustomField, String> customAttributeFilter = new HashMap<>(); Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A");

10
lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java
View File

@ -33,7 +33,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Assertions.assertThrows( Assertions.assertThrows(
NotAuthorizedException.class, NotAuthorizedException.class,
() -> monitorService.createTaskStatusReportBuilder().buildReport()); () -> monitorService.createTaskStatusReportBuilder().buildReport());
@ -43,7 +43,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest {
@Test @Test
void testCompleteTaskStatusReport() throws NotAuthorizedException, InvalidArgumentException { void testCompleteTaskStatusReport() throws NotAuthorizedException, InvalidArgumentException {
// given // given
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
// when // when
TaskStatusReport report = monitorService.createTaskStatusReportBuilder().buildReport(); TaskStatusReport report = monitorService.createTaskStatusReportBuilder().buildReport();
// then // then
@ -74,7 +74,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest {
@Test @Test
void testCompleteTaskStatusReportAsAdmin() void testCompleteTaskStatusReportAsAdmin()
throws NotAuthorizedException, InvalidArgumentException { throws NotAuthorizedException, InvalidArgumentException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
monitorService.createTaskStatusReportBuilder().buildReport(); monitorService.createTaskStatusReportBuilder().buildReport();
} }
@ -83,7 +83,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest {
void testCompleteTaskStatusReportWithDomainFilter() void testCompleteTaskStatusReportWithDomainFilter()
throws NotAuthorizedException, InvalidArgumentException { throws NotAuthorizedException, InvalidArgumentException {
// given // given
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
// when // when
TaskStatusReport report = TaskStatusReport report =
monitorService monitorService
@ -115,7 +115,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest {
void testCompleteTaskStatusReportWithStateFilter() void testCompleteTaskStatusReportWithStateFilter()
throws NotAuthorizedException, InvalidArgumentException { throws NotAuthorizedException, InvalidArgumentException {
// given // given
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
// when // when
TaskStatusReport report = TaskStatusReport report =
monitorService monitorService

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

@ -36,7 +36,7 @@ class ProvideTimestampReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testProperInsertionOfQueryItems() throws Exception { void testProperInsertionOfQueryItems() throws Exception {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
// last 14 days. Today excluded. // last 14 days. Today excluded.
List<TimeIntervalColumnHeader> headers = List<TimeIntervalColumnHeader> headers =

24
lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java
View File

@ -37,7 +37,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testRoleCheck() { void testRoleCheck() {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Assertions.assertThrows( Assertions.assertThrows(
NotAuthorizedException.class, NotAuthorizedException.class,
@ -48,7 +48,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfWorkbasketReportBasedOnDueDate() void testGetTotalNumbersOfTasksOfWorkbasketReportBasedOnDueDate()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
WorkbasketReport report = monitorService.createWorkbasketReportBuilder().buildReport(); WorkbasketReport report = monitorService.createWorkbasketReportBuilder().buildReport();
@ -70,7 +70,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetWorkbasketReportWithReportLineItemDefinitions() void testGetWorkbasketReportWithReportLineItemDefinitions()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
@ -104,7 +104,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@WithAccessId(userName = "monitor") @WithAccessId(userName = "monitor")
@Test @Test
void testEachItemOfWorkbasketReport() throws InvalidArgumentException, NotAuthorizedException { void testEachItemOfWorkbasketReport() throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -136,7 +136,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfWorkbasketReportNotInWorkingDays() void testEachItemOfWorkbasketReportNotInWorkingDays()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -167,7 +167,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfWorkbasketReportWithWorkbasketFilter() void testEachItemOfWorkbasketReportWithWorkbasketFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> workbasketIds = List<String> workbasketIds =
Collections.singletonList("WBI:000000000000000000000000000000000001"); Collections.singletonList("WBI:000000000000000000000000000000000001");
@ -196,7 +196,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfWorkbasketReportWithStateFilter() void testEachItemOfWorkbasketReportWithStateFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TaskState> states = Collections.singletonList(TaskState.READY); List<TaskState> states = Collections.singletonList(TaskState.READY);
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -230,7 +230,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfWorkbasketReportWithCategoryFilter() void testEachItemOfWorkbasketReportWithCategoryFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL"); List<String> categories = Arrays.asList("AUTOMATIC", "MANUAL");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -264,7 +264,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfWorkbasketReportWithDomainFilter() void testEachItemOfWorkbasketReportWithDomainFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<String> domains = Collections.singletonList("DOMAIN_A"); List<String> domains = Collections.singletonList("DOMAIN_A");
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
@ -298,7 +298,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfWorkbasketReportWithCustomFieldValueFilter() void testEachItemOfWorkbasketReportWithCustomFieldValueFilter()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
Map<CustomField, String> customAttributeFilter = new HashMap<>(); Map<CustomField, String> customAttributeFilter = new HashMap<>();
customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A");
@ -333,7 +333,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testEachItemOfWorkbasketReportForSelectedClassifications() void testEachItemOfWorkbasketReportForSelectedClassifications()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
List<CombinedClassificationFilter> combinedClassificationFilter = new ArrayList<>(); List<CombinedClassificationFilter> combinedClassificationFilter = new ArrayList<>();
@ -381,7 +381,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfWorkbasketReportBasedOnPlannedDateWithReportLineItemDefinitions() void testGetTotalNumbersOfTasksOfWorkbasketReportBasedOnPlannedDateWithReportLineItemDefinitions()
throws InvalidArgumentException, NotAuthorizedException { throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getTaskMonitorService(); MonitorService monitorService = taskanaEngine.getMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders(); List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
WorkbasketReport report = WorkbasketReport report =

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java
View File

@ -42,8 +42,8 @@ public class RestConfiguration {
} }
@Bean @Bean
public MonitorService getTaskMonitorService(TaskanaEngine taskanaEngine) { public MonitorService getMonitorService(TaskanaEngine taskanaEngine) {
return taskanaEngine.getTaskMonitorService(); return taskanaEngine.getMonitorService();
} }
@Bean @Bean

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java
View File

@ -14,13 +14,13 @@ import org.springframework.stereotype.Component;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.monitor.api.reports.header.ColumnHeader;
import pro.taskana.monitor.api.reports.item.QueryItem;
import pro.taskana.monitor.api.reports.ClassificationReport; import pro.taskana.monitor.api.reports.ClassificationReport;
import pro.taskana.monitor.api.reports.Report; import pro.taskana.monitor.api.reports.Report;
import pro.taskana.monitor.api.reports.TaskStatusReport; import pro.taskana.monitor.api.reports.TaskStatusReport;
import pro.taskana.monitor.api.reports.TimestampReport; import pro.taskana.monitor.api.reports.TimestampReport;
import pro.taskana.monitor.api.reports.WorkbasketReport; import pro.taskana.monitor.api.reports.WorkbasketReport;
import pro.taskana.monitor.api.reports.header.ColumnHeader;
import pro.taskana.monitor.api.reports.item.QueryItem;
import pro.taskana.monitor.api.reports.row.FoldableRow; import pro.taskana.monitor.api.reports.row.FoldableRow;
import pro.taskana.monitor.api.reports.row.Row; import pro.taskana.monitor.api.reports.row.Row;
import pro.taskana.monitor.api.reports.row.SingleRow; import pro.taskana.monitor.api.reports.row.SingleRow;

4
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java
View File

@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import pro.taskana.TaskanaSpringBootTest; import pro.taskana.TaskanaSpringBootTest;
import pro.taskana.monitor.api.reports.ClassificationReport;
import pro.taskana.monitor.api.reports.WorkbasketReport;
import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
import pro.taskana.monitor.api.reports.item.DetailedMonitorQueryItem; import pro.taskana.monitor.api.reports.item.DetailedMonitorQueryItem;
import pro.taskana.monitor.api.reports.item.MonitorQueryItem; import pro.taskana.monitor.api.reports.item.MonitorQueryItem;
import pro.taskana.monitor.api.reports.ClassificationReport;
import pro.taskana.monitor.api.reports.WorkbasketReport;
/** Test for {@link ReportResourceAssembler}. */ /** Test for {@link ReportResourceAssembler}. */
@TaskanaSpringBootTest @TaskanaSpringBootTest