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=4e8c8c14155f16a6a6cef8e7013bb3658ee40282;hb=79cd00fc32b9894672590418a5af9a64929db49d;hp=fdbee2a99834ffad7439ca80b14403f7d00e3c45;hpb=5aeeaae2e6ea881dd11601bedc2ffc94443bc9d3;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 fdbee2a99..4e8c8c141 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
@@ -63,27 +63,29 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableReferenceType;
 @RequestMapping("/")
 public class DecisionPolicyController extends RestrictedBaseController {
     private static final Logger policyLogger = FlexLogger.getLogger(DecisionPolicyController.class);
-
-    public DecisionPolicyController() {
-        // This constructor is empty
-    }
-
+    
+    public static final String FUNCTION_NOT = "urn:oasis:names:tc:xacml:1.0:function:not";
+    private static final String BLENTRY = "@blEntry@";
+    private static final String DECISIONRAWTYPE = "@#RuleProvider@#Decision_Raw@#RuleProvider@#";
+    private static final String GUARD_YAML= "GUARD_YAML";
+    private static final String GUARD_BL_YAML= "GUARD_BL_YAML";
+    private static final String GUARD_MIN_MAX= "GUARD_MIN_MAX";
+   
     protected PolicyRestAdapter policyAdapter = null;
-    private ArrayList<Object> attributeList;
-    private ArrayList<Object> decisionList;
     private ArrayList<Object> ruleAlgorithmList;
     private ArrayList<Object> treatmentList = null;
     protected LinkedList<Integer> ruleAlgoirthmTracker;
-    public static final String FUNCTION_NOT = "urn:oasis:names:tc:xacml:1.0:function:not";
-    private static final String blEntry = "@blEntry@";
-    private static final String decisionRawType = "@#RuleProvider@#Decision_Raw@#RuleProvider@#";
-
+    
+    public DecisionPolicyController() {
+        // This constructor is empty
+    }
+    
     public void rawXACMLPolicy(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
         try (InputStream policyXmlStream = XACMLPolicyWriter.getXmlAsInputStream(policyAdapter.getPolicyData())) {
             String name = StringUtils.substringAfter(entity.getPolicyName(), "Decision_");
             policyAdapter.setPolicyName(name.substring(0, name.indexOf('.')));
             policyAdapter.setRuleProvider("Raw");
-            policyAdapter.setRawXacmlPolicy(IOUtils.toString(policyXmlStream).replaceAll(decisionRawType, ""));
+            policyAdapter.setRawXacmlPolicy(IOUtils.toString(policyXmlStream).replaceAll(DECISIONRAWTYPE, ""));
         } catch (IOException e) {
             policyLogger.error("Exception Occured while setting XACML Raw Object" + e);
         }
@@ -91,16 +93,16 @@ public class DecisionPolicyController extends RestrictedBaseController {
 
     @SuppressWarnings("unchecked")
     public void prePopulateDecisionPolicyData(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
-        attributeList = new ArrayList<>();
-        decisionList = new ArrayList<>();
+        List<Object> attributeList = new ArrayList<>();
+        List<Object> decisionList = new ArrayList<>();
         ruleAlgorithmList = new ArrayList<>();
         treatmentList = new ArrayList<>();
 
         boolean rawPolicyCheck = false;
         if (policyAdapter.getPolicyData() instanceof PolicySetType) {
-            rawPolicyCheck = ((PolicySetType) policyAdapter.getPolicyData()).getDescription().contains(decisionRawType);
+            rawPolicyCheck = ((PolicySetType) policyAdapter.getPolicyData()).getDescription().contains(DECISIONRAWTYPE);
         } else {
-            rawPolicyCheck = ((PolicyType) policyAdapter.getPolicyData()).getDescription().contains(decisionRawType);
+            rawPolicyCheck = ((PolicyType) policyAdapter.getPolicyData()).getDescription().contains(DECISIONRAWTYPE);
         }
 
         if (rawPolicyCheck) {
@@ -115,9 +117,9 @@ public class DecisionPolicyController extends RestrictedBaseController {
             String description = "";
             String blackListEntryType = "Use Manual Entry";
             try {
-                if (policy.getDescription().contains(blEntry)) {
-                    blackListEntryType = policy.getDescription().substring(policy.getDescription().indexOf(blEntry) + 9,
-                            policy.getDescription().lastIndexOf(blEntry));
+                if (policy.getDescription().contains(BLENTRY)) {
+                    blackListEntryType = policy.getDescription().substring(policy.getDescription().indexOf(BLENTRY) + 9,
+                            policy.getDescription().lastIndexOf(BLENTRY));
                 }
                 policyAdapter.setBlackListEntryType(blackListEntryType);
                 description = policy.getDescription().substring(0, policy.getDescription().indexOf("@CreatedBy:"));
@@ -226,12 +228,15 @@ public class DecisionPolicyController extends RestrictedBaseController {
                                         .getAdviceExpression().get(0).getAdviceId())) {
                                     policyAdapter.setRuleProvider("AAF");
                                     break;
-                                } else if ("GUARD_YAML".equalsIgnoreCase(((RuleType) object).getAdviceExpressions()
+                                } else if (GUARD_YAML.equalsIgnoreCase(((RuleType) object).getAdviceExpressions()
+                                        .getAdviceExpression().get(0).getAdviceId())) {
+                                    policyAdapter.setRuleProvider(GUARD_YAML);
+                                } else if (GUARD_BL_YAML.equalsIgnoreCase(((RuleType) object).getAdviceExpressions()
                                         .getAdviceExpression().get(0).getAdviceId())) {
-                                    policyAdapter.setRuleProvider("GUARD_YAML");
-                                } else if ("GUARD_BL_YAML".equalsIgnoreCase(((RuleType) object).getAdviceExpressions()
+                                    policyAdapter.setRuleProvider(GUARD_BL_YAML);
+                                } else if (GUARD_MIN_MAX.equalsIgnoreCase(((RuleType) object).getAdviceExpressions()
                                         .getAdviceExpression().get(0).getAdviceId())) {
-                                    policyAdapter.setRuleProvider("GUARD_BL_YAML");
+                                    policyAdapter.setRuleProvider(GUARD_MIN_MAX);
                                 }
                             } else {
                                 policyAdapter.setRuleProvider("Custom");
@@ -242,8 +247,9 @@ public class DecisionPolicyController extends RestrictedBaseController {
                                 decisionApply = (ApplyType) decisionApply.getExpression().get(0).getValue();
                                 ruleAlgoirthmTracker = new LinkedList<>();
                                 if (policyAdapter.getRuleProvider() != null
-                                        && ("GUARD_YAML".equals(policyAdapter.getRuleProvider())
-                                                || ("GUARD_BL_YAML".equals(policyAdapter.getRuleProvider())))) {
+                                        && (GUARD_YAML.equals(policyAdapter.getRuleProvider())
+                                                || (GUARD_BL_YAML.equals(policyAdapter.getRuleProvider()))
+                                                || (GUARD_MIN_MAX.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);
@@ -255,6 +261,10 @@ public class DecisionPolicyController extends RestrictedBaseController {
                                             yamlParams.setTargets(Arrays.asList(map.get("value").split("\\|")));
                                         } else if ("clname".equals(map.get("key"))) {
                                             yamlParams.setClname(map.get("value"));
+                                        } else if ("min".equals(map.get("key"))) {
+                                            yamlParams.setMin(map.get("value"));
+                                        } else if ("max".equals(map.get("key"))) {
+                                            yamlParams.setMax(map.get("value"));
                                         }
                                     }
                                     ApplyType apply =
@@ -266,7 +276,7 @@ public class DecisionPolicyController extends RestrictedBaseController {
                                     yamlParams.setGuardActiveEnd(
                                             ((AttributeValueType) apply.getExpression().get(2).getValue()).getContent()
                                                     .get(0).toString());
-                                    if ("GUARD_BL_YAML".equals(policyAdapter.getRuleProvider())) {
+                                    if (GUARD_BL_YAML.equals(policyAdapter.getRuleProvider())) {
                                         apply = (ApplyType) ((ApplyType) ((ApplyType) decisionApply.getExpression()
                                                 .get(0).getValue()).getExpression().get(1).getValue()).getExpression()
                                                         .get(2).getValue();