Cleaned up duplicated literals

Cleaned up Sonar code smells related to the duplicated
literals in loggers.

Issue-ID: SO-1932
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I58c48cec0012c42b7b892ae76c24c6a087c60c7e

4 files changed, 19 insertions, 15 deletions

diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/CallbackHandlerService.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/CallbackHandlerService.java
index 7c0c2f20b3..c3349dd9e2 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/CallbackHandlerService.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/CallbackHandlerService.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.google.common.base.Strings;
 import org.camunda.bpm.engine.MismatchingMessageCorrelationException;
 import org.camunda.bpm.engine.OptimisticLockingException;
 import org.camunda.bpm.engine.RuntimeService;
@@ -207,7 +208,7 @@ public class CallbackHandlerService {
                                     + messageEventName + " with " + correlationVariable + " = '" + correlationValue
                                     + "'; last exception was:" + queryException;
                     logger.debug(msg);
-                    logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
+                    logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
                             ErrorCode.UnknownError.getValue(), msg, queryException);
                 }
 
@@ -245,8 +246,8 @@ public class CallbackHandlerService {
                 String msg = "Caught " + ole.getClass().getSimpleName() + " after receiving " + messageEventName
                         + " with " + correlationVariable + " = '" + correlationValue + "': " + ole;
                 logger.debug(msg);
-                logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN CORRELATION ERROR -",
-                        ErrorCode.UnknownError.getValue(), msg, ole);
+                logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(),
+                        "BPMN CORRELATION ERROR -", ErrorCode.UnknownError.getValue(), msg, ole);
 
                 // Retry for OptimisticLocking Exceptions
                 int retryCount = 0;
@@ -279,7 +280,7 @@ public class CallbackHandlerService {
                         String strMsg = "Received exception, OptimisticLockingException retry failed, retryCount:"
                                 + retryCount + " | exception returned: " + olex;
                         logger.debug(strMsg);
-                        logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
+                        logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
                                 ErrorCode.UnknownError.getValue(), strMsg, olex);
                     } catch (Exception excep) {
                         retryCount = 0;
@@ -287,7 +288,7 @@ public class CallbackHandlerService {
                         String strMsg = "Received exception, OptimisticLockingException retry failed, retryCount:"
                                 + retryCount + " | exception returned: " + excep;
                         logger.debug(strMsg);
-                        logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
+                        logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
                                 ErrorCode.UnknownError.getValue(), strMsg, excep);
                     }
 
@@ -300,7 +301,7 @@ public class CallbackHandlerService {
                         + " after receiving " + messageEventName + " with " + correlationVariable + " = '"
                         + correlationValue + "': " + e;
                 logger.debug(msg);
-                logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
+                logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
                         ErrorCode.UnknownError.getValue(), msg, e);
             }
         } catch (Exception e) {
@@ -309,8 +310,8 @@ public class CallbackHandlerService {
             String msg = "Caught " + e.getClass().getSimpleName() + " after receiving " + messageEventName + " with "
                     + correlationVariable + " = '" + correlationValue + "': " + e;
             logger.debug(msg);
-            logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN CORRELATION ERROR -",
-                    ErrorCode.UnknownError.getValue(), msg, e);
+            logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(),
+                    "BPMN CORRELATION ERROR -", ErrorCode.UnknownError.getValue(), msg, e);
         }
 
         return true;
@@ -345,10 +346,10 @@ public class CallbackHandlerService {
      */
     protected void logCallbackError(String method, long startTime, String msg, Exception e) {
         if (e == null) {
-            logger.error("{} {} {} {}", MessageEnum.BPMN_CALLBACK_EXCEPTION.toString(), "BPMN",
+            logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_CALLBACK_EXCEPTION.toString(), "BPMN",
                     ErrorCode.UnknownError.getValue(), msg);
         } else {
-            logger.error("{} {} {} {}", MessageEnum.BPMN_CALLBACK_EXCEPTION.toString(), "BPMN",
+            logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_CALLBACK_EXCEPTION.toString(), "BPMN",
                     ErrorCode.UnknownError.getValue(), msg, e);
         }
     }
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowMessageResource.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowMessageResource.java
index 1e9ebdf0b2..da18ac2f40 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowMessageResource.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowMessageResource.java
@@ -32,6 +32,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import com.google.common.base.Strings;
 import org.onap.so.bpmn.common.workflow.service.CallbackHandlerService.CallbackError;
 import org.onap.so.bpmn.common.workflow.service.CallbackHandlerService.CallbackResult;
 import org.onap.so.logger.ErrorCode;
@@ -78,7 +79,7 @@ public class WorkflowMessageResource {
         if (messageType == null || messageType.isEmpty()) {
             String msg = "Missing message type";
             logger.debug(LOGMARKER + " " + msg);
-            logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
+            logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
                     ErrorCode.DataError.getValue(), LOGMARKER + ":" + msg);
             return Response.status(400).entity(msg).build();
         }
@@ -86,7 +87,7 @@ public class WorkflowMessageResource {
         if (correlator == null || correlator.isEmpty()) {
             String msg = "Missing correlator";
             logger.debug(LOGMARKER + " " + msg);
-            logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
+            logger.error(Strings.repeat("{} ", 4), MessageEnum.BPMN_GENERAL_EXCEPTION.toString(), "BPMN",
                     ErrorCode.DataError.getValue(), LOGMARKER + ":" + msg);
             return Response.status(400).entity(msg).build();
         }
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowResource.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowResource.java
index 9d63e8eaf1..ef6a27b0fc 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowResource.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowResource.java
@@ -36,6 +36,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
+import com.google.common.base.Strings;
 import org.camunda.bpm.engine.HistoryService;
 import org.camunda.bpm.engine.ProcessEngineException;
 import org.camunda.bpm.engine.ProcessEngineServices;
@@ -195,7 +196,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
             if (processInstance != null)
                 workflowResponse.setProcessInstanceID(processInstance.getId());
 
-            logger.error("{} {} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), "BPMN",
+            logger.error(Strings.repeat("{} ", 5), MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), "BPMN",
                     MDC.get(processKey), ErrorCode.UnknownError.getValue(), LOGMARKER + workflowResponse.getMessage()
                             + " for processKey: " + processKey + " with response: " + workflowResponse.getResponse());
 
@@ -581,7 +582,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
             response.setResponse("Failed to retrieve the variables," + ex.getMessage());
             response.setProcessInstanceID(processInstanceId);
 
-            logger.error("{} {} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), "BPMN",
+            logger.error(Strings.repeat("{} ", 5), MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), "BPMN",
                     MDC.get(processKey), ErrorCode.UnknownError.getValue(), LOGMARKER + response.getMessage()
                             + " for processKey: " + processKey + " with response: " + response.getResponse());
             logger.debug("Exception :", ex);
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
index c61808ebb1..599dce5339 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
@@ -24,6 +24,7 @@ package org.onap.so.bpmn.infrastructure;
 
 import java.util.List;
 import java.util.concurrent.Executor;
+import com.google.common.base.Strings;
 import org.camunda.bpm.application.PostDeploy;
 import org.camunda.bpm.application.PreUndeploy;
 import org.camunda.bpm.application.ProcessApplicationInfo;
@@ -129,7 +130,7 @@ public class MSOInfrastructureApplication {
                     workflowName += BPMN_SUFFIX;
                 }
                 if (workflowBody != null) {
-                    logger.info("{} {}", "Deploying custom workflow", workflowName);
+                    logger.info(Strings.repeat("{} ", 2), "Deploying custom workflow", workflowName);
                     deploymentBuilder.addString(workflowName, workflowBody);
                 }
             }