Merge "JUnit test for policy/engine PolicyEngineAPI"

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / components / DecisionPolicy.java

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java
index eae3e79..56c23ac 100644 (file)
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,9 +53,8 @@ import org.onap.policy.controlloop.policy.guard.GuardPolicy;
 import org.onap.policy.controlloop.policy.guard.MatchParameters;
 import org.onap.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
 import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
-import org.onap.policy.pap.xacml.rest.util.JPAUtils;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
-import org.onap.policy.rest.jpa.Datatype;
+import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.DecisionSettings;
 import org.onap.policy.rest.jpa.FunctionDefinition;
 import org.onap.policy.utils.PolicyUtils;
@@ -63,6 +62,7 @@ import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine;
 import org.onap.policy.xacml.util.XACMLPolicyScanner;
 
+import com.att.research.xacml.api.XACML3;
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.std.IdentifierImpl;
 
@@ -107,15 +107,15 @@ public class DecisionPolicy extends Policy {
        List<String> dynamicFieldTwoRuleAlgorithms = new LinkedList<>();
        List<String> dataTypeList = new LinkedList<>();
        
-       protected Map<String, String> dropDownMap = new HashMap<>();
+       private CommonClassDao commonClassDao;
        
-
        public DecisionPolicy() {
                super();
        }
        
-       public DecisionPolicy(PolicyRestAdapter policyAdapter){
+       public DecisionPolicy(PolicyRestAdapter policyAdapter, CommonClassDao commonClassDao){
                this.policyAdapter = policyAdapter;
+               this.commonClassDao = commonClassDao;
        }
        
        @Override
@@ -229,7 +229,8 @@ public class DecisionPolicy extends Policy {
                        decisionPolicy.setTarget(target);
 
                        Map<String, String> dynamicFieldDecisionSettings = policyAdapter.getDynamicSettingsMap();
-                       if(policyAdapter.getRuleProvider()!=null && policyAdapter.getRuleProvider().equals(AAFPROVIDER)){
+                       if(policyAdapter.getRuleProvider()!=null && (policyAdapter.getRuleProvider().equals(AAFPROVIDER)||
+                                       policyAdapter.getRuleProvider().equals(RAINY_DAY))){
                                dynamicFieldDecisionSettings = new HashMap<>();
                        }
                        
@@ -241,8 +242,8 @@ public class DecisionPolicy extends Policy {
                                VariableDefinitionType dynamicVariable = createDynamicVariable(key, value, dataType);
                                decisionPolicy.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(dynamicVariable);
                        }
-                       Map<String, String> dynamicFieldTreatmentAttributes = policyAdapter.getRainydayMap();
                        
+                       Map<String, String> dynamicFieldTreatmentAttributes = policyAdapter.getRainydayMap();
                        if(policyAdapter.getRuleProvider().equals(RAINY_DAY)){
                                for(String keyField : dynamicFieldTreatmentAttributes.keySet()) {
                                        String errorcode = keyField;
@@ -417,13 +418,11 @@ public class DecisionPolicy extends Policy {
                dynamicFieldComboRuleAlgorithms = policyAdapter.getDynamicRuleAlgorithmCombo();
                dynamicFieldOneRuleAlgorithms = policyAdapter.getDynamicRuleAlgorithmField1();
                dynamicFieldTwoRuleAlgorithms = policyAdapter.getDynamicRuleAlgorithmField2();
-               dropDownMap = createDropDownMap();
                
                if(policyAdapter.getRuleProvider()!=null && policyAdapter.getRuleProvider().equals(AAFPROVIDER)){
                        // Values for AAF Provider are here for XML Creation. 
                        ConditionType condition = new ConditionType();
                        ApplyType decisionApply = new ApplyType();
-                       String selectedFunction = "boolean-equal";
                        
                        AttributeValueType value1 = new AttributeValueType();
                        value1.setDataType(BOOLEAN_DATATYPE);
@@ -439,7 +438,7 @@ public class DecisionPolicy extends Policy {
                        innerDecisionApply.setFunctionId(FUNCTION_BOOLEAN_ONE_AND_ONLY);
                        innerDecisionApply.getExpression().add(new ObjectFactory().createAttributeDesignator(value2));
                        
-                       decisionApply.setFunctionId(dropDownMap.get(selectedFunction));
+                       decisionApply.setFunctionId(XACML3.ID_FUNCTION_BOOLEAN_EQUAL.stringValue());
                        decisionApply.getExpression().add(new ObjectFactory().createAttributeValue(value1));
                        decisionApply.getExpression().add(new ObjectFactory().createApply(innerDecisionApply));
                        condition.setExpression(new ObjectFactory().createApply(decisionApply));
@@ -493,7 +492,7 @@ public class DecisionPolicy extends Policy {
                                        String selectedFunction = dynamicFieldComboRuleAlgorithms.get(index);
                                        String value1 = dynamicFieldOneRuleAlgorithms.get(index);
                                        String value2 = dynamicFieldTwoRuleAlgorithms.get(index);
-                                       decisionApply.setFunctionId(dropDownMap.get(selectedFunction));
+                                       decisionApply.setFunctionId(getFunctionDefinitionId(selectedFunction));
                                        decisionApply.getExpression().add(new ObjectFactory().createApply(getInnerDecisionApply(value1)));
                                        decisionApply.getExpression().add(new ObjectFactory().createApply(getInnerDecisionApply(value2)));
                                        condition.setExpression(new ObjectFactory().createApply(decisionApply));
@@ -632,7 +631,7 @@ public class DecisionPolicy extends Policy {
                                // Getting the values from the form.
                                String functionKey = dynamicFieldComboRuleAlgorithms.get(index);
                                String value2 = dynamicFieldTwoRuleAlgorithms.get(index);
-                               decisionApply.setFunctionId(dropDownMap.get(functionKey));
+                               decisionApply.setFunctionId(getFunctionDefinitionId(functionKey));
                                // if two text field are rule attributes.
                                if ((value1.contains(RULE_VARIABLE)) && (value2.contains(RULE_VARIABLE))) {
                                        ApplyType innerDecisionApply1 = new ApplyType();
@@ -720,7 +719,7 @@ public class DecisionPolicy extends Policy {
                String selectedFunction = dynamicFieldComboRuleAlgorithms.get(index);
                String value1 = dynamicFieldOneRuleAlgorithms.get(index);
                String value2 = dynamicFieldTwoRuleAlgorithms.get(index);
-               decisionApply.setFunctionId(dropDownMap.get(selectedFunction));
+               decisionApply.setFunctionId(getFunctionDefinitionId(selectedFunction));
                decisionApply.getExpression().add(new ObjectFactory().createApply(getInnerDecisionApply(value1)));
                decisionApply.getExpression().add(new ObjectFactory().createApply(getInnerDecisionApply(value2)));
                return decisionApply;
@@ -759,24 +758,6 @@ public class DecisionPolicy extends Policy {
                dataTypeList.add(dataType);
        }
        
-       private Map<String,String> createDropDownMap(){
-               JPAUtils jpaUtils = null;
-               try {
-                       jpaUtils = JPAUtils.getJPAUtilsInstance(XACMLPapServlet.getEmf());
-               } catch (Exception e) {
-                       LOGGER.error("Exception Occured"+e);
-               }
-               Map<String, String> dropDownOptions = new HashMap<>();
-               if(jpaUtils!=null){
-                       Map<Datatype, List<FunctionDefinition>> functionMap = jpaUtils.getFunctionDatatypeMap();
-                       for (Map.Entry<Datatype,List<FunctionDefinition>> map: functionMap.entrySet()) {
-                               for (FunctionDefinition functionDef : map.getValue()) {
-                                       dropDownOptions.put(functionDef.getShortname(),functionDef.getXacmlid());
-                               }
-                       }
-               }
-               return dropDownOptions;
-       }
        
        private String getDataType(String key) {
                
@@ -799,4 +780,12 @@ public class DecisionPolicy extends Policy {
                return policyAdapter.getData();
        }
        
+       public String getFunctionDefinitionId(String key){
+       FunctionDefinition object = (FunctionDefinition) commonClassDao.getDataById(FunctionDefinition.class, "short_name", key);
+       if(object != null){
+               return object.getXacmlid();
+       }
+       return null;
+    }
+       
 }