From: anushadasari <danush10@in.ibm.com>
Date: Wed, 20 Nov 2019 11:07:35 +0000 (+0530)
Subject: Merge this if statement with the enclosing one
X-Git-Tag: 2.2.0~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F98658%2F1;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: I22d3bd915605507db8fbfcae9d52a5b1b2de8f3f
Signed-off-by: anushadasari <danush10@in.ibm.com>
---

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java b/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java
index 893d74c..804fe68 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java
@@ -72,10 +72,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 || "".equals(transactionId)) {
-            if (mdcId != null) {
+        if ((transactionId == null || "".equals(transactionId)) && (mdcId != null)) {
                 headers.add(HeadersEnum.TransactionID.toString(), mdcId);
-            }
         }
         headers.add(HeadersEnum.FromAppID.toString(), appId);
     }