From: anushadasari <danush10@in.ibm.com>
Date: Tue, 12 Nov 2019 07:09:52 +0000 (+0530)
Subject: Merge this if statement with the enclosing one
X-Git-Tag: 2.2.0~37
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F98275%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: Ib1a5e730820b832f5e1d42aefd75f925a2ad26cc
Signed-off-by: anushadasari <danush10@in.ibm.com>
---

diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java
index 96f2ef2..80accfe 100755
--- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java
+++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java
@@ -66,10 +66,8 @@ public class AafAuthProvider implements AuthenticationProvider {
                 sessionId = webAuthDetails.getRemoteAddress() + ":" + webAuthDetails.getSessionId();
             }
         }
-        if (env.getProperty(AafProperties.aafEnabled.toString(), Boolean.class, true)) {
-            if (clientCache.authenticate(name, password, sessionId) != AuthorizationResult.Authenticated) {
+        if ((env.getProperty(AafProperties.aafEnabled.toString(), Boolean.class, true)) && (clientCache.authenticate(name, password, sessionId) != AuthorizationResult.Authenticated)) {
                 return null;
-            }
         }
         return new UsernamePasswordAuthenticationToken(name, password, new ArrayList<>());