Add language to claim check frontmatter

2021-12-12 20:55:17 +02:00
29 changed files with 254 additions and 894 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -1749,33 +1749,6 @@
        "review",
        "code"
      ]
-    },
-    {
-      "login": "interactwithankush",
-      "name": "interactwithankush",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18613127?v=4",
-      "profile": "https://github.com/interactwithankush",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "yuhangbin",
-      "name": "CharlieYu",
-      "avatar_url": "https://avatars.githubusercontent.com/u/17566866?v=4",
-      "profile": "https://github.com/yuhangbin",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Leisterbecker",
-      "name": "Leisterbecker",
-      "avatar_url": "https://avatars.githubusercontent.com/u/20650323?v=4",
-      "profile": "https://github.com/Leisterbecker",
-      "contributions": [
-        "code"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=coverage)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns)
 [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-195-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-192-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 <br/>
@ -322,9 +322,6 @@ This project is licensed under the terms of the MIT license.
    <td align="center"><a href="https://www.linkedin.com/in/abhinav-vashisth-06613b208/"><img src="https://avatars.githubusercontent.com/u/89785800?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Abhinav Vashisth</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=vashisthabhinav" title="Documentation">📖</a></td>
    <td align="center"><a href="http://no website"><img src="https://avatars.githubusercontent.com/u/47126749?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AKevinyl3" title="Reviewed Pull Requests">👀</a></td>
    <td align="center"><a href="https://github.com/Shrirang97"><img src="https://avatars.githubusercontent.com/u/28738668?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shrirang</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AShrirang97" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/iluwatar/java-design-patterns/commits?author=Shrirang97" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/interactwithankush"><img src="https://avatars.githubusercontent.com/u/18613127?v=4?s=100" width="100px;" alt=""/><br /><sub><b>interactwithankush</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=interactwithankush" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/yuhangbin"><img src="https://avatars.githubusercontent.com/u/17566866?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CharlieYu</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=yuhangbin" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Leisterbecker"><img src="https://avatars.githubusercontent.com/u/20650323?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leisterbecker</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Leisterbecker" title="Code">💻</a></td>
  </tr>
 </table>

--- a/adapter/README.md
+++ b/adapter/README.md
@ -18,10 +18,10 @@ couldn't otherwise because of incompatible interfaces.

 ## Explanation

-Real-world example
+Real world example

-> Consider that you have some pictures on your memory card and you need to transfer them to your computer. To transfer them, you need some kind of adapter that is compatible with your computer ports so that you can attach a memory card to your computer. In this case card reader is an adapter.
-> Another example would be the famous power adapter; a three-legged plug can't be connected to a two-pronged outlet, it needs to use a power adapter that makes it compatible with the two-pronged outlets.
+> Consider that you have some pictures in your memory card and you need to transfer them to your computer. In order to transfer them you need some kind of adapter that is compatible with your computer ports so that you can attach memory card to your computer. In this case card reader is an adapter.
+> Another example would be the famous power adapter; a three legged plug can't be connected to a two pronged outlet, it needs to use a power adapter that makes it compatible with the two pronged outlet.
 > Yet another example would be a translator translating words spoken by one person to another

 In plain words
@ -36,7 +36,7 @@ Wikipedia says

 Consider a captain that can only use rowing boats and cannot sail at all.

-First, we have interfaces `RowingBoat` and `FishingBoat`
+First we have interfaces `RowingBoat` and `FishingBoat`

 ```java
 public interface RowingBoat {
@ -68,7 +68,7 @@ public class Captain {
 }
 ```

-Now let's say the pirates are coming and our captain needs to escape but there is only a fishing boat available. We need to create an adapter that allows the captain to operate the fishing boat with his rowing boat skills.
+Now let's say the pirates are coming and our captain needs to escape but there is only fishing boat available. We need to create an adapter that allows the captain to operate the fishing boat with his rowing boat skills.

 ```java
@Slf4j
@ -100,10 +100,10 @@ captain.row();
 ## Applicability
 Use the Adapter pattern when

-* You want to use an existing class, and its interface does not match the one you need
-* You want to create a reusable class that cooperates with unrelated or unforeseen classes, that is, classes that don't necessarily have compatible interfaces
-* You need to use several existing subclasses, but it's impractical to adapt their interface by subclassing everyone. An object adapter can adapt the interface of its parent class.
-* Most of the applications using third-party libraries use adapters as a middle layer between the application and the 3rd party library to decouple the application from the library. If another library has to be used only an adapter for the new library is required without having to change the application code.
+* you want to use an existing class, and its interface does not match the one you need
+* you want to create a reusable class that cooperates with unrelated or unforeseen classes, that is, classes that don't necessarily have compatible interfaces
+* you need to use several existing subclasses, but it's impractical to adapt their interface by subclassing every one. An object adapter can adapt the interface of its parent class.
+* most of the applications using third party libraries use adapters as a middle layer between the application and the 3rd party library to decouple the application from the library. If another library has to be used only an adapter for the new library is required without having to change the application code.

 ## Tutorials

@ -114,17 +114,17 @@ Use the Adapter pattern when
 ## Consequences
 Class and object adapters have different trade-offs. A class adapter

-*	Adapts Adaptee to Target by committing to a concrete Adaptee class. As a consequence, a class adapter won’t work when we want to adapt a class and all its subclasses.
-*	Let’s Adapter override some of Adaptee’s behavior since Adapter is a subclass of Adaptee.
-*	Introduces only one object, and no additional pointer indirection is needed to get to the adaptee.
+*	adapts Adaptee to Target by committing to a concrete Adaptee class. As a consequence, a class adapter won’t work when we want to adapt a class and all its subclasses.
+*	let’s Adapter override some of Adaptee’s behavior, since Adapter is a subclass of Adaptee.
+*	introduces only one object, and no additional pointer indirection is needed to get to the adaptee.

 An object adapter	

-*	Lets a single Adapter work with many Adaptees—that is, the Adaptee itself and all of its subclasses (if any). The Adapter can also add functionality to all Adaptees at once.
-*	Makes it harder to override Adaptee behavior. It will require subclassing Adaptee and making the Adapter refer to the subclass rather than the Adaptee itself.
+*	let’s a single Adapter work with many Adaptees—that is, the Adaptee itself and all of its subclasses (if any). The Adapter can also add functionality to all Adaptees at once.
+*	makes it harder to override Adaptee behavior. It will require subclassing Adaptee and making Adapter refer to the subclass rather than the Adaptee itself.


-## Real-world examples
+## Known uses

 * [java.util.Arrays#asList()](http://docs.oracle.com/javase/8/docs/api/java/util/Arrays.html#asList%28T...%29)
 * [java.util.Collections#list()](https://docs.oracle.com/javase/8/docs/api/java/util/Collections.html#list-java.util.Enumeration-)
--- a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
+++ b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
@ -33,7 +33,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;

 /**
- * Tests for the adapter pattern.
+ * Test class
 */
 class AdapterPatternTest {

--- a/adapter/src/test/java/com/iluwatar/adapter/AppTest.java
+++ b/adapter/src/test/java/com/iluwatar/adapter/AppTest.java
@ -33,7 +33,9 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 class AppTest {

  /**
-   * Check whether the execution of the main method in {@link App}
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
   * throws an exception.
   */

--- a/command/src/main/java/com/iluwatar/command/Wizard.java
+++ b/command/src/main/java/com/iluwatar/command/Wizard.java
@ -36,6 +36,9 @@ public class Wizard {
  private final Deque<Runnable> undoStack = new LinkedList<>();
  private final Deque<Runnable> redoStack = new LinkedList<>();

+  public Wizard() {
+  }
+
  /**
   * Cast spell.
   */
--- a/commander/src/main/java/com/iluwatar/commander/Commander.java
+++ b/commander/src/main/java/com/iluwatar/commander/Commander.java
@ -90,13 +90,6 @@ public class Commander {
  private static final Logger LOG = LoggerFactory.getLogger(Commander.class);
  //we could also have another db where it stores all orders

-  private static final String ORDER_ID = "Order {}";
-  private static final String REQUEST_ID = " request Id: {}";
-  private static final String ERROR_CONNECTING_MSG_SVC =
-          ": Error in connecting to messaging service ";
-  private static final String TRY_CONNECTING_MSG_SVC =
-          ": Trying to connect to messaging service..";
-
  Commander(EmployeeHandle empDb, PaymentService paymentService, ShippingService shippingService,
            MessagingService messagingService, QueueDatabase qdb, int numOfRetries,
            long retryDuration, long queueTime, long queueTaskTime, long paymentTime,
@ -125,17 +118,17 @@ public class Commander {
    Retry.Operation op = (l) -> {
      if (!l.isEmpty()) {
        if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-          LOG.debug(ORDER_ID + ": Error in connecting to shipping service, "
-              + "trying again..", order.id);
+          LOG.debug("Order " + order.id + ": Error in connecting to shipping service, "
+              + "trying again..");
        } else {
-          LOG.debug(ORDER_ID + ": Error in creating shipping request..", order.id);
+          LOG.debug("Order " + order.id + ": Error in creating shipping request..");
        }
        throw l.remove(0);
      }
      String transactionId = shippingService.receiveRequest(order.item, order.user.address);
      //could save this transaction id in a db too
-      LOG.info(ORDER_ID + ": Shipping placed successfully, transaction id: {}",
-              order.id, transactionId);
+      LOG.info("Order " + order.id + ": Shipping placed successfully, transaction id: "
+          + transactionId);
      LOG.info("Order has been placed and will be shipped to you. Please wait while we make your"
          + " payment... ");
      sendPaymentRequest(order);
@ -145,19 +138,19 @@ public class Commander {
        LOG.info("Shipping is currently not possible to your address. We are working on the problem"
            + " and will get back to you asap.");
        finalSiteMsgShown = true;
-        LOG.info(ORDER_ID + ": Shipping not possible to address, trying to add problem "
-            + "to employee db..", order.id);
+        LOG.info("Order " + order.id + ": Shipping not possible to address, trying to add problem "
+            + "to employee db..");
        employeeHandleIssue(o);
      } else if (ItemUnavailableException.class.isAssignableFrom(err.getClass())) {
        LOG.info("This item is currently unavailable. We will inform you as soon as the item "
            + "becomes available again.");
        finalSiteMsgShown = true;
-        LOG.info(ORDER_ID + ": Item {}" + " unavailable, trying to add "
-            + "problem to employee handle..", order.id, order.item);
+        LOG.info("Order " + order.id + ": Item " + order.item + " unavailable, trying to add "
+            + "problem to employee handle..");
        employeeHandleIssue(o);
      } else {
        LOG.info("Sorry, there was a problem in creating your order. Please try later.");
-        LOG.error(ORDER_ID + ": Shipping service unavailable, order not placed..", order.id);
+        LOG.error("Order " + order.id + ": Shipping service unavailable, order not placed..");
        finalSiteMsgShown = true;
      }
    };
@ -171,7 +164,7 @@ public class Commander {
      if (order.paid.equals(PaymentStatus.TRYING)) {
        order.paid = PaymentStatus.NOT_DONE;
        sendPaymentFailureMessage(order);
-        LOG.error(ORDER_ID + ": Payment time for order over, failed and returning..", order.id);
+        LOG.error("Order " + order.id + ": Payment time for order over, failed and returning..");
      } //if succeeded or failed, would have been dequeued, no attempt to make payment     
      return;
    }
@ -180,18 +173,17 @@ public class Commander {
      Retry.Operation op = (l) -> {
        if (!l.isEmpty()) {
          if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-            LOG.debug(ORDER_ID + ": Error in connecting to payment service,"
-                + " trying again..", order.id);
+            LOG.debug("Order " + order.id + ": Error in connecting to payment service,"
+                + " trying again..");
          } else {
-            LOG.debug(ORDER_ID + ": Error in creating payment request..", order.id);
+            LOG.debug("Order " + order.id + ": Error in creating payment request..");
          }
          throw l.remove(0);
        }
        if (order.paid.equals(PaymentStatus.TRYING)) {
          var transactionId = paymentService.receiveRequest(order.price);
          order.paid = PaymentStatus.DONE;
-          LOG.info(ORDER_ID + ": Payment successful, transaction Id: {}",
-                  order.id, transactionId);
+          LOG.info("Order " + order.id + ": Payment successful, transaction Id: " + transactionId);
          if (!finalSiteMsgShown) {
            LOG.info("Payment made successfully, thank you for shopping with us!!");
            finalSiteMsgShown = true;
@ -207,7 +199,7 @@ public class Commander {
                + "Meanwhile, your order has been converted to COD and will be shipped.");
            finalSiteMsgShown = true;
          }
-          LOG.error(ORDER_ID + ": Payment details incorrect, failed..", order.id);
+          LOG.error("Order " + order.id + ": Payment details incorrect, failed..");
          o.paid = PaymentStatus.NOT_DONE;
          sendPaymentFailureMessage(o);
        } else {
@ -217,7 +209,7 @@ public class Commander {
                  + "asap. Don't worry, your order has been placed and will be shipped.");
              finalSiteMsgShown = true;
            }
-            LOG.warn(ORDER_ID + ": Payment error, going to queue..", order.id);
+            LOG.warn("Order " + order.id + ": Payment error, going to queue..");
            sendPaymentPossibleErrorMsg(o);
          }
          if (o.paid.equals(PaymentStatus.TRYING) && System
@ -242,7 +234,7 @@ public class Commander {
    if (System.currentTimeMillis() - qt.order.createdTime >= this.queueTime) {
      // since payment time is lesser than queuetime it would have already failed..
      // additional check not needed
-      LOG.trace(ORDER_ID + ": Queue time for order over, failed..", qt.order.id);
+      LOG.trace("Order " + qt.order.id + ": Queue time for order over, failed..");
      return;
    } else if (qt.taskType.equals(TaskType.PAYMENT) && !qt.order.paid.equals(PaymentStatus.TRYING)
        || qt.taskType.equals(TaskType.MESSAGING) && (qt.messageType == 1
@ -250,30 +242,30 @@ public class Commander {
        || qt.order.messageSent.equals(MessageSent.PAYMENT_FAIL)
        || qt.order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL))
        || qt.taskType.equals(TaskType.EMPLOYEE_DB) && qt.order.addedToEmployeeHandle) {
-      LOG.trace(ORDER_ID + ": Not queueing task since task already done..", qt.order.id);
+      LOG.trace("Order " + qt.order.id + ": Not queueing task since task already done..");
      return;
    }
    var list = queue.exceptionsList;
    Thread t = new Thread(() -> {
      Retry.Operation op = (list1) -> {
        if (!list1.isEmpty()) {
-          LOG.warn(ORDER_ID + ": Error in connecting to queue db, trying again..", qt.order.id);
+          LOG.warn("Order " + qt.order.id + ": Error in connecting to queue db, trying again..");
          throw list1.remove(0);
        }
        queue.add(qt);
        queueItems++;
-        LOG.info(ORDER_ID + ": {}" + " task enqueued..", qt.order.id, qt.getType());
+        LOG.info("Order " + qt.order.id + ": " + qt.getType() + " task enqueued..");
        tryDoingTasksInQueue();
      };
      Retry.HandleErrorIssue<QueueTask> handleError = (qt1, err) -> {
        if (qt1.taskType.equals(TaskType.PAYMENT)) {
          qt1.order.paid = PaymentStatus.NOT_DONE;
          sendPaymentFailureMessage(qt1.order);
-          LOG.error(ORDER_ID + ": Unable to enqueue payment task,"
-              + " payment failed..", qt1.order.id);
+          LOG.error("Order " + qt1.order.id + ": Unable to enqueue payment task,"
+              + " payment failed..");
        }
-        LOG.error(ORDER_ID + ": Unable to enqueue task of type {}"
-                + ", trying to add to employee handle..", qt1.order.id, qt1.getType());
+        LOG.error("Order " + qt1.order.id + ": Unable to enqueue task of type " + qt1.getType()
+            + ", trying to add to employee handle..");
        employeeHandleIssue(qt1.order);
      };
      var r = new Retry<>(op, handleError, numOfRetries, retryDuration,
@ -336,7 +328,7 @@ public class Commander {

  private void sendSuccessMessage(Order order) {
    if (System.currentTimeMillis() - order.createdTime >= this.messageTime) {
-      LOG.trace(ORDER_ID + ": Message time for order over, returning..", order.id);
+      LOG.trace("Order " + order.id + ": Message time for order over, returning..");
      return;
    }
    var list = messagingService.exceptionsList;
@ -362,8 +354,8 @@ public class Commander {
        && System.currentTimeMillis() - o.createdTime < messageTime) {
      var qt = new QueueTask(order, TaskType.MESSAGING, 2);
      updateQueue(qt);
-      LOG.info(ORDER_ID + ": Error in sending Payment Success message, trying to"
-          + " queue task and add to employee handle..", order.id);
+      LOG.info("Order " + order.id + ": Error in sending Payment Success message, trying to"
+          + " queue task and add to employee handle..");
      employeeHandleIssue(order);
    }
  }
@ -372,11 +364,11 @@ public class Commander {
    return (l) -> {
      if (!l.isEmpty()) {
        if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-          LOG.debug(ORDER_ID + ERROR_CONNECTING_MSG_SVC
-              + "(Payment Success msg), trying again..", order.id);
+          LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
+              + "(Payment Success msg), trying again..");
        } else {
-          LOG.debug(ORDER_ID + ": Error in creating Payment Success"
-              + " messaging request..", order.id);
+          LOG.debug("Order " + order.id + ": Error in creating Payment Success"
+              + " messaging request..");
        }
        throw l.remove(0);
      }
@ -384,15 +376,15 @@ public class Commander {
          && !order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL)) {
        var requestId = messagingService.receiveRequest(2);
        order.messageSent = MessageSent.PAYMENT_SUCCESSFUL;
-        LOG.info(ORDER_ID + ": Payment Success message sent,"
-            + REQUEST_ID, order.id, requestId);
+        LOG.info("Order " + order.id + ": Payment Success message sent,"
+            + " request Id: " + requestId);
      }
    };
  }

  private void sendPaymentFailureMessage(Order order) {
    if (System.currentTimeMillis() - order.createdTime >= this.messageTime) {
-      LOG.trace(ORDER_ID + ": Message time for order over, returning..", order.id);
+      LOG.trace("Order " + order.id + ": Message time for order over, returning..");
      return;
    }
    var list = messagingService.exceptionsList;
@ -420,8 +412,8 @@ public class Commander {
        && System.currentTimeMillis() - o.createdTime < messageTime) {
      var qt = new QueueTask(order, TaskType.MESSAGING, 0);
      updateQueue(qt);
-      LOG.warn(ORDER_ID + ": Error in sending Payment Failure message, "
-              + "trying to queue task and add to employee handle..", order.id);
+      LOG.warn("Order " + order.id + ": Error in sending Payment Failure message, "
+          + "trying to queue task and add to employee handle..");
      employeeHandleIssue(o);
    }
  }
@ -429,11 +421,11 @@ public class Commander {
  private void handlePaymentFailureRetryOperation(Order order, List<Exception> l) throws Exception {
    if (!l.isEmpty()) {
      if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-        LOG.debug(ORDER_ID + ERROR_CONNECTING_MSG_SVC
-            + "(Payment Failure msg), trying again..", order.id);
+        LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
+            + "(Payment Failure msg), trying again..");
      } else {
-        LOG.debug(ORDER_ID + ": Error in creating Payment Failure"
-            + " message request..", order.id);
+        LOG.debug("Order " + order.id + ": Error in creating Payment Failure"
+            + " message request..");
      }
      throw l.remove(0);
    }
@ -441,8 +433,8 @@ public class Commander {
        && !order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL)) {
      var requestId = messagingService.receiveRequest(0);
      order.messageSent = MessageSent.PAYMENT_FAIL;
-      LOG.info(ORDER_ID + ": Payment Failure message sent successfully,"
-          + REQUEST_ID, order.id, requestId);
+      LOG.info("Order " + order.id + ": Payment Failure message sent successfully,"
+          + " request Id: " + requestId);
    }
  }

@ -477,7 +469,7 @@ public class Commander {
      var qt = new QueueTask(order, TaskType.MESSAGING, 1);
      updateQueue(qt);
      LOG.warn("Order " + order.id + ": Error in sending Payment Error message, "
-              + "trying to queue task and add to employee handle..");
+          + "trying to queue task and add to employee handle..");
      employeeHandleIssue(o);
    }
  }
@ -486,11 +478,11 @@ public class Commander {
      throws Exception {
    if (!l.isEmpty()) {
      if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-        LOG.debug(ORDER_ID + ERROR_CONNECTING_MSG_SVC
-            + "(Payment Error msg), trying again..", order.id);
+        LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
+            + "(Payment Error msg), trying again..");
      } else {
-        LOG.debug(ORDER_ID + ": Error in creating Payment Error"
-            + " messaging request..", order.id);
+        LOG.debug("Order " + order.id + ": Error in creating Payment Error"
+            + " messaging request..");
      }
      throw l.remove(0);
    }
@ -498,28 +490,28 @@ public class Commander {
        .equals(MessageSent.NONE_SENT)) {
      var requestId = messagingService.receiveRequest(1);
      order.messageSent = MessageSent.PAYMENT_TRYING;
-      LOG.info(ORDER_ID + ": Payment Error message sent successfully,"
-          + REQUEST_ID, order.id, requestId);
+      LOG.info("Order " + order.id + ": Payment Error message sent successfully,"
+          + " request Id: " + requestId);
    }
  }

  private void employeeHandleIssue(Order order) {
    if (System.currentTimeMillis() - order.createdTime >= this.employeeTime) {
-      LOG.trace(ORDER_ID + ": Employee handle time for order over, returning..", order.id);
+      LOG.trace("Order " + order.id + ": Employee handle time for order over, returning..");
      return;
    }
    var list = employeeDb.exceptionsList;
    var t = new Thread(() -> {
      Retry.Operation op = (l) -> {
        if (!l.isEmpty()) {
-          LOG.warn(ORDER_ID + ": Error in connecting to employee handle,"
-              + " trying again..", order.id);
+          LOG.warn("Order " + order.id + ": Error in connecting to employee handle,"
+              + " trying again..");
          throw l.remove(0);
        }
        if (!order.addedToEmployeeHandle) {
          employeeDb.receiveRequest(order);
          order.addedToEmployeeHandle = true;
-          LOG.info(ORDER_ID + ": Added order to employee database", order.id);
+          LOG.info("Order " + order.id + ": Added order to employee database");
        }
      };
      Retry.HandleErrorIssue<Order> handleError = (o, err) -> {
@ -527,8 +519,8 @@ public class Commander {
            .currentTimeMillis() - order.createdTime < employeeTime) {
          var qt = new QueueTask(order, TaskType.EMPLOYEE_DB, -1);
          updateQueue(qt);
-          LOG.warn(ORDER_ID + ": Error in adding to employee db,"
-              + " trying to queue task..", order.id);
+          LOG.warn("Order " + order.id + ": Error in adding to employee db,"
+              + " trying to queue task..");
        }
      };
      var r = new Retry<>(op, handleError, numOfRetries, retryDuration,
@ -546,51 +538,51 @@ public class Commander {
    if (queueItems != 0) {
      var qt = queue.peek(); //this should probably be cloned here
      //this is why we have retry for doTasksInQueue
-      LOG.trace(ORDER_ID + ": Started doing task of type {}", qt.order.id, qt.getType());
+      LOG.trace("Order " + qt.order.id + ": Started doing task of type " + qt.getType());
      if (qt.getFirstAttemptTime() == -1) {
        qt.setFirstAttemptTime(System.currentTimeMillis());
      }
      if (System.currentTimeMillis() - qt.getFirstAttemptTime() >= queueTaskTime) {
        tryDequeue();
-        LOG.trace(ORDER_ID + ": This queue task of type {}"
-            + " does not need to be done anymore (timeout), dequeue..", qt.order.id, qt.getType());
+        LOG.trace("Order " + qt.order.id + ": This queue task of type " + qt.getType()
+            + " does not need to be done anymore (timeout), dequeue..");
      } else {
        if (qt.taskType.equals(TaskType.PAYMENT)) {
          if (!qt.order.paid.equals(PaymentStatus.TRYING)) {
            tryDequeue();
-            LOG.trace(ORDER_ID + ": This payment task already done, dequeueing..", qt.order.id);
+            LOG.trace("Order " + qt.order.id + ": This payment task already done, dequeueing..");
          } else {
            sendPaymentRequest(qt.order);
-            LOG.debug(ORDER_ID + ": Trying to connect to payment service..", qt.order.id);
+            LOG.debug("Order " + qt.order.id + ": Trying to connect to payment service..");
          }
        } else if (qt.taskType.equals(TaskType.MESSAGING)) {
          if (qt.order.messageSent.equals(MessageSent.PAYMENT_FAIL)
              || qt.order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL)) {
            tryDequeue();
-            LOG.trace(ORDER_ID + ": This messaging task already done, dequeue..", qt.order.id);
+            LOG.trace("Order " + qt.order.id + ": This messaging task already done, dequeue..");
          } else if (qt.messageType == 1 && (!qt.order.messageSent.equals(MessageSent.NONE_SENT)
              || !qt.order.paid.equals(PaymentStatus.TRYING))) {
            tryDequeue();
-            LOG.trace(ORDER_ID + ": This messaging task does not need to be done,"
-                + " dequeue..", qt.order.id);
+            LOG.trace("Order " + qt.order.id + ": This messaging task does not need to be done,"
+                + " dequeue..");
          } else if (qt.messageType == 0) {
            sendPaymentFailureMessage(qt.order);
-            LOG.debug(ORDER_ID + TRY_CONNECTING_MSG_SVC, qt.order.id);
+            LOG.debug("Order " + qt.order.id + ": Trying to connect to messaging service..");
          } else if (qt.messageType == 1) {
            sendPaymentPossibleErrorMsg(qt.order);
-            LOG.debug(ORDER_ID + TRY_CONNECTING_MSG_SVC, qt.order.id);
+            LOG.debug("Order " + qt.order.id + ": Trying to connect to messaging service..");
          } else if (qt.messageType == 2) {
            sendSuccessMessage(qt.order);
-            LOG.debug(ORDER_ID + TRY_CONNECTING_MSG_SVC, qt.order.id);
+            LOG.debug("Order " + qt.order.id + ": Trying to connect to messaging service..");
          }
        } else if (qt.taskType.equals(TaskType.EMPLOYEE_DB)) {
          if (qt.order.addedToEmployeeHandle) {
            tryDequeue();
-            LOG.trace(ORDER_ID + ": This employee handle task already done,"
-                + " dequeue..", qt.order.id);
+            LOG.trace("Order " + qt.order.id + ": This employee handle task already done,"
+                + " dequeue..");
          } else {
            employeeHandleIssue(qt.order);
-            LOG.debug(ORDER_ID + ": Trying to connect to employee handle..", qt.order.id);
+            LOG.debug("Order " + qt.order.id + ": Trying to connect to employee handle..");
          }
        }
      }
--- a/commander/src/test/java/com/iluwatar/commander/CommanderTest.java
+++ b/commander/src/test/java/com/iluwatar/commander/CommanderTest.java
@ -1,526 +0,0 @@
-package com.iluwatar.commander;
-
-import com.iluwatar.commander.employeehandle.EmployeeDatabase;
-import com.iluwatar.commander.employeehandle.EmployeeHandle;
-import com.iluwatar.commander.exceptions.DatabaseUnavailableException;
-import com.iluwatar.commander.exceptions.ItemUnavailableException;
-import com.iluwatar.commander.exceptions.PaymentDetailsErrorException;
-import com.iluwatar.commander.exceptions.ShippingNotPossibleException;
-import com.iluwatar.commander.messagingservice.MessagingDatabase;
-import com.iluwatar.commander.messagingservice.MessagingService;
-import com.iluwatar.commander.paymentservice.PaymentDatabase;
-import com.iluwatar.commander.paymentservice.PaymentService;
-import com.iluwatar.commander.queue.QueueDatabase;
-import com.iluwatar.commander.shippingservice.ShippingDatabase;
-import com.iluwatar.commander.shippingservice.ShippingService;
-
-import org.junit.jupiter.api.Test;
-import org.junit.platform.commons.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
-class CommanderTest {
-
-    private final int numOfRetries = 1;
-    private final long retryDuration = 1_000;
-    private long queueTime = 1_00;
-    private long queueTaskTime = 1_000;
-    private long paymentTime = 6_000;
-    private long messageTime = 5_000;
-    private long employeeTime = 2_000;
-
-    private static final List<Exception> exceptionList = new ArrayList<>();
-
-    static {
-        exceptionList.add(new DatabaseUnavailableException());
-        exceptionList.add(new ShippingNotPossibleException());
-        exceptionList.add(new ItemUnavailableException());
-        exceptionList.add(new PaymentDetailsErrorException());
-        exceptionList.add(new IllegalStateException());
-    }
-
-    private Commander buildCommanderObject() {
-        return buildCommanderObject(false);
-    }
-
-    private Commander buildCommanderObject(boolean nonPaymentException) {
-        PaymentService paymentService = new PaymentService
-                (new PaymentDatabase(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException());
-
-        ShippingService shippingService;
-        MessagingService messagingService;
-        if (nonPaymentException) {
-            shippingService = new ShippingService(new ShippingDatabase(), new DatabaseUnavailableException());
-            messagingService = new MessagingService(new MessagingDatabase(), new DatabaseUnavailableException());
-
-        } else {
-            shippingService = new ShippingService(new ShippingDatabase(), new DatabaseUnavailableException());
-            messagingService = new MessagingService(new MessagingDatabase(), new DatabaseUnavailableException());
-
-        }
-        var employeeHandle = new EmployeeHandle
-                (new EmployeeDatabase(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException());
-        var qdb = new QueueDatabase
-                (new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException());
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, qdb, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    private Commander buildCommanderObjectVanilla() {
-        PaymentService paymentService = new PaymentService
-                (new PaymentDatabase(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException());
-        var shippingService = new ShippingService(new ShippingDatabase());
-        var messagingService = new MessagingService(new MessagingDatabase());
-        var employeeHandle = new EmployeeHandle
-                (new EmployeeDatabase(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException());
-        var qdb = new QueueDatabase
-                (new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException(),
-                        new DatabaseUnavailableException(), new DatabaseUnavailableException());
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, qdb, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    private Commander buildCommanderObjectUnknownException() {
-        PaymentService paymentService = new PaymentService
-                (new PaymentDatabase(), new IllegalStateException());
-        var shippingService = new ShippingService(new ShippingDatabase());
-        var messagingService = new MessagingService(new MessagingDatabase());
-        var employeeHandle = new EmployeeHandle
-                (new EmployeeDatabase(), new IllegalStateException());
-        var qdb = new QueueDatabase
-                (new DatabaseUnavailableException(), new IllegalStateException());
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, qdb, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    private Commander buildCommanderObjectNoPaymentException1() {
-        PaymentService paymentService = new PaymentService
-                (new PaymentDatabase());
-        var shippingService = new ShippingService(new ShippingDatabase());
-        var messagingService = new MessagingService(new MessagingDatabase());
-        var employeeHandle = new EmployeeHandle
-                (new EmployeeDatabase(), new IllegalStateException());
-        var qdb = new QueueDatabase
-                (new DatabaseUnavailableException(), new IllegalStateException());
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, qdb, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    private Commander buildCommanderObjectNoPaymentException2() {
-        PaymentService paymentService = new PaymentService
-                (new PaymentDatabase());
-        var shippingService = new ShippingService(new ShippingDatabase());
-        var messagingService = new MessagingService(new MessagingDatabase(), new IllegalStateException());
-        var employeeHandle = new EmployeeHandle
-                (new EmployeeDatabase(), new IllegalStateException());
-        var qdb = new QueueDatabase
-                (new DatabaseUnavailableException(), new IllegalStateException());
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, qdb, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    private Commander buildCommanderObjectNoPaymentException3() {
-        PaymentService paymentService = new PaymentService
-                (new PaymentDatabase());
-        var shippingService = new ShippingService(new ShippingDatabase());
-        var messagingService = new MessagingService(new MessagingDatabase(), new DatabaseUnavailableException());
-        var employeeHandle = new EmployeeHandle
-                (new EmployeeDatabase(), new IllegalStateException());
-        var qdb = new QueueDatabase
-                (new DatabaseUnavailableException(), new IllegalStateException());
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, qdb, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    private Commander buildCommanderObjectWithDB() {
-        return buildCommanderObjectWithoutDB(false, false, new IllegalStateException());
-    }
-
-    private Commander buildCommanderObjectWithDB(boolean includeException, boolean includeDBException, Exception e) {
-        var l = includeDBException ? new DatabaseUnavailableException() : e;
-        PaymentService paymentService;
-        ShippingService shippingService;
-        MessagingService messagingService;
-        EmployeeHandle employeeHandle;
-        if (includeException) {
-            paymentService = new PaymentService
-                    (new PaymentDatabase(), l);
-            shippingService = new ShippingService(new ShippingDatabase(), l);
-            messagingService = new MessagingService(new MessagingDatabase(), l);
-            employeeHandle = new EmployeeHandle
-                    (new EmployeeDatabase(), l);
-        } else {
-            paymentService = new PaymentService
-                    (null);
-            shippingService = new ShippingService(null);
-            messagingService = new MessagingService(null);
-            employeeHandle = new EmployeeHandle
-                    (null);
-        }
-
-
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, null, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    private Commander buildCommanderObjectWithoutDB() {
-        return buildCommanderObjectWithoutDB(false, false, new IllegalStateException());
-    }
-
-    private Commander buildCommanderObjectWithoutDB(boolean includeException, boolean includeDBException, Exception e) {
-        var l = includeDBException ? new DatabaseUnavailableException() : e;
-        PaymentService paymentService;
-        ShippingService shippingService;
-        MessagingService messagingService;
-        EmployeeHandle employeeHandle;
-        if (includeException) {
-            paymentService = new PaymentService
-                    (null, l);
-            shippingService = new ShippingService(null, l);
-            messagingService = new MessagingService(null, l);
-            employeeHandle = new EmployeeHandle
-                    (null, l);
-        } else {
-            paymentService = new PaymentService
-                    (null);
-            shippingService = new ShippingService(null);
-            messagingService = new MessagingService(null);
-            employeeHandle = new EmployeeHandle
-                    (null);
-        }
-
-
-        return new Commander(employeeHandle, paymentService, shippingService,
-                messagingService, null, numOfRetries, retryDuration,
-                queueTime, queueTaskTime, paymentTime, messageTime, employeeTime);
-    }
-
-    @Test
-    void testPlaceOrderVanilla() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            Commander c = buildCommanderObjectVanilla();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrder() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            Commander c = buildCommanderObject(true);
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrder2() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            Commander c = buildCommanderObject(false);
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderNoException1() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            Commander c = buildCommanderObjectNoPaymentException1();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderNoException2() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            Commander c = buildCommanderObjectNoPaymentException2();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderNoException3() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            Commander c = buildCommanderObjectNoPaymentException3();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderNoException4() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            Commander c = buildCommanderObjectNoPaymentException3();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                c.placeOrder(order);
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderUnknownException() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-            Commander c = buildCommanderObjectUnknownException();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderShortDuration() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-            Commander c = buildCommanderObject(true);
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderShortDuration2() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-            Commander c = buildCommanderObject(false);
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderNoExceptionShortMsgDuration() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-            Commander c = buildCommanderObjectNoPaymentException1();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderNoExceptionShortQueueDuration() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-            Commander c = buildCommanderObjectUnknownException();
-            var order = new Order(new User("K", "J"), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderWithDatabase() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-            Commander c = buildCommanderObjectWithDB();
-            var order = new Order(new User("K", null), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderWithDatabaseAndExceptions() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-
-            for (Exception e : exceptionList) {
-
-                Commander c = buildCommanderObjectWithDB(true, true, e);
-                var order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-
-                c = buildCommanderObjectWithDB(true, false, e);
-                order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-
-                c = buildCommanderObjectWithDB(false, false, e);
-                order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-
-                c = buildCommanderObjectWithDB(false, true, e);
-                order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderWithoutDatabase() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-            Commander c = buildCommanderObjectWithoutDB();
-            var order = new Order(new User("K", null), "pen", 1f);
-            for (Order.MessageSent ms : Order.MessageSent.values()) {
-                c.placeOrder(order);
-                assertFalse(StringUtils.isBlank(order.id));
-            }
-        }
-    }
-
-    @Test
-    void testPlaceOrderWithoutDatabaseAndExceptions() throws Exception {
-        for (double d = 0.1; d < 2; d = d + 0.1) {
-            paymentTime *= d;
-            queueTaskTime *= d;
-            messageTime *= d;
-            employeeTime *= d;
-            queueTime *= d;
-
-            for (Exception e : exceptionList) {
-
-                Commander c = buildCommanderObjectWithoutDB(true, true, e);
-                var order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-
-                c = buildCommanderObjectWithoutDB(true, false, e);
-                order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-
-                c = buildCommanderObjectWithoutDB(false, false, e);
-                order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-
-                c = buildCommanderObjectWithoutDB(false, true, e);
-                order = new Order(new User("K", null), "pen", 1f);
-                for (Order.MessageSent ms : Order.MessageSent.values()) {
-                    c.placeOrder(order);
-                    assertFalse(StringUtils.isBlank(order.id));
-                }
-            }
-        }
-    }
-
-}
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java
@ -49,28 +49,13 @@ public class App {
  public static void main(String[] args) {

    var kingJoffrey = new KingJoffrey();
-
-    var kingsHand = new KingsHand();
-    kingsHand.registerObserver(kingJoffrey, Event.TRAITOR_DETECTED);
-    kingsHand.registerObserver(kingJoffrey, Event.STARK_SIGHTED);
-    kingsHand.registerObserver(kingJoffrey, Event.WARSHIPS_APPROACHING);
-    kingsHand.registerObserver(kingJoffrey, Event.WHITE_WALKERS_SIGHTED);
-
-    var varys = new LordVarys();
-    varys.registerObserver(kingsHand, Event.TRAITOR_DETECTED);
-    varys.registerObserver(kingsHand, Event.WHITE_WALKERS_SIGHTED);
-
-    var scout = new Scout();
-    scout.registerObserver(kingsHand, Event.WARSHIPS_APPROACHING);
-    scout.registerObserver(varys, Event.WHITE_WALKERS_SIGHTED);
-
-    var baelish = new LordBaelish(kingsHand, Event.STARK_SIGHTED);
+    var kingsHand = new KingsHand(kingJoffrey);

    var emitters = List.of(
        kingsHand,
-        baelish,
-        varys,
-        scout
+        new LordBaelish(kingsHand),
+        new LordVarys(kingsHand),
+        new Scout(kingsHand)
    );

    Arrays.stream(Weekday.values())
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java
@ -31,7 +31,6 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
 public enum Event {

-  WHITE_WALKERS_SIGHTED("White walkers sighted"),
  STARK_SIGHTED("Stark sighted"),
  WARSHIPS_APPROACHING("Warships approaching"),
  TRAITOR_DETECTED("Traitor detected");
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java
@ -23,48 +23,31 @@

 package com.iluwatar.event.aggregator;

-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;

 /**
 * EventEmitter is the base class for event producers that can be observed.
 */
 public abstract class EventEmitter {

-  private final Map<Event, List<EventObserver>> observerLists;
+  private final List<EventObserver> observers;

  public EventEmitter() {
-    observerLists = new HashMap<>();
+    observers = new LinkedList<>();
  }

-  public EventEmitter(EventObserver obs, Event e) {
+  public EventEmitter(EventObserver obs) {
    this();
-    registerObserver(obs, e);
+    registerObserver(obs);
  }

-  /**
-  * Registers observer for specific event in the related list.
-  *
-  * @param obs the observer that observers this emitter
-  * @param e the specific event for that observation occurs
-  * */
-  public final void registerObserver(EventObserver obs, Event e) {
-    if (!observerLists.containsKey(e)) {
-      observerLists.put(e, new LinkedList<>());
-    }
-    if (!observerLists.get(e).contains(obs)) {
-      observerLists.get(e).add(obs);
-    }
+  public final void registerObserver(EventObserver obs) {
+    observers.add(obs);
  }

  protected void notifyObservers(Event e) {
-    if (observerLists.containsKey(e)) {
-      observerLists
-        .get(e)
-        .forEach(observer -> observer.onEvent(e));
-    }
+    observers.forEach(obs -> obs.onEvent(e));
  }

  public abstract void timePasses(Weekday day);
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java
@ -31,8 +31,8 @@ public class KingsHand extends EventEmitter implements EventObserver {
  public KingsHand() {
  }

-  public KingsHand(EventObserver obs, Event e) {
-    super(obs, e);
+  public KingsHand(EventObserver obs) {
+    super(obs);
  }

  @Override
@ -42,5 +42,6 @@ public class KingsHand extends EventEmitter implements EventObserver {

  @Override
  public void timePasses(Weekday day) {
+    // NOP
  }
 }
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java
@ -31,8 +31,8 @@ public class LordBaelish extends EventEmitter {
  public LordBaelish() {
  }

-  public LordBaelish(EventObserver obs, Event e) {
-    super(obs, e);
+  public LordBaelish(EventObserver obs) {
+    super(obs);
  }

  @Override
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java
@ -23,19 +23,16 @@

 package com.iluwatar.event.aggregator;

-import lombok.extern.slf4j.Slf4j;
-
 /**
 * LordVarys produces events.
 */
-@Slf4j
-public class LordVarys extends EventEmitter implements EventObserver {
+public class LordVarys extends EventEmitter {

  public LordVarys() {
  }

-  public LordVarys(EventObserver obs, Event e) {
-    super(obs, e);
+  public LordVarys(EventObserver obs) {
+    super(obs);
  }

  @Override
@ -44,10 +41,4 @@ public class LordVarys extends EventEmitter implements EventObserver {
      notifyObservers(Event.TRAITOR_DETECTED);
    }
  }
-
-
-  @Override
-  public void onEvent(Event e) {
-    notifyObservers(e);
-  }
 }
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java
@ -31,8 +31,8 @@ public class Scout extends EventEmitter {
  public Scout() {
  }

-  public Scout(EventObserver obs, Event e) {
-    super(obs, e);
+  public Scout(EventObserver obs) {
+    super(obs);
  }

  @Override
@ -40,8 +40,5 @@ public class Scout extends EventEmitter {
    if (day == Weekday.TUESDAY) {
      notifyObservers(Event.WARSHIPS_APPROACHING);
    }
-    if (day == Weekday.WEDNESDAY) {
-      notifyObservers(Event.WHITE_WALKERS_SIGHTED);
-    }
  }
 }
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java
@ -31,7 +31,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;

 import java.util.Objects;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import org.junit.jupiter.api.Test;
@ -47,7 +46,7 @@ abstract class EventEmitterTest<E extends EventEmitter> {
  /**
   * Factory used to create a new instance of the test object with a default observer
   */
-  private final BiFunction<EventObserver, Event, E> factoryWithDefaultObserver;
+  private final Function<EventObserver, E> factoryWithDefaultObserver;

  /**
   * Factory used to create a new instance of the test object without passing a default observer
@ -68,7 +67,7 @@ abstract class EventEmitterTest<E extends EventEmitter> {
   * Create a new event emitter test, using the given test object factories, special day and event
   */
  EventEmitterTest(final Weekday specialDay, final Event event,
-                   final BiFunction<EventObserver, Event, E> factoryWithDefaultObserver,
+                   final Function<EventObserver, E> factoryWithDefaultObserver,
                   final Supplier<E> factoryWithoutDefaultObserver) {

    this.specialDay = specialDay;
@ -130,8 +129,8 @@ abstract class EventEmitterTest<E extends EventEmitter> {
    final var observer2 = mock(EventObserver.class);

    final var emitter = this.factoryWithoutDefaultObserver.get();
-    emitter.registerObserver(observer1, event);
-    emitter.registerObserver(observer2, event);
+    emitter.registerObserver(observer1);
+    emitter.registerObserver(observer2);

    testAllDays(specialDay, event, emitter, observer1, observer2);
  }
@ -147,9 +146,9 @@ abstract class EventEmitterTest<E extends EventEmitter> {
    final var observer1 = mock(EventObserver.class);
    final var observer2 = mock(EventObserver.class);

-    final var emitter = this.factoryWithDefaultObserver.apply(defaultObserver, event);
-    emitter.registerObserver(observer1, event);
-    emitter.registerObserver(observer2, event);
+    final var emitter = this.factoryWithDefaultObserver.apply(defaultObserver);
+    emitter.registerObserver(observer1);
+    emitter.registerObserver(observer2);

    testAllDays(specialDay, event, emitter, defaultObserver, observer1, observer2);
  }
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java
@ -55,11 +55,7 @@ class KingsHandTest extends EventEmitterTest<KingsHand> {
  @Test
  void testPassThrough() throws Exception {
    final var observer = mock(EventObserver.class);
-    final var kingsHand = new KingsHand();
-    kingsHand.registerObserver(observer, Event.STARK_SIGHTED);
-    kingsHand.registerObserver(observer, Event.WARSHIPS_APPROACHING);
-    kingsHand.registerObserver(observer, Event.TRAITOR_DETECTED);
-    kingsHand.registerObserver(observer, Event.WHITE_WALKERS_SIGHTED);
+    final var kingsHand = new KingsHand(observer);

    // The kings hand should not pass any events before he received one
    verifyZeroInteractions(observer);
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/ScoutTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/ScoutTest.java
@ -34,9 +34,7 @@ class ScoutTest extends EventEmitterTest<Scout> {
   * Create a new test instance, using the correct object factory
   */
  public ScoutTest() {
-
-      super(Weekday.TUESDAY, Event.WARSHIPS_APPROACHING, Scout::new, Scout::new);
-
+    super(Weekday.TUESDAY, Event.WARSHIPS_APPROACHING, Scout::new, Scout::new);
  }

 }
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java
@ -96,11 +96,9 @@ public class NioReactor {
   * @throws IOException          if any I/O error occurs.
   */
  public void stop() throws InterruptedException, IOException {
-    reactorMain.shutdown();
+    reactorMain.shutdownNow();
    selector.wakeup();
-    if (!reactorMain.awaitTermination(4, TimeUnit.SECONDS)) {
-      reactorMain.shutdownNow();
-    }
+    reactorMain.awaitTermination(4, TimeUnit.SECONDS);
    selector.close();
    LOGGER.info("Reactor stopped");
  }
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.java
@ -64,8 +64,6 @@ public class ThreadPoolDispatcher implements Dispatcher {
  @Override
  public void stop() throws InterruptedException {
    executorService.shutdown();
-    if (executorService.awaitTermination(4, TimeUnit.SECONDS)) {
-      executorService.shutdownNow();
-    }
+    executorService.awaitTermination(4, TimeUnit.SECONDS);
  }
 }
--- a/spatial-partition/src/main/java/com/iluwatar/spatialpartition/SpatialPartitionBubbles.java
+++ b/spatial-partition/src/main/java/com/iluwatar/spatialpartition/SpatialPartitionBubbles.java
@ -34,11 +34,11 @@ import java.util.HashMap;
 public class SpatialPartitionBubbles extends SpatialPartitionGeneric<Bubble> {

  private final HashMap<Integer, Bubble> bubbles;
-  private final QuadTree bubblesQuadTree;
+  private final QuadTree quadTree;

-  SpatialPartitionBubbles(HashMap<Integer, Bubble> bubbles, QuadTree bubblesQuadTree) {
+  SpatialPartitionBubbles(HashMap<Integer, Bubble> bubbles, QuadTree quadTree) {
    this.bubbles = bubbles;
-    this.bubblesQuadTree = bubblesQuadTree;
+    this.quadTree = quadTree;
  }

  void handleCollisionsUsingQt(Bubble b) {
@ -46,7 +46,7 @@ public class SpatialPartitionBubbles extends SpatialPartitionGeneric<Bubble> {
    // centre of bubble and length = radius of bubble
    var rect = new Rect(b.coordinateX, b.coordinateY, 2D * b.radius, 2D * b.radius);
    var quadTreeQueryResult = new ArrayList<Point>();
-    this.bubblesQuadTree.query(rect, quadTreeQueryResult);
+    this.quadTree.query(rect, quadTreeQueryResult);
    //handling these collisions
    b.handleCollision(quadTreeQueryResult, this.bubbles);
  }
--- a/thread-pool/README.md
+++ b/thread-pool/README.md
@ -18,11 +18,11 @@ threads and eliminating the latency of creating new threads.

 ## Explanation

-Real-world example
+Real world example

 > We have a large number of relatively short tasks at hand. We need to peel huge amounts of potatoes 
-> and serve a mighty amount of coffee cups. Creating a new thread for each task would be a waste so 
-> we establish a thread pool.       
+> and serve mighty amount of coffee cups. Creating a new thread for each task would be a waste so we 
+> establish a thread pool.       

 In plain words

@ -99,7 +99,7 @@ public class PotatoPeelingTask extends Task {
 }
 ```

-Next, we present a runnable `Worker` class that the thread pool will utilize to handle all the potato 
+Next we present a runnable `Worker` class that the thread pool will utilize to handle all the potato 
 peeling and coffee making.

 ```java
--- a/throttling/README.md
+++ b/throttling/README.md
@ -16,12 +16,10 @@ Ensure that a given client is not able to access service resources more than the

 ## Explanation

-Real-world example
+Real world example

-> A young human and an old dwarf walk into a bar. They start ordering beers from the bartender.
-> The bartender immediately sees that the young human shouldn't consume too many drinks too fast
-> and refuses to serve if enough time has not passed. For the old dwarf, the serving rate can
-> be higher.
+> A large multinational corporation offers API to its customers. The API is rate-limited and each 
+> customer can only make certain amount of calls per second.      

 In plain words

@ -35,25 +33,30 @@ In plain words

 **Programmatic Example**

-`BarCustomer` class presents the clients of the `Bartender` API. `CallsCount` tracks the number of 
-calls per `BarCustomer`.
+Tenant class presents the clients of the API. CallsCount tracks the number of API calls per tenant.

 ```java
-public class BarCustomer {
+public class Tenant {

-    @Getter
-    private final String name;
-    @Getter
-    private final int allowedCallsPerSecond;
+  private final String name;
+  private final int allowedCallsPerSecond;

-    public BarCustomer(String name, int allowedCallsPerSecond, CallsCount callsCount) {
-        if (allowedCallsPerSecond < 0) {
-            throw new InvalidParameterException("Number of calls less than 0 not allowed");
-        }
-        this.name = name;
-        this.allowedCallsPerSecond = allowedCallsPerSecond;
-        callsCount.addTenant(name);
+  public Tenant(String name, int allowedCallsPerSecond, CallsCount callsCount) {
+    if (allowedCallsPerSecond < 0) {
+      throw new InvalidParameterException("Number of calls less than 0 not allowed");
    }
+    this.name = name;
+    this.allowedCallsPerSecond = allowedCallsPerSecond;
+    callsCount.addTenant(name);
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public int getAllowedCallsPerSecond() {
+    return allowedCallsPerSecond;
+  }
 }

@Slf4j
@ -73,14 +76,14 @@ public final class CallsCount {
  }

  public void reset() {
+    LOGGER.debug("Resetting the map.");
    tenantCallsCount.replaceAll((k, v) -> new AtomicLong(0));
-    LOGGER.info("reset counters");
  }
 }
 ```

-Next, the service that the tenants are calling is introduced. To track the call count, a throttler 
-timer is used.
+Next we introduce the service that the tenants are calling. To track the call count we use the 
+throttler timer.

 ```java
 public interface Throttler {
@ -108,103 +111,71 @@ public class ThrottleTimerImpl implements Throttler {
    }, 0, throttlePeriod);
  }
 }
-```

-`Bartender` offers the `orderDrink` service to the `BarCustomer`s. The customers probably don't
-know that the beer serving rate is limited by their appearances.
+class B2BService {

-```java
-class Bartender {
+  private static final Logger LOGGER = LoggerFactory.getLogger(B2BService.class);
+  private final CallsCount callsCount;

-    private static final Logger LOGGER = LoggerFactory.getLogger(Bartender.class);
-    private final CallsCount callsCount;
+  public B2BService(Throttler timer, CallsCount callsCount) {
+    this.callsCount = callsCount;
+    timer.start();
+  }

-    public Bartender(Throttler timer, CallsCount callsCount) {
-        this.callsCount = callsCount;
-        timer.start();
+  public int dummyCustomerApi(Tenant tenant) {
+    var tenantName = tenant.getName();
+    var count = callsCount.getCount(tenantName);
+    LOGGER.debug("Counter for {} : {} ", tenant.getName(), count);
+    if (count >= tenant.getAllowedCallsPerSecond()) {
+      LOGGER.error("API access per second limit reached for: {}", tenantName);
+      return -1;
    }
+    callsCount.incrementCount(tenantName);
+    return getRandomCustomerId();
+  }

-    public int orderDrink(BarCustomer barCustomer) {
-        var tenantName = barCustomer.getName();
-        var count = callsCount.getCount(tenantName);
-        if (count >= barCustomer.getAllowedCallsPerSecond()) {
-            LOGGER.error("I'm sorry {}, you've had enough for today!", tenantName);
-            return -1;
-        }
-        callsCount.incrementCount(tenantName);
-        LOGGER.debug("Serving beer to {} : [{} consumed] ", barCustomer.getName(), count+1);
-        return getRandomCustomerId();
-    }
-
-    private int getRandomCustomerId() {
-        return ThreadLocalRandom.current().nextInt(1, 10000);
-    }
+  private int getRandomCustomerId() {
+    return ThreadLocalRandom.current().nextInt(1, 10000);
+  }
 }
 ```

-Now it is possible to see the full example in action. `BarCustomer` young human is rate-limited to 2 
-calls per second and the old dwarf to 4.
+Now we are ready to see the full example in action. Tenant Adidas is rate-limited to 5 calls per 
+second and Nike to 6.

 ```java
-public static void main(String[] args) {
+  public static void main(String[] args) {
    var callsCount = new CallsCount();
-    var human = new BarCustomer("young human", 2, callsCount);
-    var dwarf = new BarCustomer("dwarf soldier", 4, callsCount);
+    var adidas = new Tenant("Adidas", 5, callsCount);
+    var nike = new Tenant("Nike", 6, callsCount);

    var executorService = Executors.newFixedThreadPool(2);
-
-    executorService.execute(() -> makeServiceCalls(human, callsCount));
-    executorService.execute(() -> makeServiceCalls(dwarf, callsCount));
-
+    executorService.execute(() -> makeServiceCalls(adidas, callsCount));
+    executorService.execute(() -> makeServiceCalls(nike, callsCount));
    executorService.shutdown();
+    
    try {
-        executorService.awaitTermination(10, TimeUnit.SECONDS);
+      executorService.awaitTermination(10, TimeUnit.SECONDS);
    } catch (InterruptedException e) {
-        LOGGER.error("Executor service terminated: {}", e.getMessage());
+      LOGGER.error("Executor Service terminated: {}", e.getMessage());
    }
-}
+  }

-private static void makeServiceCalls(BarCustomer barCustomer, CallsCount callsCount) {
-    var timer = new ThrottleTimerImpl(1000, callsCount);
-    var service = new Bartender(timer, callsCount);
+  private static void makeServiceCalls(Tenant tenant, CallsCount callsCount) {
+    var timer = new ThrottleTimerImpl(10, callsCount);
+    var service = new B2BService(timer, callsCount);
    // Sleep is introduced to keep the output in check and easy to view and analyze the results.
-    IntStream.range(0, 50).forEach(i -> {
-        service.orderDrink(barCustomer);
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException e) {
-            LOGGER.error("Thread interrupted: {}", e.getMessage());
-        }
+    IntStream.range(0, 20).forEach(i -> {
+      service.dummyCustomerApi(tenant);
+      try {
+        Thread.sleep(1);
+      } catch (InterruptedException e) {
+        LOGGER.error("Thread interrupted: {}", e.getMessage());
+      }
    });
-}
+  }
 ```

-An excerpt from the example's console output:
-
-```
-18:46:36.218 [Timer-0] INFO com.iluwatar.throttling.CallsCount - reset counters
-18:46:36.218 [Timer-1] INFO com.iluwatar.throttling.CallsCount - reset counters
-18:46:36.242 [pool-1-thread-2] DEBUG com.iluwatar.throttling.Bartender - Serving beer to dwarf soldier : [1 consumed] 
-18:46:36.242 [pool-1-thread-1] DEBUG com.iluwatar.throttling.Bartender - Serving beer to young human : [1 consumed] 
-18:46:36.342 [pool-1-thread-2] DEBUG com.iluwatar.throttling.Bartender - Serving beer to dwarf soldier : [2 consumed] 
-18:46:36.342 [pool-1-thread-1] DEBUG com.iluwatar.throttling.Bartender - Serving beer to young human : [2 consumed] 
-18:46:36.443 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:36.443 [pool-1-thread-2] DEBUG com.iluwatar.throttling.Bartender - Serving beer to dwarf soldier : [3 consumed] 
-18:46:36.544 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:36.544 [pool-1-thread-2] DEBUG com.iluwatar.throttling.Bartender - Serving beer to dwarf soldier : [4 consumed] 
-18:46:36.645 [pool-1-thread-2] ERROR com.iluwatar.throttling.Bartender - I'm sorry dwarf soldier, you've had enough for today!
-18:46:36.645 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:36.745 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:36.745 [pool-1-thread-2] ERROR com.iluwatar.throttling.Bartender - I'm sorry dwarf soldier, you've had enough for today!
-18:46:36.846 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:36.846 [pool-1-thread-2] ERROR com.iluwatar.throttling.Bartender - I'm sorry dwarf soldier, you've had enough for today!
-18:46:36.947 [pool-1-thread-2] ERROR com.iluwatar.throttling.Bartender - I'm sorry dwarf soldier, you've had enough for today!
-18:46:36.947 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:37.048 [pool-1-thread-2] ERROR com.iluwatar.throttling.Bartender - I'm sorry dwarf soldier, you've had enough for today!
-18:46:37.048 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:37.148 [pool-1-thread-1] ERROR com.iluwatar.throttling.Bartender - I'm sorry young human, you've had enough for today!
-18:46:37.148 [pool-1-thread-2] ERROR com.iluwatar.throttling.Bartender - I'm sorry dwarf soldier, you've had enough for today!
-```

 ## Class diagram

@ -214,7 +185,7 @@ An excerpt from the example's console output:

 The Throttling pattern should be used:

-* When service access needs to be restricted not to have high impact on the performance of the service.
+* When a service access needs to be restricted to not have high impacts on the performance of the service.
 * When multiple clients are consuming the same service resources and restriction has to be made according to the usage per client.

 ## Credits
--- a/throttling/src/main/java/com/iluwatar/throttling/App.java
+++ b/throttling/src/main/java/com/iluwatar/throttling/App.java
@ -34,11 +34,11 @@ import lombok.extern.slf4j.Slf4j;
 * complete service by users or a particular tenant. This can allow systems to continue to function
 * and meet service level agreements, even when an increase in demand places load on resources.
 * <p>
- * In this example there is a {@link Bartender} serving beer to {@link BarCustomer}s. This is a time
+ * In this example we have ({@link App}) as the initiating point of the service. This is a time
 * based throttling, i.e. only a certain number of calls are allowed per second.
 * </p>
- * ({@link BarCustomer}) is the service tenant class having a name and the number of calls allowed.
- * ({@link Bartender}) is the service which is consumed by the tenants and is throttled.
+ * ({@link Tenant}) is the Tenant POJO class with which many tenants can be created ({@link
+ * B2BService}) is the service which is consumed by the tenants and is throttled.
 */
@Slf4j
 public class App {
@ -50,35 +50,33 @@ public class App {
   */
  public static void main(String[] args) {
    var callsCount = new CallsCount();
-    var human = new BarCustomer("young human", 2, callsCount);
-    var dwarf = new BarCustomer("dwarf soldier", 4, callsCount);
+    var adidas = new Tenant("Adidas", 5, callsCount);
+    var nike = new Tenant("Nike", 6, callsCount);

    var executorService = Executors.newFixedThreadPool(2);

-    executorService.execute(() -> makeServiceCalls(human, callsCount));
-    executorService.execute(() -> makeServiceCalls(dwarf, callsCount));
+    executorService.execute(() -> makeServiceCalls(adidas, callsCount));
+    executorService.execute(() -> makeServiceCalls(nike, callsCount));

    executorService.shutdown();
    try {
-      if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) {
-        executorService.shutdownNow();
-      }
+      executorService.awaitTermination(10, TimeUnit.SECONDS);
    } catch (InterruptedException e) {
-      executorService.shutdownNow();
+      LOGGER.error("Executor Service terminated: {}", e.getMessage());
    }
  }

  /**
-   * Make calls to the bartender.
+   * Make calls to the B2BService dummy API.
   */
-  private static void makeServiceCalls(BarCustomer barCustomer, CallsCount callsCount) {
-    var timer = new ThrottleTimerImpl(1000, callsCount);
-    var service = new Bartender(timer, callsCount);
+  private static void makeServiceCalls(Tenant tenant, CallsCount callsCount) {
+    var timer = new ThrottleTimerImpl(10, callsCount);
+    var service = new B2BService(timer, callsCount);
    // Sleep is introduced to keep the output in check and easy to view and analyze the results.
-    IntStream.range(0, 50).forEach(i -> {
-      service.orderDrink(barCustomer);
+    IntStream.range(0, 20).forEach(i -> {
+      service.dummyCustomerApi(tenant);
      try {
-        Thread.sleep(100);
+        Thread.sleep(1);
      } catch (InterruptedException e) {
        LOGGER.error("Thread interrupted: {}", e.getMessage());
      }
--- a/throttling/src/main/java/com/iluwatar/throttling/B2BService.java
+++ b/throttling/src/main/java/com/iluwatar/throttling/B2BService.java
@ -29,32 +29,33 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 /**
- * Bartender is a service which accepts a BarCustomer (tenant) and throttles
- * the resource based on the time given to the tenant.
+ * A service which accepts a tenant and throttles the resource based on the time given to the
+ * tenant.
 */
-class Bartender {
+class B2BService {

-  private static final Logger LOGGER = LoggerFactory.getLogger(Bartender.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(B2BService.class);
  private final CallsCount callsCount;

-  public Bartender(Throttler timer, CallsCount callsCount) {
+  public B2BService(Throttler timer, CallsCount callsCount) {
    this.callsCount = callsCount;
    timer.start();
  }

  /**
-   * Orders a drink from the bartender.
+   * Calls dummy customer api.
+   *
   * @return customer id which is randomly generated
   */
-  public int orderDrink(BarCustomer barCustomer) {
-    var tenantName = barCustomer.getName();
+  public int dummyCustomerApi(Tenant tenant) {
+    var tenantName = tenant.getName();
    var count = callsCount.getCount(tenantName);
-    if (count >= barCustomer.getAllowedCallsPerSecond()) {
-      LOGGER.error("I'm sorry {}, you've had enough for today!", tenantName);
+    LOGGER.debug("Counter for {} : {} ", tenant.getName(), count);
+    if (count >= tenant.getAllowedCallsPerSecond()) {
+      LOGGER.error("API access per second limit reached for: {}", tenantName);
      return -1;
    }
    callsCount.incrementCount(tenantName);
-    LOGGER.debug("Serving beer to {} : [{} consumed] ", barCustomer.getName(), count + 1);
    return getRandomCustomerId();
  }

--- a/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java
+++ b/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java
@ -69,7 +69,7 @@ public final class CallsCount {
   * Resets the count of all the tenants in the map.
   */
  public void reset() {
+    LOGGER.debug("Resetting the map.");
    tenantCallsCount.replaceAll((k, v) -> new AtomicLong(0));
-    LOGGER.info("reset counters");
  }
 }
--- a/throttling/src/main/java/com/iluwatar/throttling/BarCustomer.java
+++ b/throttling/src/main/java/com/iluwatar/throttling/BarCustomer.java
@ -25,26 +25,22 @@ package com.iluwatar.throttling;

 import java.security.InvalidParameterException;

-import lombok.Getter;
-
 /**
- * BarCustomer is a tenant with a name and a number of allowed calls per second.
+ * A Pojo class to create a basic Tenant with the allowed calls per second.
 */
-public class BarCustomer {
+public class Tenant {

-  @Getter
  private final String name;
-  @Getter
  private final int allowedCallsPerSecond;

  /**
   * Constructor.
   *
-   * @param name Name of the BarCustomer
-   * @param allowedCallsPerSecond The number of calls allowed for this particular tenant.
+   * @param name                  Name of the tenant
+   * @param allowedCallsPerSecond The number of calls allowed for a particular tenant.
   * @throws InvalidParameterException If number of calls is less than 0, throws exception.
   */
-  public BarCustomer(String name, int allowedCallsPerSecond, CallsCount callsCount) {
+  public Tenant(String name, int allowedCallsPerSecond, CallsCount callsCount) {
    if (allowedCallsPerSecond < 0) {
      throw new InvalidParameterException("Number of calls less than 0 not allowed");
    }
@ -52,4 +48,12 @@ public class BarCustomer {
    this.allowedCallsPerSecond = allowedCallsPerSecond;
    callsCount.addTenant(name);
  }
+
+  public String getName() {
+    return name;
+  }
+
+  public int getAllowedCallsPerSecond() {
+    return allowedCallsPerSecond;
+  }
 }
--- a/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java
@ -32,18 +32,19 @@ import org.junit.jupiter.api.Test;
 /**
 * B2BServiceTest class to test the B2BService
 */
-public class BartenderTest {
+public class B2BServiceTest {

  private final CallsCount callsCount = new CallsCount();

  @Test
  void dummyCustomerApiTest() {
-    var tenant = new BarCustomer("pirate", 2, callsCount);
+    var tenant = new Tenant("testTenant", 2, callsCount);
    // In order to assure that throttling limits will not be reset, we use an empty throttling implementation
-    var timer = (Throttler) () -> {};
-    var service = new Bartender(timer, callsCount);
+    var timer = (Throttler) () -> {
+    };
+    var service = new B2BService(timer, callsCount);

-    IntStream.range(0, 5).mapToObj(i -> tenant).forEach(service::orderDrink);
+    IntStream.range(0, 5).mapToObj(i -> tenant).forEach(service::dummyCustomerApi);
    var counter = callsCount.getCount(tenant.getName());
    assertEquals(2, counter, "Counter limit must be reached");
  }
--- a/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java
@ -23,21 +23,20 @@

 package com.iluwatar.throttling;

-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;

 import java.security.InvalidParameterException;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;

 /**
 * TenantTest to test the creation of Tenant with valid parameters.
 */
-public class BarCustomerTest {
+public class TenantTest {

  @Test
  void constructorTest() {
    assertThrows(InvalidParameterException.class, () -> {
-      new BarCustomer("sirBrave", -1, new CallsCount());
+      new Tenant("FailTenant", -1, new CallsCount());
    });
  }
 }