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

poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java

@@ -24,16 +24,14 @@
 package com.iluwatar.poison.pill;
 
 import com.iluwatar.poison.pill.Message.Headers;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Class responsible for receiving and handling submitted to the queue messages.
  */
+@Slf4j
 public class Consumer {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Consumer.class);
-
   private final MqSubscribePoint queue;
   private final String name;
 

poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.java

@@ -25,17 +25,15 @@ package com.iluwatar.poison.pill;
 
 import com.iluwatar.poison.pill.Message.Headers;
 import java.util.Date;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Class responsible for producing unit of work that can be expressed as message and submitted to
  * queue.
  */
+@Slf4j
 public class Producer {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Producer.class);
-
   private final MqPublishPoint queue;
   private final String name;
   private boolean isStopped;

poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java

@@ -56,7 +56,7 @@ public class ConsumerTest {
   }
 
   @Test
-  public void testConsume() throws Exception {
+  void testConsume() throws Exception {
     final var messages = List.of(
         createMessage("you", "Hello!"),
         createMessage("me", "Hi!"),

poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java

@@ -37,33 +37,33 @@ import org.junit.jupiter.api.Test;
 public class PoisonMessageTest {
 
   @Test
-  public void testAddHeader() {
+  void testAddHeader() {
     assertThrows(UnsupportedOperationException.class, () -> {
       POISON_PILL.addHeader(Headers.SENDER, "sender");
     });
   }
 
   @Test
-  public void testGetHeader() {
+  void testGetHeader() {
     assertThrows(UnsupportedOperationException.class, () -> {
       POISON_PILL.getHeader(Headers.SENDER);
     });
   }
 
   @Test
-  public void testGetHeaders() {
+  void testGetHeaders() {
     assertThrows(UnsupportedOperationException.class, POISON_PILL::getHeaders);
   }
 
   @Test
-  public void testSetBody() {
+  void testSetBody() {
     assertThrows(UnsupportedOperationException.class, () -> {
       POISON_PILL.setBody("Test message.");
     });
   }
 
   @Test
-  public void testGetBody() {
+  void testGetBody() {
     assertThrows(UnsupportedOperationException.class, POISON_PILL::getBody);
   }
 

poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java

@@ -43,7 +43,7 @@ import org.mockito.ArgumentCaptor;
 public class ProducerTest {
 
   @Test
-  public void testSend() throws Exception {
+  void testSend() throws Exception {
     final var publishPoint = mock(MqPublishPoint.class);
     final var producer = new Producer("producer", publishPoint);
     verifyZeroInteractions(publishPoint);
@@ -63,7 +63,7 @@ public class ProducerTest {
   }
 
   @Test
-  public void testStop() throws Exception {
+  void testStop() throws Exception {
     final var publishPoint = mock(MqPublishPoint.class);
     final var producer = new Producer("producer", publishPoint);
     verifyZeroInteractions(publishPoint);

poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java

@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
 public class SimpleMessageTest {
 
   @Test
-  public void testGetHeaders() {
+  void testGetHeaders() {
     final var message = new SimpleMessage();
     assertNotNull(message.getHeaders());
     assertTrue(message.getHeaders().isEmpty());
@@ -52,7 +52,7 @@ public class SimpleMessageTest {
   }
 
   @Test
-  public void testUnModifiableHeaders() {
+  void testUnModifiableHeaders() {
     final var message = new SimpleMessage();
     final var headers = message.getHeaders();
     assertThrows(UnsupportedOperationException.class, () -> {