📍Use lombok, reformat, and optimize the code (#1560)

* Use lombok, reformat, and optimize the code

* Fix merge conflicts and some sonar issues

Co-authored-by: va1m <va1m@email.com>

leader-followers/src/main/java/com/iluwatar/leaderfollowers/TaskHandler.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.leaderfollowers;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The TaskHandler is used by the {@link Worker} to process the newly arrived task.
  */
+@Slf4j
 public class TaskHandler {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(TaskHandler.class);
-
   /**
    * This interface handles one task at a time.
    */

leader-followers/src/main/java/com/iluwatar/leaderfollowers/Worker.java

@@ -23,14 +23,14 @@
 
 package com.iluwatar.leaderfollowers;
 
-import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
 
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@Slf4j
 public class Worker implements Runnable {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Worker.class);
-
+  @EqualsAndHashCode.Include
   private final long id;
   private final WorkCenter workCenter;
   private final TaskSet taskSet;
@@ -72,25 +72,10 @@ public class Worker implements Runnable {
         workCenter.addWorker(this);
       } catch (InterruptedException e) {
         LOGGER.warn("Worker interrupted");
+        Thread.currentThread().interrupt();
         return;
       }
     }
   }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof Worker)) {
-      return false;
-    }
-    var worker = (Worker) o;
-    return id == worker.id;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id);
-  }
 }

leader-followers/src/test/java/com/AppTest.java

@@ -26,18 +26,17 @@ package com;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 import com.iluwatar.leaderfollowers.App;
+
 import org.junit.jupiter.api.Test;
 
 /**
- *
  * Application test
- *
  */
 class AppTest {
 
-    @Test
-    void shouldExecuteApplicationWithoutException() {
-        assertDoesNotThrow(() -> App.main(new String[]{}));
-    }
+  @Test
+  void shouldExecuteApplicationWithoutException() {
+    assertDoesNotThrow(() -> App.main(new String[]{}));
+  }
 
 }

leader-followers/src/test/java/com/TaskHandlerTest.java

@@ -34,12 +34,12 @@ import org.junit.jupiter.api.Test;
  */
 class TaskHandlerTest {
 
-    @Test
-    void testHandleTask() throws InterruptedException {
-        var taskHandler = new TaskHandler();
-        var handle = new Task(100);
-        taskHandler.handleTask(handle);
-        assertTrue(handle.isFinished());
-    }
+  @Test
+  void testHandleTask() throws InterruptedException {
+    var taskHandler = new TaskHandler();
+    var handle = new Task(100);
+    taskHandler.handleTask(handle);
+    assertTrue(handle.isFinished());
+  }
 
 }

leader-followers/src/test/java/com/TaskSetTest.java

@@ -34,20 +34,20 @@ import org.junit.jupiter.api.Test;
  */
 class TaskSetTest {
 
-    @Test
-    void testAddTask() throws InterruptedException {
-        var taskSet = new TaskSet();
-        taskSet.addTask(new Task(10));
-        assertEquals(1, taskSet.getSize());
-    }
+  @Test
+  void testAddTask() throws InterruptedException {
+    var taskSet = new TaskSet();
+    taskSet.addTask(new Task(10));
+    assertEquals(1, taskSet.getSize());
+  }
 
-    @Test
-    void testGetTask() throws InterruptedException {
-        var taskSet = new TaskSet();
-        taskSet.addTask(new Task(100));
-        Task task = taskSet.getTask();
-        assertEquals(100, task.getTime());
-        assertEquals(0, taskSet.getSize());
-    }
+  @Test
+  void testGetTask() throws InterruptedException {
+    var taskSet = new TaskSet();
+    taskSet.addTask(new Task(100));
+    Task task = taskSet.getTask();
+    assertEquals(100, task.getTime());
+    assertEquals(0, taskSet.getSize());
+  }
 
 }