📍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>

event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java

@@ -23,20 +23,21 @@
 
 package com.iluwatar.event.aggregator;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * Event enumeration.
  */
+@RequiredArgsConstructor
 public enum Event {
 
-  STARK_SIGHTED("Stark sighted"), WARSHIPS_APPROACHING("Warships approaching"), TRAITOR_DETECTED(
-      "Traitor detected");
+  STARK_SIGHTED("Stark sighted"),
+  WARSHIPS_APPROACHING("Warships approaching"),
+  TRAITOR_DETECTED("Traitor detected");
 
   private final String description;
 
-  Event(String description) {
-    this.description = description;
-  }
-
+  @Override
   public String toString() {
     return description;
   }

event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.event.aggregator;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * KingJoffrey observes events from {@link KingsHand}.
  */
+@Slf4j
 public class KingJoffrey implements EventObserver {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(KingJoffrey.class);
-
   @Override
   public void onEvent(Event e) {
     LOGGER.info("Received event from the King's Hand: {}", e.toString());

event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.java

@@ -23,9 +23,12 @@
 
 package com.iluwatar.event.aggregator;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * Weekday enumeration.
  */
+@RequiredArgsConstructor
 public enum Weekday {
 
   MONDAY("Monday"),
@@ -38,10 +41,7 @@ public enum Weekday {
 
   private final String description;
 
-  Weekday(String description) {
-    this.description = description;
-  }
-
+  @Override
   public String toString() {
     return description;
   }

event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java

@@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test;
  * @param <E> Type of Event Emitter
  * @author Jeroen Meulemeester
  */
-public abstract class EventEmitterTest<E extends EventEmitter> {
+abstract class EventEmitterTest<E extends EventEmitter> {
 
   /**
    * Factory used to create a new instance of the test object with a default observer
@@ -81,7 +81,7 @@ public abstract class EventEmitterTest<E extends EventEmitter> {
    * is executed twice, once without a default emitter and once with
    */
   @Test
-  public void testAllDays() {
+  void testAllDays() {
     testAllDaysWithoutDefaultObserver(specialDay, event);
     testAllDaysWithDefaultObserver(specialDay, event);
   }

event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventTest.java

@@ -34,13 +34,13 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class EventTest {
+class EventTest {
 
   /**
    * Verify if every event has a non-null, non-empty description
    */
   @Test
-  public void testToString() {
+  void testToString() {
     Arrays.stream(Event.values()).map(Event::toString).forEach(toString -> {
       assertNotNull(toString);
       assertFalse(toString.trim().isEmpty());

event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.java

@@ -41,17 +41,17 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class KingJoffreyTest {
+class KingJoffreyTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(KingJoffrey.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -59,7 +59,7 @@ public class KingJoffreyTest {
    * Test if {@link KingJoffrey} tells us what event he received
    */
   @Test
-  public void testOnEvent() {
+  void testOnEvent() {
     final var kingJoffrey = new KingJoffrey();
 
     IntStream.range(0, Event.values().length).forEach(i -> {

event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java

@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class KingsHandTest extends EventEmitterTest<KingsHand> {
+class KingsHandTest extends EventEmitterTest<KingsHand> {
 
   /**
    * Create a new test instance, using the correct object factory
@@ -53,7 +53,7 @@ public class KingsHandTest extends EventEmitterTest<KingsHand> {
    * just a mocked observer.
    */
   @Test
-  public void testPassThrough() throws Exception {
+  void testPassThrough() throws Exception {
     final var observer = mock(EventObserver.class);
     final var kingsHand = new KingsHand(observer);
 

event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordBaelishTest.java

@@ -28,7 +28,7 @@ package com.iluwatar.event.aggregator;
  *
  * @author Jeroen Meulemeester
  */
-public class LordBaelishTest extends EventEmitterTest<LordBaelish> {
+class LordBaelishTest extends EventEmitterTest<LordBaelish> {
 
   /**
    * Create a new test instance, using the correct object factory

event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordVarysTest.java

@@ -28,7 +28,7 @@ package com.iluwatar.event.aggregator;
  *
  * @author Jeroen Meulemeester
  */
-public class LordVarysTest extends EventEmitterTest<LordVarys> {
+class LordVarysTest extends EventEmitterTest<LordVarys> {
 
   /**
    * Create a new test instance, using the correct object factory

event-aggregator/src/test/java/com/iluwatar/event/aggregator/ScoutTest.java

@@ -28,7 +28,7 @@ package com.iluwatar.event.aggregator;
  *
  * @author Jeroen Meulemeester
  */
-public class ScoutTest extends EventEmitterTest<Scout> {
+class ScoutTest extends EventEmitterTest<Scout> {
 
   /**
    * Create a new test instance, using the correct object factory

event-aggregator/src/test/java/com/iluwatar/event/aggregator/WeekdayTest.java

@@ -34,10 +34,10 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class WeekdayTest {
+class WeekdayTest {
 
   @Test
-  public void testToString() {
+  void testToString() {
     Arrays.stream(Weekday.values()).forEach(weekday -> {
       final String toString = weekday.toString();
       assertNotNull(toString);