From 507a37ba7063e7ad2c9a3186ac8137f577ccacb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Heffner?= <56156750+gitgoodjhe@users.noreply.github.com> Date: Wed, 12 Feb 2020 14:45:17 +0100 Subject: [PATCH] TSK-1101 minor refactoring of method names and javadoc --- .../pro/taskana/common/api/TaskanaEngine.java | 10 ++++---- .../common/internal/TaskanaEngineImpl.java | 2 +- .../monitor/internal/MonitorServiceImpl.java | 2 +- ...CustomAttributeValuesForReportAccTest.java | 10 ++++---- .../GetTaskIdsOfCategoryReportAccTest.java | 16 ++++++------- ...tTaskIdsOfClassificationReportAccTest.java | 8 +++---- ...askIdsOfCustomFieldValueReportAccTest.java | 16 ++++++------- .../GetTaskIdsOfWorkbasketReportAccTest.java | 6 ++--- .../report/ProvideCategoryReportAccTest.java | 20 ++++++++-------- .../ProvideClassificationReportAccTest.java | 20 ++++++++-------- .../ProvideCustomFieldValueReportAccTest.java | 22 ++++++++--------- ...deDetailedClassificationReportAccTest.java | 20 ++++++++-------- .../ProvideTaskStatusReportAccTest.java | 10 ++++---- .../report/ProvideTimestampReportAccTest.java | 2 +- .../ProvideWorkbasketReportAccTest.java | 24 +++++++++---------- .../pro/taskana/rest/RestConfiguration.java | 4 ++-- .../resource/ReportResourceAssembler.java | 4 ++-- .../rest/resource/ReportResourceTest.java | 4 ++-- 18 files changed, 100 insertions(+), 100 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java b/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java index 60fed5e0d..d0fac3497 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java @@ -21,23 +21,23 @@ public interface TaskanaEngine { 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. * - * @return the TaskService + * @return the WorbasketService */ WorkbasketService getWorkbasketService(); /** * The ClassificationService can be used for operations on all Categories. * - * @return the TaskService + * @return the ClassificationService */ ClassificationService getClassificationService(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java index 4079abc42..dca1ce7c9 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java @@ -102,7 +102,7 @@ public class TaskanaEngineImpl implements TaskanaEngine { } @Override - public MonitorService getTaskMonitorService() { + public MonitorService getMonitorService() { SqlSession session = this.sessionManager; return new MonitorServiceImpl( internalTaskanaEngineImpl, session.getMapper(MonitorMapper.class)); diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java index ea06ce7f1..4fe74eb30 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java @@ -17,7 +17,7 @@ import pro.taskana.monitor.internal.reports.TimestampReportBuilderImpl; import pro.taskana.monitor.internal.reports.WorkbasketReportBuilderImpl; import pro.taskana.task.api.CustomField; -/** This is the implementation of TaskMonitorService. */ +/** This is the implementation of MonitorService. */ public class MonitorServiceImpl implements MonitorService { private InternalTaskanaEngine taskanaEngine; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java index 326fd5005..493299047 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java @@ -25,7 +25,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Assertions.assertThrows( NotAuthorizedException.class, @@ -38,7 +38,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testGetCustomAttributeValuesForOneWorkbasket() throws NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List values = monitorService @@ -55,7 +55,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testGetCustomAttributeValuesForOneDomain() throws NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List values = monitorService @@ -69,7 +69,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testGetCustomAttributeValuesForCustomAttribute() throws NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_2, "Vollkasko"); @@ -88,7 +88,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testGetCustomAttributeValuesForExcludedClassifications() throws NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List domains = new ArrayList<>(); domains.add("DOMAIN_A"); diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java index 7c7f37c79..9f422325a 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java @@ -29,7 +29,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List selectedItems = new ArrayList<>(); @@ -44,7 +44,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testGetTaskIdsOfCategoryReport() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); @@ -93,7 +93,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCategoryReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001"); @@ -138,7 +138,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCategoryReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List states = Collections.singletonList(TaskState.READY); final List columnHeaders = getListOfColumnHeaders(); @@ -189,7 +189,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCategoryReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List categories = Arrays.asList("AUTOMATIC", "MANUAL"); final List columnHeaders = getListOfColumnHeaders(); @@ -226,7 +226,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCategoryReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List domains = Collections.singletonList("DOMAIN_A"); final List columnHeaders = getListOfColumnHeaders(); @@ -270,7 +270,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCategoryReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); @@ -315,7 +315,7 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testThrowsExceptionIfSubKeysAreUsed() { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java index 31d1ea305..5ec1aad89 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java @@ -23,7 +23,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List selectedItems = new ArrayList<>(); @@ -57,7 +57,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfClassificationReport() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); @@ -101,7 +101,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfClassificationReportWithAttachments() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); @@ -143,7 +143,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfClassificationReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java index 319ad5281..c702c22e4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java @@ -29,7 +29,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List selectedItems = new ArrayList<>(); @@ -45,7 +45,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCustomFieldValueReport() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); @@ -91,7 +91,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCustomFieldValueReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001"); @@ -135,7 +135,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCustomFieldValueReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); @@ -182,7 +182,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCustomFieldValueReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List categories = Arrays.asList("AUTOMATIC", "MANUAL"); final List columnHeaders = getListOfColumnHeaders(); @@ -225,7 +225,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCustomFieldValueReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); @@ -267,7 +267,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfCustomFieldValueReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); @@ -311,7 +311,7 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testThrowsExceptionIfSubKeysAreUsed() { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java index 19cc53fe4..75939d8ae 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -24,7 +24,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List selectedItems = new ArrayList<>(); @@ -39,7 +39,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testGetTaskIdsOfWorkbasketReport() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); @@ -84,7 +84,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfWorkbasketReportWithExcludedClassifications() throws InvalidArgumentException, NotAuthorizedException { - final MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + final MonitorService monitorService = taskanaEngine.getMonitorService(); final List columnHeaders = getListOfColumnHeaders(); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java index bb82fcfe2..4e903727a 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java @@ -35,7 +35,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Assertions.assertThrows( NotAuthorizedException.class, @@ -46,7 +46,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfCategoryReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); CategoryReport report = monitorService.createCategoryReportBuilder().buildReport(); @@ -70,7 +70,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testGetCategoryReportWithReportLineItemDefinitions() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getListOfColumnHeaders(); @@ -103,7 +103,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testEachItemOfCategoryReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -135,7 +135,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCategoryReportNotInWorkingDays() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -166,7 +166,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCategoryReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001"); @@ -201,7 +201,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCategoryReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List states = Collections.singletonList(TaskState.READY); List columnHeaders = getShortListOfColumnHeaders(); @@ -235,7 +235,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCategoryReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List categories = Arrays.asList("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); @@ -266,7 +266,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCategoryReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List domains = Collections.singletonList("DOMAIN_A"); List columnHeaders = getShortListOfColumnHeaders(); @@ -300,7 +300,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCategoryReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java index c69105c39..a62dae045 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -36,7 +36,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Assertions.assertThrows( NotAuthorizedException.class, @@ -47,7 +47,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfClassificationReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); ClassificationReport report = monitorService.createClassificationReportBuilder().buildReport(); @@ -76,7 +76,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetClassificationReportWithReportLineItemDefinitions() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getListOfColumnsHeaders(); @@ -119,7 +119,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfClassificationReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -157,7 +157,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfClassificationReportNotInWorkingDays() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -194,7 +194,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfClassificationReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001"); @@ -235,7 +235,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfClassificationReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List states = Collections.singletonList(TaskState.READY); List columnHeaders = getShortListOfColumnHeaders(); @@ -275,7 +275,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfClassificationReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List categories = Arrays.asList("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); @@ -306,7 +306,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfClassificationReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List domains = Collections.singletonList("DOMAIN_A"); List columnHeaders = getShortListOfColumnHeaders(); @@ -346,7 +346,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfClassificationReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java index 4c024011d..145257dd1 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java @@ -35,7 +35,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Assertions.assertThrows( NotAuthorizedException.class, @@ -49,7 +49,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom1() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); CustomFieldValueReport report = monitorService @@ -77,7 +77,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom2() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); CustomFieldValueReport report = monitorService @@ -104,7 +104,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetCustomFieldValueReportWithReportLineItemDefinitions() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); CustomField customField = CustomField.CUSTOM_1; List columnHeaders = getListOfColumnHeaders(); @@ -136,7 +136,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCustomFieldValueReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -168,7 +168,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCustomFieldValueReportNotInWorkingDays() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -199,7 +199,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCustomFieldValueReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001"); @@ -234,7 +234,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCustomFieldValueReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List states = Collections.singletonList(TaskState.READY); List columnHeaders = getShortListOfColumnHeaders(); @@ -268,7 +268,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCustomFieldValueReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List categories = Arrays.asList("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); @@ -302,7 +302,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCustomFieldValueReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List domains = Collections.singletonList("DOMAIN_A"); List columnHeaders = getShortListOfColumnHeaders(); @@ -336,7 +336,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfCustomFieldValueReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java index 448bf3c5d..d56f6f24e 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -38,7 +38,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Assertions.assertThrows( NotAuthorizedException.class, @@ -49,7 +49,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfDetailedClassificationReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); DetailedClassificationReport report = monitorService.createClassificationReportBuilder().buildDetailedReport(); @@ -102,7 +102,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetDetailedClassificationReportWithReportLineItemDefinitions() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getListOfColumnHeaders(); @@ -135,7 +135,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfDetailedClassificationReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -200,7 +200,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfDetailedClassificationReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001"); @@ -265,7 +265,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfDetailedClassificationReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List states = Collections.singletonList(TaskState.READY); List columnHeaders = getShortListOfColumnHeaders(); @@ -329,7 +329,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfDetailedClassificationReportNotInWorkingDays() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -393,7 +393,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfDetailedClassificationReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List categories = Arrays.asList("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); @@ -436,7 +436,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfDetailedClassificationReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List domains = Collections.singletonList("DOMAIN_A"); List columnHeaders = getShortListOfColumnHeaders(); @@ -500,7 +500,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfDetailedClassificationReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java index 1b954fdc9..fe4772937 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java @@ -33,7 +33,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Assertions.assertThrows( NotAuthorizedException.class, () -> monitorService.createTaskStatusReportBuilder().buildReport()); @@ -43,7 +43,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { @Test void testCompleteTaskStatusReport() throws NotAuthorizedException, InvalidArgumentException { // given - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); // when TaskStatusReport report = monitorService.createTaskStatusReportBuilder().buildReport(); // then @@ -74,7 +74,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { @Test void testCompleteTaskStatusReportAsAdmin() throws NotAuthorizedException, InvalidArgumentException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); monitorService.createTaskStatusReportBuilder().buildReport(); } @@ -83,7 +83,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { void testCompleteTaskStatusReportWithDomainFilter() throws NotAuthorizedException, InvalidArgumentException { // given - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); // when TaskStatusReport report = monitorService @@ -115,7 +115,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { void testCompleteTaskStatusReportWithStateFilter() throws NotAuthorizedException, InvalidArgumentException { // given - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); // when TaskStatusReport report = monitorService diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java index a21849c34..2119f29c2 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -36,7 +36,7 @@ class ProvideTimestampReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testProperInsertionOfQueryItems() throws Exception { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); // last 14 days. Today excluded. List headers = diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java index f584a8a04..08d71f02c 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -37,7 +37,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Assertions.assertThrows( NotAuthorizedException.class, @@ -48,7 +48,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfWorkbasketReportBasedOnDueDate() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); WorkbasketReport report = monitorService.createWorkbasketReportBuilder().buildReport(); @@ -70,7 +70,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testGetWorkbasketReportWithReportLineItemDefinitions() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getListOfColumnHeaders(); @@ -104,7 +104,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @WithAccessId(userName = "monitor") @Test void testEachItemOfWorkbasketReport() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -136,7 +136,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfWorkbasketReportNotInWorkingDays() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); @@ -167,7 +167,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfWorkbasketReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001"); @@ -196,7 +196,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfWorkbasketReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List states = Collections.singletonList(TaskState.READY); List columnHeaders = getShortListOfColumnHeaders(); @@ -230,7 +230,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfWorkbasketReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List categories = Arrays.asList("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); @@ -264,7 +264,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfWorkbasketReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List domains = Collections.singletonList("DOMAIN_A"); List columnHeaders = getShortListOfColumnHeaders(); @@ -298,7 +298,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfWorkbasketReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); Map customAttributeFilter = new HashMap<>(); customAttributeFilter.put(CustomField.CUSTOM_1, "Geschaeftsstelle A"); @@ -333,7 +333,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testEachItemOfWorkbasketReportForSelectedClassifications() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getShortListOfColumnHeaders(); List combinedClassificationFilter = new ArrayList<>(); @@ -381,7 +381,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfWorkbasketReportBasedOnPlannedDateWithReportLineItemDefinitions() throws InvalidArgumentException, NotAuthorizedException { - MonitorService monitorService = taskanaEngine.getTaskMonitorService(); + MonitorService monitorService = taskanaEngine.getMonitorService(); List columnHeaders = getListOfColumnHeaders(); WorkbasketReport report = diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java index 631d504f3..4027d5c3e 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java @@ -42,8 +42,8 @@ public class RestConfiguration { } @Bean - public MonitorService getTaskMonitorService(TaskanaEngine taskanaEngine) { - return taskanaEngine.getTaskMonitorService(); + public MonitorService getMonitorService(TaskanaEngine taskanaEngine) { + return taskanaEngine.getMonitorService(); } @Bean diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java index 39ab97578..36a968578 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java @@ -14,13 +14,13 @@ import org.springframework.stereotype.Component; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.Report; import pro.taskana.monitor.api.reports.TaskStatusReport; import pro.taskana.monitor.api.reports.TimestampReport; 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.Row; import pro.taskana.monitor.api.reports.row.SingleRow; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java index 45f3a97f1..86063c498 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.item.DetailedMonitorQueryItem; 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}. */ @TaskanaSpringBootTest