X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FDecisionPolicyController.java;h=5ff20b6fc28a9939a83d41090c9fccc4dae866a7;hb=52bd8ad44218a047284f1233984c514009feeb22;hp=46d24b207abdaabc1a0c8d7efbc6edd04eb76179;hpb=a6b8bc8875402ab721a8529926d01b2565d0f595;p=policy%2Fengine.git diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DecisionPolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DecisionPolicyController.java index 46d24b207..5ff20b6fc 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DecisionPolicyController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DecisionPolicyController.java @@ -27,6 +27,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import javax.xml.bind.JAXBElement; @@ -128,7 +129,7 @@ public class DecisionPolicyController extends RestrictedBaseController { AttributeDesignatorType designator = match.getAttributeDesignator(); String attributeId = designator.getAttributeId(); // First match in the target is OnapName, so set that value. - if (attributeId.equals("ONAPName")) { + if ("ONAPName".equals(attributeId)) { policyAdapter.setOnapName(value); } // Component attributes are saved under Target here we are fetching them back. @@ -151,16 +152,16 @@ public class DecisionPolicyController extends RestrictedBaseController { if(!attributeList.isEmpty()) { for(int i=0; i map = (Map)attributeList.get(i); - if(map.get("key").equals("WorkStep")){ + if("WorkStep".equals(map.get("key"))){ rainydayParams.setWorkstep(map.get("value")); rainy=true; - }else if(map.get("key").equals("BB_ID")){ + }else if("BB_ID".equals(map.get("key"))){ rainydayParams.setBbid(map.get("value")); rainy=true; - }else if(map.get("key").equals("ServiceType")){ + }else if("ServiceType".equals(map.get("key"))){ rainydayParams.setServiceType(map.get("value")); rainy=true; - }else if(map.get("key").equals("VNFType")){ + }else if("VNFType".equals(map.get("key"))){ rainydayParams.setVnfType(map.get("value")); rainy=true; } @@ -188,12 +189,12 @@ public class DecisionPolicyController extends RestrictedBaseController { // get the condition data under the rule for rule Algorithms. if(((RuleType) object).getEffect().equals(EffectType.DENY)) { if(((RuleType) object).getAdviceExpressions()!=null){ - if(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId().equalsIgnoreCase("AAF")){ + if("AAF".equalsIgnoreCase(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId())){ policyAdapter.setRuleProvider("AAF"); break; - }else if(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId().equalsIgnoreCase("GUARD_YAML")){ + }else if("GUARD_YAML".equalsIgnoreCase(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId())){ policyAdapter.setRuleProvider("GUARD_YAML"); - }else if(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId().equalsIgnoreCase("GUARD_BL_YAML")){ + }else if("GUARD_BL_YAML".equalsIgnoreCase(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId())){ policyAdapter.setRuleProvider("GUARD_BL_YAML"); } }else{ @@ -204,7 +205,7 @@ public class DecisionPolicyController extends RestrictedBaseController { ApplyType decisionApply = (ApplyType) condition.getExpression().getValue(); decisionApply = (ApplyType) decisionApply.getExpression().get(0).getValue(); ruleAlgoirthmTracker = new LinkedList<>(); - if(policyAdapter.getRuleProvider()!=null && (policyAdapter.getRuleProvider().equals("GUARD_YAML")||(policyAdapter.getRuleProvider().equals("GUARD_BL_YAML")))){ + if(policyAdapter.getRuleProvider()!=null && ("GUARD_YAML".equals(policyAdapter.getRuleProvider())||("GUARD_BL_YAML".equals(policyAdapter.getRuleProvider())))){ YAMLParams yamlParams = new YAMLParams(); for(int i=0; i map = (Map)attributeList.get(i); @@ -218,10 +219,10 @@ public class DecisionPolicyController extends RestrictedBaseController { yamlParams.setClname(map.get("value")); } } - ApplyType apply = ((ApplyType)((ApplyType)decisionApply.getExpression().get(0).getValue()).getExpression().get(0).getValue()); + ApplyType apply = (ApplyType)((ApplyType)decisionApply.getExpression().get(0).getValue()).getExpression().get(0).getValue(); yamlParams.setGuardActiveStart(((AttributeValueType)apply.getExpression().get(1).getValue()).getContent().get(0).toString()); yamlParams.setGuardActiveEnd(((AttributeValueType)apply.getExpression().get(2).getValue()).getContent().get(0).toString()); - if(policyAdapter.getRuleProvider().equals("GUARD_BL_YAML")){ + if("GUARD_BL_YAML".equals(policyAdapter.getRuleProvider())){ apply = (ApplyType)((ApplyType)((ApplyType)decisionApply.getExpression().get(0).getValue()).getExpression().get(1).getValue()).getExpression().get(2).getValue(); Iterator> attributes = apply.getExpression().iterator(); List blackList = new ArrayList<>(); @@ -245,7 +246,7 @@ public class DecisionPolicyController extends RestrictedBaseController { prePopulateDecisionCompoundRuleAlgorithm(index, decisionApply); policyAdapter.setRuleAlgorithmschoices(ruleAlgorithmList); } - } else if(policyAdapter.getRuleProvider()!=null && policyAdapter.getRuleProvider().equals("Rainy_Day")&& ((RuleType) object).getEffect().equals(EffectType.PERMIT)) { + } else if(policyAdapter.getRuleProvider()!=null && "Rainy_Day".equals(policyAdapter.getRuleProvider())&& ((RuleType) object).getEffect().equals(EffectType.PERMIT)) { TargetType ruleTarget = ((RuleType) object).getTarget(); AdviceExpressionsType adviceExpression = ((RuleType) object).getAdviceExpressions(); @@ -283,14 +284,13 @@ public class DecisionPolicyController extends RestrictedBaseController { Map ruleMap = new HashMap<>(); ruleMap.put("id", "A" + (index +1)); Map dropDownMap = PolicyController.getDropDownMap(); - for (String key : dropDownMap.keySet()) { - String keyValue = dropDownMap.get(key); - if (keyValue.equals(decisionApply.getFunctionId())) { - ruleMap.put("dynamicRuleAlgorithmCombo", key); + for (Entry entry : dropDownMap.entrySet()) { + if (entry.getValue().equals(decisionApply.getFunctionId())) { + ruleMap.put("dynamicRuleAlgorithmCombo", entry.getKey()); } } // Populate the key and value fields - if (((jaxbDecisionTypes.get(0).getValue()) instanceof AttributeValueType)) { + if ((jaxbDecisionTypes.get(0).getValue() instanceof AttributeValueType)) { ApplyType innerDecisionApply = (ApplyType) jaxbDecisionTypes.get(1).getValue(); List> jaxbInnerDecisionTypes = innerDecisionApply.getExpression(); if (jaxbInnerDecisionTypes.get(0).getValue() instanceof AttributeDesignatorType) {