From 3a6a20c5dbd92ecec7ebbb96cbf934038502d4d6 Mon Sep 17 00:00:00 2001
From: atayal <Ankush_Tayal@intuit.com>
Date: Fri, 12 Nov 2021 07:43:54 +0530
Subject: [PATCH] sonar bug fix & test cases

---
 .../com/iluwatar/commander/Commander.java     |  6 ++--
 .../com/iluwatar/commander/CommanderTest.java | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/commander/src/main/java/com/iluwatar/commander/Commander.java b/commander/src/main/java/com/iluwatar/commander/Commander.java
index 37d0268a3..79048a91a 100644
--- a/commander/src/main/java/com/iluwatar/commander/Commander.java
+++ b/commander/src/main/java/com/iluwatar/commander/Commander.java
@@ -250,7 +250,7 @@ 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;
@@ -420,8 +420,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);
     }
   }
diff --git a/commander/src/test/java/com/iluwatar/commander/CommanderTest.java b/commander/src/test/java/com/iluwatar/commander/CommanderTest.java
index f4da94a3f..9682689e7 100644
--- a/commander/src/test/java/com/iluwatar/commander/CommanderTest.java
+++ b/commander/src/test/java/com/iluwatar/commander/CommanderTest.java
@@ -79,6 +79,28 @@ class CommanderTest {
                 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());
@@ -207,6 +229,14 @@ class CommanderTest {
         }
     }
 
+    @Test
+    void testPlaceOrderVanilla() throws Exception {
+        Commander c = buildCommanderObjectVanilla();
+        var order = new Order(new User("K", "J"), "pen", 1f);
+        c.placeOrder(order);
+        assertFalse(StringUtils.isBlank(order.id));
+    }
+
     @Test
     void testPlaceOrder() throws Exception {
         Commander c = buildCommanderObject(true);