Always use placeholders instead of string concatenation for log state…

…ments.
rishant · Dec 29, 2019 · 6e7352c · 6e7352c
1 parent 28e0465
commit 6e7352c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/jsmpp/src/main/java/org/jsmpp/bean/LongSMS.java b/jsmpp/src/main/java/org/jsmpp/bean/LongSMS.java
@@ -61,16 +61,15 @@ public static byte[][] splitMessage8Bit(byte[] aMessage) {
         int lengthOfData;
         byte[] referenceNumber = copyShort2Bytes(getReferenceNumber());
         for (int i = 0; i < segmentNum; i++) {
-            logger.debug("i = " + i);
+            logger.debug("i = {}", i);
             if (segmentNum - i == 1)
                 lengthOfData = messageLength - i * MAX_MESSAGE_SEGMENT_8BIT;
             else
                 lengthOfData = MAX_MESSAGE_SEGMENT_8BIT;
-            logger.debug("Length of data = " + lengthOfData);
+            logger.debug("Length of data = {}", lengthOfData);
 
             segments[i] = new byte[7 + lengthOfData];
-            logger.debug("segments[" + i + "].length = "
-                    + segments[i].length);
+            logger.debug("segments[{}].length = {}", i, segments[i].length);
 
             segments[i][0] = 6; // doesn't include itself, is header length
             // SAR identifier

diff --git a/jsmpp/src/main/java/org/jsmpp/session/AbstractSMPPOperation.java b/jsmpp/src/main/java/org/jsmpp/session/AbstractSMPPOperation.java
@@ -95,7 +95,7 @@ protected Command executeSendCommand(SendCommandTask task, long timeout)
         try {
             task.executeTask(connection().getOutputStream(), seqNum);
         } catch (IOException e) {
-            logger.error("Failed sending " + task.getCommandName() + " command", e);
+            logger.error("Failed sending {} command", task.getCommandName(), e);
             pendingResponse.remove(seqNum);
             throw e;
         }
@@ -141,7 +141,7 @@ public void unbind() throws ResponseTimeoutException, InvalidResponseException,
             logger.warn("PDU String should be always valid", e);
         } catch (NegativeResponseException e) {
             // ignore the negative response
-            logger.warn("Receive non-ok command_status (" + e.getCommandStatus() + ") for unbind_resp");
+            logger.warn("Receive non-ok command_status ({}) for unbind_resp", e.getCommandStatus(), e);
         }
     }
 

diff --git a/jsmpp/src/main/java/org/jsmpp/session/AbstractSession.java b/jsmpp/src/main/java/org/jsmpp/session/AbstractSession.java
@@ -276,7 +276,7 @@ protected Command executeSendCommand(SendCommandTask task, long timeout)
         try {
             task.executeTask(connection().getOutputStream(), seqNum);
         } catch (IOException e) {
-            logger.error("Failed sending " + task.getCommandName() + " command", e);
+            logger.error("Failed sending {} command", task.getCommandName(), e);
 
             if("enquire_link".equals(task.getCommandName())) {
                 logger.info("Tomas: Ignore failure of sending enquire_link, wait to see if connection is restored");
@@ -320,7 +320,7 @@ protected void executeSendCommandWithNoResponse(SendCommandTask task)
         try {
             task.executeTask(connection().getOutputStream(), seqNum);
         } catch (IOException e) {
-            logger.error("Failed sending " + task.getCommandName() + " command", e);
+            logger.error("Failed sending {} command", task.getCommandName(), e);
             close();
             throw e;
         }

diff --git a/jsmpp/src/main/java/org/jsmpp/session/AbstractSessionContext.java b/jsmpp/src/main/java/org/jsmpp/session/AbstractSessionContext.java
@@ -78,7 +78,7 @@ protected void fireStateChanged(SessionState newState,
             try {
                 l.onStateChange(newState, oldState, source);
             } catch (Exception e) {
-                logger.error("Invalid runtime exception thrown when calling onStateChange for " + source, e);
+                logger.error("Invalid runtime exception thrown when calling onStateChange for {}", source, e);
             }
         }
 

diff --git a/jsmpp/src/main/java/org/jsmpp/util/DefaultComposer.java b/jsmpp/src/main/java/org/jsmpp/util/DefaultComposer.java
@@ -522,7 +522,7 @@ public byte[] submitMulti(int sequenceNumber, String serviceType,
                 DistributionList dl = (DistributionList)destAddr;
                 StringValidator.validateString(dl.getName(), StringParameter.DL_NAME);
             } else {
-                logger.warn("Unknown destination address flag: " + destAddr.getClass());
+                logger.warn("Unknown destination address flag: {}", destAddr.getClass());
             }
 
         }