From 2ec4d9996e8185f83d6095dfaaa905442b5614b7 Mon Sep 17 00:00:00 2001 From: SwapnilPathak Date: Thu, 14 Sep 2017 12:26:53 +0530 Subject: [PATCH] Sonar Major Merge this if statement with the enclosing one Change-Id: I8086a6fc1dc24719c3ffd3785a12c086ab453ae8 Issue-ID: POLICY-233 Signed-off-by: SwapnilPathak --- .../src/main/java/org/onap/policy/admin/PolicyManagerServlet.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java index b4817147c..552537900 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java @@ -736,8 +736,7 @@ public class PolicyManagerServlet extends HttpServlet { el.put("modifiedBy", getUserName(policy.getModifiedBy())); resultList.add(el); } - }else if(!scopes.isEmpty()){ - if(scopes.contains(scopeNameValue)){ + }else if(!scopes.isEmpty() && scopes.contains(scopeNameValue)){ JSONObject el = new JSONObject(); el.put("name", policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1)); el.put("date", policy.getModifiedDate()); @@ -747,7 +746,6 @@ public class PolicyManagerServlet extends HttpServlet { el.put("createdBy", getUserName(policy.getCreatedBy())); el.put("modifiedBy", getUserName(policy.getModifiedBy())); resultList.add(el); - } } } } -- 2.16.6