From d741df1e3a799a8db7063605cdfb775705595ea7 Mon Sep 17 00:00:00 2001 From: tiennm5 Date: Sat, 20 Jan 2024 09:10:56 +0700 Subject: [PATCH] [Scheduler] (Fix) SonarLint issues --- scheduler/src/main/java/com/iluwatar/scheduler/Simulator.java | 2 +- scheduler/src/main/java/com/iluwatar/scheduler/Task.java | 4 +++- .../iluwatar/scheduler/FirstComeFirstServedSchedulerTest.java | 4 ++-- .../java/com/iluwatar/scheduler/PrioritySchedulerTest.java | 4 ++-- .../java/com/iluwatar/scheduler/RoundRobinSchedulerTest.java | 4 ++-- .../scheduler/ShortestRemainingTimeFirstSchedulerTest.java | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scheduler/src/main/java/com/iluwatar/scheduler/Simulator.java b/scheduler/src/main/java/com/iluwatar/scheduler/Simulator.java index 129d8e7db..dca3d5f1c 100644 --- a/scheduler/src/main/java/com/iluwatar/scheduler/Simulator.java +++ b/scheduler/src/main/java/com/iluwatar/scheduler/Simulator.java @@ -24,7 +24,7 @@ public class Simulator implements PropertyChangeListener { * Simulate scheduler schedule tasks, then return a LinkedHashMap present the completed order of * tasks, which map task id to the time it completed. */ - public LinkedHashMap simulate() { + public Map simulate() { while (elapsedTime < simulateTime) { if (tasks.containsKey(elapsedTime)) { for (Task task : tasks.get(elapsedTime)) { diff --git a/scheduler/src/main/java/com/iluwatar/scheduler/Task.java b/scheduler/src/main/java/com/iluwatar/scheduler/Task.java index 06a6a8613..5e3bbfae0 100644 --- a/scheduler/src/main/java/com/iluwatar/scheduler/Task.java +++ b/scheduler/src/main/java/com/iluwatar/scheduler/Task.java @@ -3,10 +3,12 @@ package com.iluwatar.scheduler; import java.beans.PropertyChangeSupport; import lombok.Getter; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; /** Task that need to be scheduled. */ @Getter @RequiredArgsConstructor +@Slf4j public class Task { public static final String COMPLETE_PROPERTY = "complete"; private final PropertyChangeSupport support = new PropertyChangeSupport(this); @@ -46,7 +48,7 @@ public class Task { } private void logTaskProgress() { - System.out.printf("Task %d is %d/%d complete\n", id, elapsedTime, totalExecutionTime); + LOGGER.info("Task {} is {}/{} complete\n", id, elapsedTime, totalExecutionTime); } public int getRemainingTime() { diff --git a/scheduler/src/test/java/com/iluwatar/scheduler/FirstComeFirstServedSchedulerTest.java b/scheduler/src/test/java/com/iluwatar/scheduler/FirstComeFirstServedSchedulerTest.java index f291f8db4..ba7edd44a 100644 --- a/scheduler/src/test/java/com/iluwatar/scheduler/FirstComeFirstServedSchedulerTest.java +++ b/scheduler/src/test/java/com/iluwatar/scheduler/FirstComeFirstServedSchedulerTest.java @@ -16,7 +16,7 @@ class FirstComeFirstServedSchedulerTest { Simulator simulator = new Simulator(new FirstComeFirstServedScheduler(), tasks, 1, 100); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(3, taskCompletedOrder.size()); assertIterableEquals(List.of(1, 2, 3), taskCompletedOrder.keySet()); @@ -36,7 +36,7 @@ class FirstComeFirstServedSchedulerTest { Simulator simulator = new Simulator(new FirstComeFirstServedScheduler(), tasks, 1, 100); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(5, taskCompletedOrder.size()); assertIterableEquals(List.of(1, 2, 3, 4, 5), taskCompletedOrder.keySet()); diff --git a/scheduler/src/test/java/com/iluwatar/scheduler/PrioritySchedulerTest.java b/scheduler/src/test/java/com/iluwatar/scheduler/PrioritySchedulerTest.java index a98ac8202..05c477407 100644 --- a/scheduler/src/test/java/com/iluwatar/scheduler/PrioritySchedulerTest.java +++ b/scheduler/src/test/java/com/iluwatar/scheduler/PrioritySchedulerTest.java @@ -16,7 +16,7 @@ class PrioritySchedulerTest { Simulator simulator = new Simulator(new PriorityScheduler(), tasks, 1, 10); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(3, taskCompletedOrder.size()); assertIterableEquals(List.of(2, 3, 1), taskCompletedOrder.keySet()); @@ -36,7 +36,7 @@ class PrioritySchedulerTest { Simulator simulator = new Simulator(new PriorityScheduler(), tasks, 1, 100); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(5, taskCompletedOrder.size()); assertIterableEquals(List.of(3, 1, 4, 5, 2), taskCompletedOrder.keySet()); diff --git a/scheduler/src/test/java/com/iluwatar/scheduler/RoundRobinSchedulerTest.java b/scheduler/src/test/java/com/iluwatar/scheduler/RoundRobinSchedulerTest.java index 3be43346a..16fbf4d98 100644 --- a/scheduler/src/test/java/com/iluwatar/scheduler/RoundRobinSchedulerTest.java +++ b/scheduler/src/test/java/com/iluwatar/scheduler/RoundRobinSchedulerTest.java @@ -13,7 +13,7 @@ class RoundRobinSchedulerTest { Simulator simulator = new Simulator(new RoundRobinScheduler(), tasks, 1, 10); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(3, taskCompletedOrder.size()); assertIterableEquals(List.of(2, 1, 3), taskCompletedOrder.keySet()); assertEquals(5, taskCompletedOrder.get(2)); @@ -32,7 +32,7 @@ class RoundRobinSchedulerTest { Simulator simulator = new Simulator(new RoundRobinScheduler(), tasks, 1, 100); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(5, taskCompletedOrder.size()); assertIterableEquals(List.of(1, 2, 3, 5, 4), taskCompletedOrder.keySet()); diff --git a/scheduler/src/test/java/com/iluwatar/scheduler/ShortestRemainingTimeFirstSchedulerTest.java b/scheduler/src/test/java/com/iluwatar/scheduler/ShortestRemainingTimeFirstSchedulerTest.java index e50a3acae..454a755c0 100644 --- a/scheduler/src/test/java/com/iluwatar/scheduler/ShortestRemainingTimeFirstSchedulerTest.java +++ b/scheduler/src/test/java/com/iluwatar/scheduler/ShortestRemainingTimeFirstSchedulerTest.java @@ -16,7 +16,7 @@ class ShortestRemainingTimeFirstSchedulerTest { Simulator simulator = new Simulator(new ShortestRemainingTimeFirstScheduler(), tasks, 1, 10); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(3, taskCompletedOrder.size()); assertIterableEquals(List.of(2, 1, 3), taskCompletedOrder.keySet()); } @@ -32,7 +32,7 @@ class ShortestRemainingTimeFirstSchedulerTest { Simulator simulator = new Simulator(new ShortestRemainingTimeFirstScheduler(), tasks, 1, 100); - LinkedHashMap taskCompletedOrder = simulator.simulate(); + Map taskCompletedOrder = simulator.simulate(); assertEquals(5, taskCompletedOrder.size()); assertIterableEquals(List.of(1, 2, 3, 5, 4), taskCompletedOrder.keySet());