From 6cfcea13dc575063b622e49a51ca66b884dd5d43 Mon Sep 17 00:00:00 2001 From: lars lunde Date: Tue, 17 Dec 2024 14:46:46 +0000 Subject: [PATCH] Code smells fixed, first class refactored into interface --- .../wataskmonitor/domain/jobs/CaseIdList.java | 2 +- .../adhoc/createtasks/ElasticSearchCaseList.java | 2 +- .../adhoc/createtasks/JsonResourceCaseList.java | 2 +- .../TaskTerminationFailuresJobService.java | 16 +++++++--------- .../TaskInitiationFailuresJobServiceTest.java | 6 +++--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/CaseIdList.java b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/CaseIdList.java index 13edafa4..5613e916 100644 --- a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/CaseIdList.java +++ b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/CaseIdList.java @@ -1,4 +1,4 @@ package uk.gov.hmcts.reform.wataskmonitor.domain.jobs; -public class CaseIdList { +public interface CaseIdList { } diff --git a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/ElasticSearchCaseList.java b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/ElasticSearchCaseList.java index 47432e67..e102bd1e 100644 --- a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/ElasticSearchCaseList.java +++ b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/ElasticSearchCaseList.java @@ -12,7 +12,7 @@ @ToString @EqualsAndHashCode(callSuper = false) @Getter -public class ElasticSearchCaseList extends CaseIdList { +public class ElasticSearchCaseList implements CaseIdList { private final int total; private final List cases; diff --git a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/JsonResourceCaseList.java b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/JsonResourceCaseList.java index d569de99..cc9758c4 100644 --- a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/JsonResourceCaseList.java +++ b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/JsonResourceCaseList.java @@ -12,7 +12,7 @@ @ToString @EqualsAndHashCode(callSuper = false) @Getter -public class JsonResourceCaseList extends CaseIdList { +public class JsonResourceCaseList implements CaseIdList { List caseIds; diff --git a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/termination/TaskTerminationFailuresJobService.java b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/termination/TaskTerminationFailuresJobService.java index 0c6808af..fb1b8f89 100644 --- a/src/main/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/termination/TaskTerminationFailuresJobService.java +++ b/src/main/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/termination/TaskTerminationFailuresJobService.java @@ -53,15 +53,13 @@ public void checkUnTerminatedTasks(String serviceToken) { String.join(", ", processIds) ); - camundaTasks.forEach(task -> { - log.warn("{} -> taskId:{} deleteReason:{} startTime:{} endTime:{}", - TASK_TERMINATION_FAILURES.name(), - task.getId(), - task.getDeleteReason(), - task.getStartTime(), - task.getEndTime() - ); - }); + camundaTasks.forEach(task -> log.warn("{} -> taskId:{} deleteReason:{} startTime:{} endTime:{}", + TASK_TERMINATION_FAILURES.name(), + task.getId(), + task.getDeleteReason(), + task.getStartTime(), + task.getEndTime() + )); } } else { diff --git a/src/test/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/initiation/TaskInitiationFailuresJobServiceTest.java b/src/test/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/initiation/TaskInitiationFailuresJobServiceTest.java index f65fe024..d5e9c6f3 100644 --- a/src/test/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/initiation/TaskInitiationFailuresJobServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/wataskmonitor/services/jobs/failure/initiation/TaskInitiationFailuresJobServiceTest.java @@ -95,7 +95,7 @@ void should_return_active_tasks_and_not_delayed_tasks(CapturedOutput output) thr assertQueryTargetsUserTasksAndNotDelayedTasks(); assertQuery(); assertThat(genericJobReport.getTotalTasks()).isEqualTo(camundaTasks.size()); - assertThat(genericJobReport.getOutcomeList().size()).isEqualTo(camundaTasks.size()); + assertThat(genericJobReport.getOutcomeList()).hasSameSizeAs(camundaTasks.size()); assertTrue(genericJobReport.getOutcomeList().get(0).isSuccessful()); assertThat(output.getOut()).contains("TASK_INITIATION_FAILURES There are some uninitiated tasks"); @@ -118,7 +118,7 @@ void should_return_empty_list_when_camundaTasks_is_empty(CapturedOutput output) assertQueryTargetsUserTasksAndNotDelayedTasks(); assertQuery(); assertThat(genericJobReport.getTotalTasks()).isZero(); - assertThat(genericJobReport.getOutcomeList().size()).isZero(); + assertTrue(genericJobReport.getOutcomeList().isEmpty()); assertThat(output.getOut()).contains("TASK_INITIATION_FAILURES There was no task"); } @@ -149,7 +149,7 @@ void should_return_isSuccessful_false_when_an_exception_thrown() throws JSONExce assertQueryTargetsUserTasksAndNotDelayedTasks(); assertQuery(); assertThat(genericJobReport.getTotalTasks()).isEqualTo(camundaTasks.size()); - assertThat(genericJobReport.getOutcomeList().size()).isEqualTo(camundaTasks.size()); + assertThat(genericJobReport.getOutcomeList()).hasSameSizeAs(camundaTasks.size()); assertFalse(genericJobReport.getOutcomeList().get(0).isSuccessful()); }