Merge "Upgrade to latest elasticsearch"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / DecisionPolicyController.java

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 8427797..5ff20b6 100644 (file)
--- 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;
 
@@ -60,7 +61,9 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableReferenceType;
 public class DecisionPolicyController extends RestrictedBaseController {
        private static final Logger policyLogger = FlexLogger.getLogger(DecisionPolicyController.class);
        
-       public DecisionPolicyController(){}
+       public DecisionPolicyController(){
+               // This constructor is empty
+       }
 
        protected PolicyRestAdapter policyAdapter = null;
        private ArrayList<Object> attributeList;
@@ -126,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.
@@ -149,16 +152,16 @@ public class DecisionPolicyController extends RestrictedBaseController {
                                        if(!attributeList.isEmpty()) {
                                                for(int i=0; i<attributeList.size() ; i++){
                                                        Map<String, String> map = (Map<String,String>)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;
                                                        }
@@ -186,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().toString().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().toString().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().toString().equalsIgnoreCase("GUARD_BL_YAML")){
+                                                               }else if("GUARD_BL_YAML".equalsIgnoreCase(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId())){
                                                                        policyAdapter.setRuleProvider("GUARD_BL_YAML");
                                                                }
                                                        }else{
@@ -202,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<attributeList.size() ; i++){
                                                                                Map<String, String> map = (Map<String,String>)attributeList.get(i);
@@ -216,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<JAXBElement<?>> attributes = apply.getExpression().iterator();
                                                                                List<String> blackList = new ArrayList<>();
@@ -243,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();
@@ -281,14 +284,13 @@ public class DecisionPolicyController extends RestrictedBaseController {
                Map<String, String> ruleMap = new HashMap<>();
                ruleMap.put("id", "A" + (index +1));
                Map<String, String> dropDownMap = PolicyController.getDropDownMap();
-               for (String key : dropDownMap.keySet()) {
-                       String keyValue = dropDownMap.get(key);
-                       if (keyValue.equals(decisionApply.getFunctionId())) {
-                               ruleMap.put("dynamicRuleAlgorithmCombo", key);
+               for (Entry<String, String> 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<JAXBElement<?>> jaxbInnerDecisionTypes = innerDecisionApply.getExpression();
                        if (jaxbInnerDecisionTypes.get(0).getValue() instanceof AttributeDesignatorType) {