From ffee745de05362b2da2bb79f87b0b36726bf1fef Mon Sep 17 00:00:00 2001 From: Daniel Cruz Date: Tue, 5 Dec 2017 09:33:54 -0600 Subject: [PATCH] Fix Sonar Issues for BRMSGW Removing additional sonar issues. Issue-ID: POLICY-472 Change-Id: Id447c0e31338321051b7d5f69e3087bbc95b504f Signed-off-by: Daniel Cruz --- .../org/onap/policy/brmsInterface/BRMSPush.java | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java index 4818fb3c8..601b0a49f 100644 --- a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java +++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java @@ -73,7 +73,6 @@ import org.onap.policy.api.PolicyException; import org.onap.policy.brmsInterface.jpa.BRMSGroupInfo; import org.onap.policy.brmsInterface.jpa.BRMSPolicyInfo; import org.onap.policy.brmsInterface.jpa.DependencyInfo; -import org.onap.policy.common.im.AdministrativeStateException; import org.onap.policy.common.im.IntegrityMonitor; import org.onap.policy.common.logging.eelf.MessageCodes; import org.onap.policy.common.logging.eelf.PolicyLogger; @@ -415,18 +414,16 @@ public class BRMSPush { LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while resolving Controller: " + e); } - } else if ("$dependency$".equals(key)) { - if (value.startsWith("[") && value.endsWith("]")) { - value = value.substring(1, value.length() - 1).trim(); - List dependencyStrings = Arrays.asList(value.split("},{")); - for (String dependencyString : dependencyStrings) { - try { - userDependencies - .add(PolicyUtils.jsonStringToObject(dependencyString, PEDependency.class)); - } catch (Exception e) { - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW - + "Error while resolving Dependencies: " + e); - } + } else if ("$dependency$".equals(key) && value.startsWith("[") && value.endsWith("]")) { + value = value.substring(1, value.length() - 1).trim(); + List dependencyStrings = Arrays.asList(value.split("},{")); + for (String dependencyString : dependencyStrings) { + try { + userDependencies + .add(PolicyUtils.jsonStringToObject(dependencyString, PEDependency.class)); + } catch (Exception e) { + LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + + "Error while resolving Dependencies: " + e); } } } -- 2.16.6