From 38133484c0d94a112306a536358285abd5ae0f20 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Sun, 26 Jul 2020 00:48:24 +0200 Subject: [PATCH] TSK-1344: renamed TaskCustomFieldValueReport getter in MonitorService --- .../taskana/monitor/api/MonitorService.java | 2 +- .../monitor/internal/MonitorServiceImpl.java | 2 +- ...dsOfTaskCustomFieldValueReportAccTest.java | 14 ++++---- ...videTaskCustomFieldValueReportAccTest.java | 34 +++++++++++-------- ...CustomFieldValueReportBuilderImplTest.java | 6 ++-- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/MonitorService.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/MonitorService.java index 0ea735aef..57e40948f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/api/MonitorService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/api/MonitorService.java @@ -44,7 +44,7 @@ public interface MonitorService { * @param taskCustomField the customField whose values should appear in the report * @return a {@link TaskCustomFieldValueReport.Builder} */ - TaskCustomFieldValueReport.Builder createCustomFieldValueReportBuilder( + TaskCustomFieldValueReport.Builder createTaskCustomFieldValueReportBuilder( TaskCustomField taskCustomField); /** 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 ee9d4174e..6fc274ba7 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 @@ -44,7 +44,7 @@ public class MonitorServiceImpl implements MonitorService { } @Override - public TaskCustomFieldValueReport.Builder createCustomFieldValueReportBuilder( + public TaskCustomFieldValueReport.Builder createTaskCustomFieldValueReportBuilder( TaskCustomField taskCustomField) { return new CustomFieldValueReportBuilderImpl(taskanaEngine, monitorMapper, taskCustomField); } diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java index 22f182326..145bee284 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java @@ -36,7 +36,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes ThrowingCallable call = () -> monitorService - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .listTaskIdsForSelectedItems(selectedItems); assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } @@ -70,7 +70,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes List ids = monitorService - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .listTaskIdsForSelectedItems(selectedItems); @@ -118,7 +118,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes List ids = monitorService - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .workbasketIdIn(workbasketIds) @@ -160,7 +160,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes List ids = monitorService - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .stateIn(Collections.singletonList(TaskState.READY)) @@ -207,7 +207,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes List ids = monitorService - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .classificationCategoryIn(categories) @@ -248,7 +248,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes List ids = monitorService - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .domainIn(Collections.singletonList("DOMAIN_A")) @@ -291,7 +291,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes List ids = monitorService - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .customAttributeFilterIn(customAttributeFilter) diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java index 6aeaef798..64416e3a0 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java @@ -40,7 +40,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { ThrowingCallable call = () -> { MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .buildReport(); }; assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); @@ -50,7 +50,9 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void should_augmentDisplayNames_When_ReportIsBuild() throws Exception { TaskCustomFieldValueReport report = - MONITOR_SERVICE.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1).buildReport(); + MONITOR_SERVICE + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .buildReport(); assertThat(report.getRows()).hasSize(3); assertThat(report.getRow("Geschaeftsstelle A").getDisplayName()) @@ -65,7 +67,9 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom1() throws Exception { TaskCustomFieldValueReport report = - MONITOR_SERVICE.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1).buildReport(); + MONITOR_SERVICE + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .buildReport(); assertThat(report).isNotNull(); assertThat(report.rowSize()).isEqualTo(3); @@ -84,7 +88,9 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom2() throws Exception { TaskCustomFieldValueReport report = - MONITOR_SERVICE.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_2).buildReport(); + MONITOR_SERVICE + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_2) + .buildReport(); assertThat(report).isNotNull(); assertThat(report.rowSize()).isEqualTo(2); @@ -106,7 +112,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(taskCustomField) + .createTaskCustomFieldValueReportBuilder(taskCustomField) .withColumnHeaders(columnHeaders) .inWorkingDays() .buildReport(); @@ -132,7 +138,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { ThrowingCallable callable = () -> MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .buildReport(timestamp); assertThatCode(callable).doesNotThrowAnyException(); }; @@ -146,7 +152,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .buildReport(); @@ -171,7 +177,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .buildReport(TaskTimestamp.PLANNED); @@ -196,7 +202,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .buildReport(); @@ -222,7 +228,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .workbasketIdIn(workbasketIds) @@ -249,7 +255,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .stateIn(states) @@ -276,7 +282,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .classificationCategoryIn(categories) @@ -303,7 +309,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .withColumnHeaders(columnHeaders) .inWorkingDays() .domainIn(domains) @@ -331,7 +337,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { TaskCustomFieldValueReport report = MONITOR_SERVICE - .createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .customAttributeFilterIn(customAttributeFilter) .withColumnHeaders(columnHeaders) .inWorkingDays() diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java index 3b60d8f1e..722378e87 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java @@ -80,7 +80,7 @@ class TaskCustomFieldValueReportBuilderImplTest { .thenReturn(expectedResult); final TaskCustomFieldValueReport actualResult = - cut.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + cut.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .workbasketIdIn(workbasketIds) .stateIn(states) .classificationCategoryIn(categories) @@ -142,7 +142,7 @@ class TaskCustomFieldValueReportBuilderImplTest { .thenReturn(expectedResult); final TaskCustomFieldValueReport actualResult = - cut.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + cut.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .workbasketIdIn(workbasketIds) .stateIn(states) .classificationCategoryIn(categories) @@ -205,7 +205,7 @@ class TaskCustomFieldValueReportBuilderImplTest { .thenReturn(expectedResult); final List actualResult = - cut.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) + cut.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .workbasketIdIn(workbasketIds) .stateIn(states) .classificationCategoryIn(categories)