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

servant/src/main/java/com/iluwatar/servant/App.java

@@ -24,8 +24,7 @@
 package com.iluwatar.servant;
 
 import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 
 /**
@@ -35,10 +34,9 @@ import org.slf4j.LoggerFactory;
  *
  * <p>In this example {@link Servant} is serving {@link King} and {@link Queen}.
  */
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
   private static final Servant jenkins = new Servant("Jenkins");
   private static final Servant travis = new Servant("Travis");
 

servant/src/test/java/com/iluwatar/servant/KingTest.java

@@ -33,17 +33,17 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class KingTest {
+class KingTest {
 
   @Test
-  public void testHungrySoberUncomplimentedKing() {
+  void testHungrySoberUncomplimentedKing() {
     final var king = new King();
     king.changeMood();
     assertFalse(king.getMood());
   }
 
   @Test
-  public void testFedSoberUncomplimentedKing() {
+  void testFedSoberUncomplimentedKing() {
     final var king = new King();
     king.getFed();
     king.changeMood();
@@ -51,7 +51,7 @@ public class KingTest {
   }
 
   @Test
-  public void testHungryDrunkUncomplimentedKing() {
+  void testHungryDrunkUncomplimentedKing() {
     final var king = new King();
     king.getDrink();
     king.changeMood();
@@ -59,7 +59,7 @@ public class KingTest {
   }
 
   @Test
-  public void testHungrySoberComplimentedKing() {
+  void testHungrySoberComplimentedKing() {
     final var king = new King();
     king.receiveCompliments();
     king.changeMood();
@@ -67,7 +67,7 @@ public class KingTest {
   }
 
   @Test
-  public void testFedDrunkUncomplimentedKing() {
+  void testFedDrunkUncomplimentedKing() {
     final var king = new King();
     king.getFed();
     king.getDrink();
@@ -76,7 +76,7 @@ public class KingTest {
   }
 
   @Test
-  public void testFedSoberComplimentedKing() {
+  void testFedSoberComplimentedKing() {
     final var king = new King();
     king.getFed();
     king.receiveCompliments();
@@ -85,7 +85,7 @@ public class KingTest {
   }
 
   @Test
-  public void testFedDrunkComplimentedKing() {
+  void testFedDrunkComplimentedKing() {
     final var king = new King();
     king.getFed();
     king.getDrink();
@@ -95,7 +95,7 @@ public class KingTest {
   }
 
   @Test
-  public void testHungryDrunkComplimentedKing() {
+  void testHungryDrunkComplimentedKing() {
     final King king = new King();
     king.getDrink();
     king.receiveCompliments();

servant/src/test/java/com/iluwatar/servant/QueenTest.java

@@ -34,10 +34,10 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class QueenTest {
+class QueenTest {
 
   @Test
-  public void testNotFlirtyUncomplemented() {
+  void testNotFlirtyUncomplemented() {
     final var queen = new Queen();
     queen.setFlirtiness(false);
     queen.changeMood();
@@ -45,7 +45,7 @@ public class QueenTest {
   }
 
   @Test
-  public void testNotFlirtyComplemented() {
+  void testNotFlirtyComplemented() {
     final var queen = new Queen();
     queen.setFlirtiness(false);
     queen.receiveCompliments();
@@ -54,14 +54,14 @@ public class QueenTest {
   }
 
   @Test
-  public void testFlirtyUncomplemented() {
+  void testFlirtyUncomplemented() {
     final var queen = new Queen();
     queen.changeMood();
     assertFalse(queen.getMood());
   }
 
   @Test
-  public void testFlirtyComplemented() {
+  void testFlirtyComplemented() {
     final var queen = new Queen();
     queen.receiveCompliments();
     queen.changeMood();

servant/src/test/java/com/iluwatar/servant/ServantTest.java

@@ -37,10 +37,10 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ServantTest {
+class ServantTest {
 
   @Test
-  public void testFeed() {
+  void testFeed() {
     final var royalty = mock(Royalty.class);
     final var servant = new Servant("test");
     servant.feed(royalty);
@@ -49,7 +49,7 @@ public class ServantTest {
   }
 
   @Test
-  public void testGiveWine() {
+  void testGiveWine() {
     final var royalty = mock(Royalty.class);
     final var servant = new Servant("test");
     servant.giveWine(royalty);
@@ -58,7 +58,7 @@ public class ServantTest {
   }
 
   @Test
-  public void testGiveCompliments() {
+  void testGiveCompliments() {
     final var royalty = mock(Royalty.class);
     final var servant = new Servant("test");
     servant.giveCompliments(royalty);
@@ -67,7 +67,7 @@ public class ServantTest {
   }
 
   @Test
-  public void testCheckIfYouWillBeHanged() {
+  void testCheckIfYouWillBeHanged() {
     final var goodMoodRoyalty = mock(Royalty.class);
     when(goodMoodRoyalty.getMood()).thenReturn(true);