Code smells fixed, first class refactored into interface

hmcts · Dec 17, 2024 · 6cfcea1 · 6cfcea1
1 parent a96bd2c
commit 6cfcea1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 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
@@ -1,4 +1,4 @@
 package uk.gov.hmcts.reform.wataskmonitor.domain.jobs;
 
-public class CaseIdList {
+public interface CaseIdList {
 }
diff --git a/...k/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/ElasticSearchCaseList.java b/...k/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<ElasticSearchCase> cases;

diff --git a/...uk/gov/hmcts/reform/wataskmonitor/domain/jobs/adhoc/createtasks/JsonResourceCaseList.java b/...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<String> caseIds;
 

diff --git a/...rm/wataskmonitor/services/jobs/failure/termination/TaskTerminationFailuresJobService.java b/...rm/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/.../wataskmonitor/services/jobs/failure/initiation/TaskInitiationFailuresJobServiceTest.java b/.../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());
     }