SonarQube fix try 2

Author: alhusseain

queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/MessageQueue.java

@@ -36,7 +36,6 @@
 public class MessageQueue {
 
   private final BlockingQueue<Message> blkQueue;
-  public Object serviceExecutorWait =new Object();
 
   // Default constructor when called creates Blocking Queue object. 
   public MessageQueue() {
@@ -51,8 +50,8 @@ public void submitMsg(Message msg) {
     try {
       if (null != msg) {
         blkQueue.add(msg);
-        synchronized (serviceExecutorWait) {
-          serviceExecutorWait.notifyAll();
+        synchronized (ServiceExecutor.serviceExecutorWait) {
+          ServiceExecutor.serviceExecutorWait.notifyAll();
         }
       }
     } catch (Exception e) {

queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java

@@ -33,7 +33,7 @@
 @Slf4j
 public class ServiceExecutor implements Runnable {
   private final MessageQueue msgQueue;
-
+  public static final Object serviceExecutorWait = new Object();
   public ServiceExecutor(MessageQueue msgQueue) {
     this.msgQueue = msgQueue;
   }
@@ -50,8 +50,8 @@ public void run() {
           LOGGER.info(msg + " is served.");
         } else {
           LOGGER.info("Service Executor: Waiting for Messages to serve .. ");
-          synchronized (msgQueue.serviceExecutorWait) {
-            msgQueue.serviceExecutorWait.wait();
+          synchronized (serviceExecutorWait) {
+            serviceExecutorWait.wait();
           }
         }
       }

queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/TaskGenerator.java

@@ -50,7 +50,9 @@ public TaskGenerator(MessageQueue msgQueue, int msgCount) {
    */
   public void submit(Message msg) {
     try {
-      this.msgQueue.submitMsg(msg);
+      synchronized (msg) {
+        this.msgQueue.submitMsg(msg);
+      }
     } catch (Exception e) {
       LOGGER.error(e.getMessage());
     }
@@ -66,9 +68,12 @@ public void run() {
     try {
       while (count > 0) {
         var statusMsg = "Message-" + count + " submitted by " + Thread.currentThread().getName();
-        this.submit(new Message(statusMsg));
+        Message msg = new Message(statusMsg);
+        synchronized (msg) {
+          this.submit(msg);
+          LOGGER.info(statusMsg);
+        }
 
-        LOGGER.info(statusMsg);
 
         // reduce the message count.
         count--;