From: anushadasari <danush10@in.ibm.com>
Date: Tue, 12 Nov 2019 07:04:52 +0000 (+0530)
Subject: Merge this if statement with the enclosing one
X-Git-Tag: 2.2.0~38
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=04f519ef388b9e41b36a583b6f9507e11ec82338;p=optf%2Fcmso.git

Merge this if statement with the enclosing one

Merging collapsible if statements increases the code's readability.

Issue-ID: OPTFRA-634
Change-Id: Ie2c335c7de466edb6064b85cb602db46b8f3225d
Signed-off-by: anushadasari <danush10@in.ibm.com>
---

diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java
index 9aa439c..02d8886 100644
--- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java
+++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java
@@ -68,10 +68,8 @@ public class CmsoClientFilters implements ClientRequestFilter, ClientResponseFil
 
         String transactionId = (String) headers.getFirst(MessageHeaders.HeadersEnum.TransactionID.toString());
         String mdcId = MDC.get(MDC_KEY_REQUEST_ID);
-        if (transactionId == null || transactionId.equals("")) {
-            if (mdcId != null) {
+        if ((transactionId == null || transactionId.equals("")) && (mdcId != null)) {
                 headers.add(HeadersEnum.TransactionID.toString(), mdcId);
-            }
         }
         headers.add(HeadersEnum.FromAppID.toString(), appId);
     }