Merge "FFix the Bug of Missing fields on View Screen"
[policy/engine.git] / ONAP-REST / src / main / java / org / onap / policy / rest / util / PolicyValidation.java
index 223381a..446073d 100644 (file)
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * 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.
@@ -20,6 +20,8 @@
 package org.onap.policy.rest.util;
 
 import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -27,6 +29,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.json.Json;
+import javax.json.JsonException;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+import javax.json.JsonValue;
+
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
@@ -60,8 +68,13 @@ public class PolicyValidation {
        public static final String ENFORCER_CONFIG_POLICY= "Enforcer Config";
        public static final String MICROSERVICES="Micro Service";
        public static final String FIREWALL="Firewall Config";
+       public static final String HTML_ITALICS_LNBREAK = "</i><br>";
+       public static final String SUCCESS = "success";
+       public static final String EMPTY_COMPONENT_ATTR = "Component Attributes: One or more Fields in Component Attributes is Empty.";
        
        private static Map<String, String> mapAttribute = new HashMap<>();
+       private static Map<String, String> jsonRequestMap = new HashMap<>();
+       private static List<String> modelRequiredFieldsList = new ArrayList<>();
        
        private static CommonClassDao commonClassDao;
        
@@ -73,7 +86,9 @@ public class PolicyValidation {
        /*
         * This is an empty constructor
         */
-       public PolicyValidation(){}     
+       public PolicyValidation(){
+               // Empty constructor
+       }
        
        
        public StringBuilder validatePolicy(PolicyRestAdapter policyData) throws IOException{
@@ -84,22 +99,127 @@ public class PolicyValidation {
                        
                        if(policyData.getPolicyName() != null){
                                String policyNameValidate = PolicyUtils.policySpecialCharValidator(policyData.getPolicyName());
-                               if(!policyNameValidate.contains("success")){
-                                       responseString.append("PolicyName:" +  policyNameValidate + "<br>");
+                               if(!policyNameValidate.contains(SUCCESS)){
+                                       responseString.append("<b>PolicyName</b>:<i>" +  policyNameValidate + HTML_ITALICS_LNBREAK);
                                        valid = false;
-                               };
+                               }
                        }else{
-                               responseString.append( "PolicyName: PolicyName Should not be empty" + "<br>");
+                               responseString.append( "<b>PolicyName</b>: PolicyName Should not be empty" + HTML_ITALICS_LNBREAK);
                                valid = false;
                        }
                        if(policyData.getPolicyDescription() != null){
                                String descriptionValidate = PolicyUtils.descriptionValidator(policyData.getPolicyDescription());
-                               if(!descriptionValidate.contains("success")){
-                                       responseString.append("Description:" +  descriptionValidate + "<br>");
+                               if(!descriptionValidate.contains(SUCCESS)){
+                                       responseString.append("<b>Description</b>:<i>" +  descriptionValidate + HTML_ITALICS_LNBREAK);
                                        valid = false;
                                }       
                        }
 
+                       if(!"API".equals(policyData.getApiflag()) && policyData.getAttributes() != null && !policyData.getAttributes().isEmpty()){
+                for(Object attribute : policyData.getAttributes()){
+                    if(attribute instanceof LinkedHashMap<?, ?>){
+                        String value = null;
+                        String key = null;
+                        if(((LinkedHashMap<?, ?>) attribute).get("key") != null){
+                            key = ((LinkedHashMap<?, ?>) attribute).get("key").toString();
+                            if(!PolicyUtils.policySpecialCharValidator(key).contains("success")){
+                                responseString.append("<b>Attributes or Component Attributes</b>:<i>" +  value + " : value has spaces or invalid characters</i><br>");
+                                valid = false;
+                            }
+                        }else{
+                            if(CONFIG_POLICY.equals(policyData.getPolicyType())){
+                                if("Base".equals(policyData.getConfigPolicyType())){
+                                    responseString.append("<b>Attributes</b>:<i> has one missing Attribute key</i><br>");
+                                }
+                                if("BRMS_Param".equals(policyData.getConfigPolicyType()) || "BRMS_Raw".equals(policyData.getConfigPolicyType())){
+                                    responseString.append("<b>Rule Attributes</b>:<i> has one missing Attribute key</i><br>");
+                                }
+                            }else{
+                                responseString.append("<b>Component Attributes</b>:<i> has one missing Component Attribute key</i><br>");
+                            }
+                            valid = false;
+                        }
+                        if(((LinkedHashMap<?, ?>) attribute).get("value") != null){
+                            value = ((LinkedHashMap<?, ?>) attribute).get("value").toString();
+                            if(!PolicyUtils.policySpecialCharValidator(value).contains("success")){
+                                if(CONFIG_POLICY.equals(policyData.getPolicyType())){
+                                    if("Base".equals(policyData.getConfigPolicyType())){
+                                        responseString.append("<b>Attributes</b>:<i>" +  value + " : value has spaces or invalid characters</i><br>");
+                                    }
+                                    if("BRMS_Param".equals(policyData.getConfigPolicyType()) || "BRMS_Raw".equals(policyData.getConfigPolicyType())){
+                                        responseString.append("<b>Rule Attributes</b>:<i>" +  value + " : value has spaces or invalid characters</i><br>");
+                                    }
+                                }else{
+                                    responseString.append("<b>Component Attributes</b>:<i>" +  value + " : value has spaces or invalid characters</i><br>");
+                                }
+                                valid = false;
+                            }
+                        }else{
+                            if(CONFIG_POLICY.equals(policyData.getPolicyType())){
+                                if("Base".equals(policyData.getConfigPolicyType())){
+                                    responseString.append("<b>Attributes</b>:<i> has one missing Attribute value</i><br>");
+                                }
+                                if("BRMS_Param".equals(policyData.getConfigPolicyType()) || "BRMS_Raw".equals(policyData.getConfigPolicyType())){
+                                    responseString.append("<b>Rule Attributes</b>:<i> has one missing Attribute value</i><br>");
+                                }
+                            }else{
+                                responseString.append("<b>Component Attributes</b>:<i> has one missing Component Attribute value</i><br>");
+                            }
+                            valid = false;
+                        }
+                    }
+                }
+            }
+                       
+            //Decision Policy Attributes Validation
+            if(!"API".equals(policyData.getApiflag()) && policyData.getSettings() != null && !policyData.getSettings().isEmpty()){
+                for(Object attribute : policyData.getAttributes()){
+                    if(attribute instanceof LinkedHashMap<?, ?>){
+                        String value = null;
+                        if(((LinkedHashMap<?, ?>) attribute).get("key") == null){
+                            responseString.append("<b>Settings Attributes</b>:<i> has one missing Attribute key</i><br>");
+                            valid = false;
+                        }
+                        if(((LinkedHashMap<?, ?>) attribute).get("value") != null){
+                            value = ((LinkedHashMap<?, ?>) attribute).get("value").toString();
+                            if(!PolicyUtils.policySpecialCharValidator(value).contains("success")){
+                                responseString.append("<b>Settings Attributes</b>:<i>" +  value + " : value has spaces or invalid characters</i><br>");
+                                valid = false;
+                            }
+                        }else{
+                            responseString.append("<b>Settings Attributes</b>:<i> has one missing Attribute Value</i><br>");
+                            valid = false;
+                        }
+                    }
+                }
+            }
+            
+            if(!"API".equals(policyData.getApiflag()) && policyData.getRuleAlgorithmschoices() != null &&  !policyData.getRuleAlgorithmschoices().isEmpty()){
+                for(Object attribute : policyData.getRuleAlgorithmschoices()){
+                    if(attribute instanceof LinkedHashMap<?, ?>){
+                        String label = ((LinkedHashMap<?, ?>) attribute).get("id").toString();
+                        if(((LinkedHashMap<?, ?>) attribute).get("dynamicRuleAlgorithmField1") == null){
+                            responseString.append("<b>Rule Algorithms</b>:<i>" +  label + " : Field 1 value is not selected</i><br>");
+                            valid = false;
+                        }
+                        if(((LinkedHashMap<?, ?>) attribute).get("dynamicRuleAlgorithmCombo") == null){
+                            responseString.append("<b>Rule Algorithms</b>:<i>" +  label + " : Field 2 value is not selected</i><br>");
+                            valid = false;
+                        }
+                        if(((LinkedHashMap<?, ?>) attribute).get("dynamicRuleAlgorithmField2") != null){
+                            String value = ((LinkedHashMap<?, ?>) attribute).get("dynamicRuleAlgorithmField2").toString();
+                            if(!PolicyUtils.policySpecialCharValidator(value).contains("success")){
+                                responseString.append("<b>Rule Algorithms</b>:<i>" +  label + " : Field 3 value has special characters</i><br>");
+                                valid = false;
+                            }
+                        }else{
+                            responseString.append("<b>Rule Algorithms</b>:<i>" +  label + " : Field 3 value is empty</i><br>");
+                            valid = false;
+                        }
+                    }
+                }
+            }
+            
                        if(CONFIG_POLICY.equalsIgnoreCase(policyData.getPolicyType())){
                                if ("Base".equals(policyData.getConfigPolicyType()) || CLOSEDLOOP_POLICY.equals(policyData.getConfigPolicyType())
                                                ||  CLOSEDLOOP_PM.equals(policyData.getConfigPolicyType()) || ENFORCER_CONFIG_POLICY.equals(policyData.getConfigPolicyType()) 
@@ -107,123 +227,119 @@ public class PolicyValidation {
                                        
                                        if(!Strings.isNullOrEmpty(policyData.getOnapName())) {
                                                String onapNameValidate = PolicyUtils.policySpecialCharValidator(policyData.getOnapName());
-                                               if(!onapNameValidate.contains("success")){
-                                                       responseString.append("OnapName:" +  onapNameValidate + "<br>");
+                                               if(!onapNameValidate.contains(SUCCESS)){
+                                                       responseString.append("<b>OnapName</b>:<i>" +  onapNameValidate + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                        }else{
-                                               responseString.append("Onap Name: Onap Name Should not be empty" + "<br>");
+                                               responseString.append("<b>Onap Name</b>: Onap Name Should not be empty" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }
 
                                if(!Strings.isNullOrEmpty(policyData.getRiskType())) {
                                        String riskTypeValidate = PolicyUtils.policySpecialCharValidator(policyData.getRiskType());
-                                       if(!riskTypeValidate.contains("success")){
-                                               responseString.append("RiskType:" +  riskTypeValidate + "<br>");
+                                       if(!riskTypeValidate.contains(SUCCESS)){
+                                               responseString.append("<b>RiskType</b>:<i>" +  riskTypeValidate + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }else {
-                                       responseString.append("Risk Type: Risk Type Should not be Empty" + "<br>");
+                                       responseString.append("<b>RiskType</b>: Risk Type Should not be Empty" + HTML_ITALICS_LNBREAK);
                                        valid = false;
                                }
 
                                if(!Strings.isNullOrEmpty(policyData.getRiskLevel())) {
                                        String validateRiskLevel = PolicyUtils.policySpecialCharValidator(policyData.getRiskLevel());
-                                       if(!validateRiskLevel.contains("success")){
-                                               responseString.append("RiskLevel:" +  validateRiskLevel + "<br>");
+                                       if(!validateRiskLevel.contains(SUCCESS)){
+                                               responseString.append("<b>RiskLevel</b>:<i>" +  validateRiskLevel + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }else {
-                                       responseString.append("Risk Level: Risk Level Should not be Empty" + "<br>");
+                                       responseString.append("<b>RiskLevel</b>: Risk Level Should not be Empty" + HTML_ITALICS_LNBREAK);
                                        valid = false;
                                }
 
                                if(!Strings.isNullOrEmpty(policyData.getGuard())) {
                                        String validateGuard = PolicyUtils.policySpecialCharValidator(policyData.getGuard());
-                                       if(!validateGuard.contains("success")){
-                                               responseString.append("Guard:" +  validateGuard + "<br>");
+                                       if(!validateGuard.contains(SUCCESS)){
+                                               responseString.append("<b>Guard</b>:<i>" +  validateGuard + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }else {
-                                       responseString.append("Guard: Guard Value Should not be Empty" + "<br>");
+                                       responseString.append("<b>Guard</b>: Guard Value Should not be Empty" + HTML_ITALICS_LNBREAK);
                                        valid = false;
                                }
 
                                if("Base".equalsIgnoreCase(policyData.getConfigPolicyType())){
                                        if(!Strings.isNullOrEmpty(policyData.getConfigName())) {
                                                String configNameValidate = PolicyUtils.policySpecialCharValidator(policyData.getConfigName());
-                                               if(!configNameValidate.contains("success")){
-                                                       responseString.append("ConfigName:" +  configNameValidate + "<br>");
+                                               if(!configNameValidate.contains(SUCCESS)){
+                                                       responseString.append("ConfigName:" +  configNameValidate + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                        }else{
-                                               responseString.append("Config Name: Config Name Should not be Empty" + "<br>");
+                                               responseString.append("Config Name: Config Name Should not be Empty" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                        if(!Strings.isNullOrEmpty(policyData.getConfigType())) {
                                                String configTypeValidate = PolicyUtils.policySpecialCharValidator(policyData.getConfigType());
-                                               if(!configTypeValidate.contains("success")){
-                                                       responseString.append("ConfigType:" +  configTypeValidate + "<br>");
+                                               if(!configTypeValidate.contains(SUCCESS)){
+                                                       responseString.append("ConfigType:" +  configTypeValidate + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                        }else{
-                                               responseString.append("Config Type: Config Type Should not be Empty" + "<br>");
+                                               responseString.append("Config Type: Config Type Should not be Empty" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                        if(!Strings.isNullOrEmpty(policyData.getConfigBodyData())) {
                                                String configBodyData = policyData.getConfigBodyData();
                                                String configType = policyData.getConfigType();
                                                if (configType != null) {
-                                                       if (configType.equals("JSON")) {
+                                                       if ("JSON".equals(configType)) {
                                                                if (!PolicyUtils.isJSONValid(configBodyData)) {
-                                                                       responseString.append("Config Body: JSON Content is not valid" + "<br>");
+                                                                       responseString.append("Config Body: JSON Content is not valid" + HTML_ITALICS_LNBREAK);
                                                                        valid = false;
                                                                }
-                                                       } else if (configType.equals("XML")) {
+                                                       } else if ("XML".equals(configType)) {
                                                                if (!PolicyUtils.isXMLValid(configBodyData)) {
-                                                                       responseString.append("Config Body: XML Content data is not valid" + "<br>");
+                                                                       responseString.append("Config Body: XML Content data is not valid" + HTML_ITALICS_LNBREAK);
                                                                        valid = false;
                                                                }
-                                                       } else if (configType.equals("PROPERTIES")) {
-                                                               if (!PolicyUtils.isPropValid(configBodyData)||configBodyData.equals("")) {
-                                                                       responseString.append("Config Body: Property data is not valid" + "<br>");
+                                                       } else if ("PROPERTIES".equals(configType)) {
+                                                               if (!PolicyUtils.isPropValid(configBodyData) || "".equals(configBodyData)) {
+                                                                       responseString.append("Config Body: Property data is not valid" + HTML_ITALICS_LNBREAK);
                                                                        valid = false;
                                                                } 
-                                                       } else if (configType.equals("OTHER")) {
-                                                               if (configBodyData.equals("")) {
-                                                                       responseString.append("Config Body: Config Body Should not be Empty" + "<br>");
-                                                                       valid = false;
-                                                               }
+                                                       } else if ("OTHER".equals(configType) && ("".equals(configBodyData))) {
+                                                               responseString.append("Config Body: Config Body Should not be Empty" + HTML_ITALICS_LNBREAK);
+                                                               valid = false;
                                                        }
                                                }
                                        }else{
-                                               responseString.append("Config Body: Config Body Should not be Empty" + "<br>");
+                                               responseString.append("Config Body: Config Body Should not be Empty" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }
 
-                               if("Firewall Config".equalsIgnoreCase(policyData.getConfigPolicyType())){
+                               if(FIREWALL.equalsIgnoreCase(policyData.getConfigPolicyType())){
                                        if(policyData.getConfigName() != null && !policyData.getConfigName().isEmpty()){
                                                String configNameValidate = PolicyUtils.policySpecialCharValidator(policyData.getConfigName());
-                                               if(!configNameValidate.contains("success")){
-                                                       responseString.append("<b>ConfigName</b>:<i>" +  configNameValidate + "</i><br>");
+                                               if(!configNameValidate.contains(SUCCESS)){
+                                                       responseString.append("<b>ConfigName</b>:<i>" +  configNameValidate + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                        }else{
-                                               responseString.append("<b>Config Name</b>:<i> Config Name is required" + "</i><br>");
+                                               responseString.append("<b>Config Name</b>:<i> Config Name is required" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                        if(policyData.getSecurityZone() == null || policyData.getSecurityZone().isEmpty()){
-                                               responseString.append("<b>Security Zone</b>:<i> Security Zone is required" + "</i><br>");
+                                               responseString.append("<b>Security Zone</b>:<i> Security Zone is required" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }
-                               if("BRMS_Param".equalsIgnoreCase(policyData.getConfigPolicyType())){
-                                       if(policyData.getRuleName() == null || policyData.getRuleName().isEmpty()){
-                                               responseString.append("<b>BRMS Template</b>:<i>BRMS Template is required</i><br>");
-                                               valid = false;
-                                       }
+                               if("BRMS_Param".equalsIgnoreCase(policyData.getConfigPolicyType()) && Strings.isNullOrEmpty(policyData.getRuleName())){
+                                       responseString.append("<b>BRMS Template</b>:<i>BRMS Template is required" + HTML_ITALICS_LNBREAK);
+                                       valid = false;
                                }
                                if("BRMS_Raw".equalsIgnoreCase(policyData.getConfigPolicyType())){
                                        if(policyData.getConfigBodyData() != null && !policyData.getConfigBodyData().isEmpty()){
@@ -231,46 +347,47 @@ public class PolicyValidation {
                                                
                                                // If there are any error other than Annotations then this is not Valid
                                                if(message.contains("[ERR")){
-                                                       responseString.append("<b>Raw Rule Validate</b>:<i>Raw Rule has error"+ message +"</i><br>");
+                                                       responseString.append("<b>Raw Rule Validate</b>:<i>Raw Rule has error"+ message + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                        }else{
-                                               responseString.append("<b>Raw Rule</b>:<i>Raw Rule is required</i><br>");
+                                               responseString.append("<b>Raw Rule</b>:<i>Raw Rule is required" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }
-                               if("ClosedLoop_PM".equalsIgnoreCase(policyData.getConfigPolicyType())){
+                               if(CLOSEDLOOP_PM.equalsIgnoreCase(policyData.getConfigPolicyType())){
                                        try{
                                                if(Strings.isNullOrEmpty(policyData.getServiceTypePolicyName().get("serviceTypePolicyName").toString())){
-                                                       responseString.append("<b>ServiceType PolicyName</b>:<i>ServiceType PolicyName is required</i><br>");
+                                                       responseString.append("<b>ServiceType PolicyName</b>:<i>ServiceType PolicyName is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false; 
                                                }
                                                
                                        }catch(Exception e){
                                            LOGGER.error("ERROR in ClosedLoop_PM PolicyName" , e);
-                                               responseString.append("<b>ServiceType PolicyName</b>:<i>ServiceType PolicyName is required</i><br>");
+                                               responseString.append("<b>ServiceType PolicyName</b>:<i>ServiceType PolicyName is required" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
 
                                        if(policyData.getJsonBody() != null){
-                                               ClosedLoopPMBody pmBody = (ClosedLoopPMBody)mapper.readValue(policyData.getJsonBody(), ClosedLoopPMBody.class);
+                                               
+                                               ClosedLoopPMBody pmBody = mapper.readValue(policyData.getJsonBody(), ClosedLoopPMBody.class);
                                                if(pmBody.getEmailAddress() != null){
                                                        String result = emailValidation(pmBody.getEmailAddress(), responseString.toString());
-                                                       if(result != "success"){
-                                                               responseString.append(result + "<br>");
+                                                       if(result != SUCCESS){
+                                                               responseString.append(result + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }
                                                }
                                                if((pmBody.isGamma() || pmBody.isMcr() || pmBody.isTrinity() || pmBody.isvDNS() || pmBody.isvUSP()) != true){
-                                                       responseString.append("<b>D2/Virtualized Services</b>: <i>Select at least one D2/Virtualized Services</i><br>");
+                                                       responseString.append("<b>D2/Virtualized Services</b>: <i>Select at least one D2/Virtualized Services" + HTML_ITALICS_LNBREAK);
                                                        valid = false; 
                                                }
                                                if(pmBody.getGeoLink() != null && !pmBody.getGeoLink().isEmpty()){
                                                        String result = PolicyUtils.policySpecialCharValidator(pmBody.getGeoLink());
-                                                       if(!result.contains("success")){
-                                                               responseString.append("<b>GeoLink</b>:<i>" +  result + "</i><br>");
+                                                       if(!result.contains(SUCCESS)){
+                                                               responseString.append("<b>GeoLink</b>:<i>" +  result + HTML_ITALICS_LNBREAK);
                                                                valid = false;
-                                                       };
+                                                       }
                                                }
                                                if(pmBody.getAttributes() != null && !pmBody.getAttributes().isEmpty()){
                                                        for(Entry<String, String> entry : pmBody.getAttributes().entrySet()){
@@ -278,19 +395,19 @@ public class PolicyValidation {
                                                                String value = entry.getValue();
                                                                if(!key.contains("Message")){
                                                                        String attributeValidate = PolicyUtils.policySpecialCharValidator(value);
-                                                                       if(!attributeValidate.contains("success")){
-                                                                               responseString.append("<b>Attributes</b>:<i>" +  key + " : value has spaces or invalid characters</i><br>");
+                                                                       if(!attributeValidate.contains(SUCCESS)){
+                                                                               responseString.append("<b>Attributes</b>:<i>" +  key + " : value has spaces or invalid characters" + HTML_ITALICS_LNBREAK);
                                                                                valid = false;
-                                                                       };
+                                                                       }
                                                                }
                                                        }       
                                                }
                                        }else{
-                                               responseString.append("<b>D2/Virtualized Services</b>:<i>Select atleast one D2/Virtualized Services</i><br>");
+                                               responseString.append("<b>D2/Virtualized Services</b>:<i>Select atleast one D2/Virtualized Services" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }
-                               if("ClosedLoop_Fault".equalsIgnoreCase(policyData.getConfigPolicyType())){
+                               if(CLOSEDLOOP_POLICY.equalsIgnoreCase(policyData.getConfigPolicyType())){
                                        if(policyData.getJsonBody() != null){
 
                                                // For API we need to get the conditions key from the Json request and check it before deserializing to POJO due to the enum
@@ -299,93 +416,110 @@ public class PolicyValidation {
                                                        if(!json.isNull("conditions")){
                                                                String apiCondition = (String) json.get("conditions");
                                                                if(Strings.isNullOrEmpty(apiCondition)){
-                                                                       responseString.append("<b>Conditions</b>: <i>Select At least one Condition</i><br>");
+                                                                       responseString.append("<b>Conditions</b>: <i>Select At least one Condition" + HTML_ITALICS_LNBREAK);
                                                                        return responseString;
                                                                }
                                                        } else {
-                                                               responseString.append("<b>Conditions</b>: <i>There were no conditions provided in configBody json</i><br>");
+                                                               responseString.append("<b>Conditions</b>: <i>There were no conditions provided in configBody json" + HTML_ITALICS_LNBREAK);
                                                                return responseString;
                                                        }
+                                               }else{
+                                                       if(policyData.getTrapDatas().getTrap1() != null){
+                                                               if(policyData.getClearTimeOut() == null){
+                                                                       responseString.append("<b>Trigger Clear TimeOut</b>: <i>Trigger Clear TimeOut is required when atleast One Trigger Signature is enabled</i><br>");
+                                                                       valid = false;
+                                                               }
+                                                               if(policyData.getTrapMaxAge() == null){
+                                                                       responseString.append("<b>Trap Max Age</b>: <i>Trap Max Age is required when atleast One Trigger Signature is enabled</i><br>");
+                                                                       valid = false;
+                                                               }
+                                                       }
+                                                       if(policyData.getFaultDatas().getTrap1() != null && policyData.getVerificationclearTimeOut() == null){
+                                                               responseString.append("<b>Fault Clear TimeOut</b>: <i>Fault Clear TimeOut is required when atleast One Fault Signature is enabled</i><br>");
+                                                               valid = false;
+                                                       }
                                                }
 
                                                ClosedLoopFaultBody faultBody = mapper.readValue(policyData.getJsonBody(), ClosedLoopFaultBody.class);
                                                if(faultBody.getEmailAddress() != null && !faultBody.getEmailAddress().isEmpty()){
                                                        String result = emailValidation(faultBody.getEmailAddress(), responseString.toString());
-                                                       if(result != "success"){
-                                                               responseString.append(result+ "<br>");
+                                                       if(!SUCCESS.equals(result)){
+                                                               responseString.append(result+ HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }
                                                }
                                                if((faultBody.isGamma() || faultBody.isMcr() || faultBody.isTrinity() || faultBody.isvDNS() || faultBody.isvUSP()) != true){
-                                                       responseString.append("<b>D2/Virtualized Services</b>: <i>Select at least one D2/Virtualized Services</i><br>");
+                                                       responseString.append("<b>D2/Virtualized Services</b>: <i>Select at least one D2/Virtualized Services" + HTML_ITALICS_LNBREAK);
                                                        valid = false; 
                                                }
                                                if(faultBody.getActions() == null || faultBody.getActions().isEmpty()){
-                                                       responseString.append("<b>vPRO Actions</b>: <i>vPRO Actions is required</i><br>");
+                                                       responseString.append("<b>vPRO Actions</b>: <i>vPRO Actions is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getClosedLoopPolicyStatus() == null || faultBody.getClosedLoopPolicyStatus().isEmpty()){
-                                                       responseString.append("<b>Policy Status</b>: <i>Policy Status is required</i><br>");
+                                                       responseString.append("<b>Policy Status</b>: <i>Policy Status is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getConditions() == null){
-                                                       responseString.append("<b>Conditions</b>: <i>Select At least one Condition</i><br>");
+                                                       responseString.append("<b>Conditions</b>: <i>Select At least one Condition" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getGeoLink() != null && !faultBody.getGeoLink().isEmpty()){
                                                        String result = PolicyUtils.policySpecialCharWithSpaceValidator(faultBody.getGeoLink());
-                                                       if(!result.contains("success")){
-                                                               responseString.append("<b>GeoLink</b>:<i>" +  result + "</i><br>");
+                                                       if(!result.contains(SUCCESS)){
+                                                               responseString.append("<b>GeoLink</b>:<i>" +  result + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }
                                                }
                                                if(faultBody.getAgingWindow() == 0){
-                                                       responseString.append("<b>Aging Window</b>: <i>Aging Window is required</i><br>");
+                                                       responseString.append("<b>Aging Window</b>: <i>Aging Window is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getTimeInterval() == 0){
-                                                       responseString.append("<b>Time Interval</b>: <i>Time Interval is required</i><br>");
+                                                       responseString.append("<b>Time Interval</b>: <i>Time Interval is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getRetrys() == 0){
-                                                       responseString.append("<b>Number of Retries</b>: <i>Number of Retries is required</i><br>");
+                                                       responseString.append("<b>Number of Retries</b>: <i>Number of Retries is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getTimeOutvPRO() == 0){
-                                                       responseString.append("<b>APP-C Timeout</b>: <i>APP-C Timeout is required</i><br>");
+                                                       responseString.append("<b>APP-C Timeout</b>: <i>APP-C Timeout is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getTimeOutRuby() == 0){
-                                                       responseString.append("<b>TimeOutRuby</b>: <i>TimeOutRuby is required</i><br>");
+                                                       responseString.append("<b>TimeOutRuby</b>: <i>TimeOutRuby is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(faultBody.getVnfType() == null || faultBody.getVnfType().isEmpty()){
-                                                       responseString.append("<b>Vnf Type</b>: <i>Vnf Type is required</i><br>");
+                                                       responseString.append("<b>Vnf Type</b>: <i>Vnf Type is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                        }else{
-                                               responseString.append("<b>D2/Virtualized Services</b>: <i>Select atleast one D2/Virtualized Services</i><br>");
-                                               responseString.append("<b>vPRO Actions</b>: <i>vPRO Actions is required</i><br>");
-                                               responseString.append("<b>Aging Window</b>: <i>Aging Window is required</i><br>");
-                                               responseString.append("<b>Policy Status</b>: <i>Policy Status is required</i><br>");
-                                               responseString.append("<b>Conditions</b>: <i>Select Atleast one Condition</i><br>");
-                                               responseString.append("<b>PEP Name</b>: <i>PEP Name is required</i><br>");
-                                               responseString.append("<b>PEP Action</b>: <i>PEP Action is required</i><br>");
-                                               responseString.append("<b>Time Interval</b>: <i>Time Interval is required</i><br>");
-                                               responseString.append("<b>Number of Retries</b>: <i>Number of Retries is required</i><br>");
-                                               responseString.append("<b>APP-C Timeout</b>: <i>APP-C Timeout is required</i><br>");
-                                               responseString.append("<b>TimeOutRuby</b>: <i>TimeOutRuby is required</i><br>");
-                                               responseString.append("<b>Vnf Type</b>: <i>Vnf Type is required</i><br>");
+                                               responseString.append("<b>D2/Virtualized Services</b>: <i>Select atleast one D2/Virtualized Services" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>vPRO Actions</b>: <i>vPRO Actions is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>Aging Window</b>: <i>Aging Window is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>Policy Status</b>: <i>Policy Status is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>Conditions</b>: <i>Select Atleast one Condition" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>PEP Name</b>: <i>PEP Name is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>PEP Action</b>: <i>PEP Action is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>Time Interval</b>: <i>Time Interval is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>Number of Retries</b>: <i>Number of Retries is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>APP-C Timeout</b>: <i>APP-C Timeout is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>TimeOutRuby</b>: <i>TimeOutRuby is required" + HTML_ITALICS_LNBREAK);
+                                               responseString.append("<b>Vnf Type</b>: <i>Vnf Type is required" + HTML_ITALICS_LNBREAK);
                                                valid = false; 
                                        }
                                }
 
-                               if ("Micro Service".equals(policyData.getConfigPolicyType())){
+                               if (MICROSERVICES.equals(policyData.getConfigPolicyType())){
                                        if(!Strings.isNullOrEmpty(policyData.getServiceType())){
+                                               
+                                               modelRequiredFieldsList = new ArrayList<>();
                                                pullJsonKeyPairs((JsonNode) policyData.getPolicyJSON());
-                                               MicroServiceModels returnModel = new MicroServiceModels();
-                                               String service = null;
-                                               String version = null;
+
+                                               String service;
+                                               String version;
                                                if (policyData.getServiceType().contains("-v")){
                                                        service = policyData.getServiceType().split("-v")[0];
                                                        version = policyData.getServiceType().split("-v")[1];
@@ -395,13 +529,17 @@ public class PolicyValidation {
                                                }
                                                
                                                if(!Strings.isNullOrEmpty(version)) {
-                                                       returnModel = getAttributeObject(service, version);
+                                                       MicroServiceModels returnModel = getAttributeObject(service, version);
                                                        
                                                        if(returnModel != null) {
+                                                               
                                                                String annotation = returnModel.getAnnotation();
+                                                               String refAttributes = returnModel.getRef_attributes();
+                                                               String subAttributes = returnModel.getSub_attributes();
+                                                               String modelAttributes = returnModel.getAttributes();
+                                                               
                                                                if (!Strings.isNullOrEmpty(annotation)){ 
-                                                                       Map<String, String> rangeMap = new HashMap<>();
-                                                                       rangeMap = Splitter.on(",").withKeyValueSeparator("=").split(annotation);
+                                                                       Map<String, String> rangeMap = Splitter.on(",").withKeyValueSeparator("=").split(annotation);
                                                                        for (Entry<String, String> rMap : rangeMap.entrySet()){
                                                                                if (rMap.getValue().contains("range::")){
                                                                                        String value = mapAttribute.get(rMap.getKey().trim());
@@ -424,29 +562,96 @@ public class PolicyValidation {
                                                                                                }
                                                                                        } else {
                                                                                                responseString.append("<b>"+rMap.getKey()+"</b>:<i>" + rMap.getKey() 
-                                                                                               + " is required for the MicroService model " + service + "</i><br>");
+                                                                                               + " is required for the MicroService model " + service + HTML_ITALICS_LNBREAK);
                                                                                                valid = false;
                                                                                        }
 
                                                                                }
                                                                        }
+                                                               } else {
+                                                                       // Validate for configName, location, uuid, and policyScope if no annotations exist for this model
+                                                                       if(Strings.isNullOrEmpty(policyData.getMsLocation())){
+                                                                               responseString.append("<b>Micro Service Model</b>:<i> location is required for this model" + HTML_ITALICS_LNBREAK);
+                                                                               valid = false;
+                                                                       }
+                                                                       
+                                                                       if(Strings.isNullOrEmpty(policyData.getConfigName())){
+                                                                               responseString.append("<b>Micro Service Model</b>:<i> configName is required for this model" + HTML_ITALICS_LNBREAK);
+                                                                               valid = false;
+                                                                       }       
+                                                                       
+                                                                       if(Strings.isNullOrEmpty(policyData.getUuid())){
+                                                                               responseString.append("<b>Micro Service Model</b>:<i> uuid is required for this model" + HTML_ITALICS_LNBREAK);
+                                                                               valid = false;
+                                                                       }       
+                                                                       
+                                                                       if(Strings.isNullOrEmpty(policyData.getPolicyScope())){
+                                                                               responseString.append("<b>Micro Service Model</b>:<i> policyScope is required for this model" + HTML_ITALICS_LNBREAK);
+                                                                               valid = false;
+                                                                       }       
                                                                }
+                                                               
+                                                               // get list of required fields from the sub_Attributes of the Model
+                                                               if(!Strings.isNullOrEmpty(subAttributes)) {
+                                                                       JsonObject subAttributesJson = stringToJsonObject(subAttributes);
+                                                                       findRequiredFields(subAttributesJson);
+                                                               }
+                                                               
+                                                               // get list of required fields from the attributes of the Model
+                                                               if (!Strings.isNullOrEmpty(modelAttributes)) {
+                                                                       Map<String, String> modelAttributesMap = Splitter.on(",").withKeyValueSeparator("=").split(modelAttributes);
+                                                                       String json = new ObjectMapper().writeValueAsString(modelAttributesMap);
+                                                                       findRequiredFields(stringToJsonObject(json));
+                                                               }
+                                                               
+                                                               // get list of required fields from the ref_Attributes of the Model
+                                                               if (!Strings.isNullOrEmpty(refAttributes)) {
+                                                                       Map<String, String> refAttributesMap = Splitter.on(",").withKeyValueSeparator("=").split(refAttributes);
+                                                                       String json = new ObjectMapper().writeValueAsString(refAttributesMap);
+                                                                       findRequiredFields(stringToJsonObject(json));
+                                                               }
+                                                               
+                                                               // Validate Required Fields in the Micro Service Model
+                                                               if (modelRequiredFieldsList!=null || !modelRequiredFieldsList.isEmpty()) {
+                                                                       // create jsonRequestMap with all json keys and values from request
+                                                                       JsonNode rootNode = (JsonNode) policyData.getPolicyJSON();
+                                                                       pullModelJsonKeyPairs(rootNode);
+                                                                       
+                                                                       // validate if the requiredFields are in the request
+                                                                       for(String requiredField : modelRequiredFieldsList) {
+                                                                               if (jsonRequestMap.containsKey(requiredField)) {
+                                                                                       String value = jsonRequestMap.get(requiredField);
+                                                                                       if(Strings.isNullOrEmpty(jsonRequestMap.get(requiredField)) || 
+                                                                                                       "\"\"".equals(value) || 
+                                                                                                       "".equals(jsonRequestMap.get(requiredField))){
+                                                                                               responseString.append("<b>Micro Service Model</b>:<i> " + requiredField + " is required" + HTML_ITALICS_LNBREAK);
+                                                                                               valid = false; 
+                                                                                       }
+                                                                               } else {
+                                                                                       responseString.append("<b>Micro Service Model</b>:<i> " + requiredField + " is required" + HTML_ITALICS_LNBREAK);
+                                                                                       valid = false; 
+                                                                               }
+                                                                       }
+                                                               }
+                                                               
+
+                                                               
                                                        } else {
                                                                responseString.append("<b>Micro Service Model</b>:<i> Invalid Model. The model name, " + service + 
-                                                                               " of version, " + version + " was not found in the dictionary</i><br>");
+                                                                               " of version, " + version + " was not found in the dictionary" + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }
                                                } else {
-                                                       responseString.append("<b>Micro Version</b>:<i> Micro Service Version is required" + "</i><br>");
+                                                       responseString.append("<b>Micro Service Version</b>:<i> Micro Service Version is required" + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                        } else {
-                                               responseString.append("<b>Micro Service</b>:<i> Micro Service is required" + "</i><br>");
+                                               responseString.append("<b>Micro Service</b>:<i> Micro Service Model is required" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
 
                                        if(Strings.isNullOrEmpty(policyData.getPriority())){
-                                               responseString.append("<b>Priority</b>:<i> Priority is required" + "</i><br>");
+                                               responseString.append("<b>Priority</b>:<i> Priority is required" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }       
@@ -454,12 +659,12 @@ public class PolicyValidation {
                        if (DECISION_POLICY.equalsIgnoreCase(policyData.getPolicyType())){
                                if(!Strings.isNullOrEmpty(policyData.getOnapName())){
                                        String onapNameValidate = PolicyUtils.policySpecialCharValidator(policyData.getOnapName());
-                                       if(!onapNameValidate.contains("success")){
-                                               responseString.append("OnapName:" +  onapNameValidate + "<br>");
+                                       if(!onapNameValidate.contains(SUCCESS)){
+                                               responseString.append("OnapName:" +  onapNameValidate + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }else{
-                                       responseString.append("Onap Name: Onap Name Should not be empty" + "<br>");
+                                       responseString.append("Onap Name: Onap Name Should not be empty" + HTML_ITALICS_LNBREAK);
                                        valid = false;
                                }
 
@@ -526,52 +731,52 @@ public class PolicyValidation {
                                
                                if("GUARD_YAML".equals(policyData.getRuleProvider()) || "GUARD_BL_YAML".equals(policyData.getRuleProvider())){
                                        if(policyData.getYamlparams()==null){
-                                               responseString.append("<b> Guard Params are Required </b>" + "<br>");
+                                               responseString.append("<b> Guard Params are Required </b>" + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }else{
                                                if(Strings.isNullOrEmpty(policyData.getYamlparams().getActor())){
-                                                       responseString.append("Guard Params <b>Actor</b> is Required " + "<br>");
+                                                       responseString.append("Guard Params <b>Actor</b> is Required " + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(Strings.isNullOrEmpty(policyData.getYamlparams().getRecipe())){
-                                                       responseString.append("Guard Params <b>Recipe</b> is Required " + "<br>");
+                                                       responseString.append("Guard Params <b>Recipe</b> is Required " + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(Strings.isNullOrEmpty(policyData.getYamlparams().getGuardActiveStart())){
-                                                       responseString.append("Guard Params <b>Guard Active Start</b> is Required " + "<br>");
+                                                       responseString.append("Guard Params <b>Guard Active Start</b> is Required " + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if(Strings.isNullOrEmpty(policyData.getYamlparams().getGuardActiveEnd())){
-                                                       responseString.append("Guard Params <b>Guard Active End</b> is Required " + "<br>");
+                                                       responseString.append("Guard Params <b>Guard Active End</b> is Required " + HTML_ITALICS_LNBREAK);
                                                        valid = false;
                                                }
                                                if("GUARD_YAML".equals(policyData.getRuleProvider())){
                                                        if(Strings.isNullOrEmpty(policyData.getYamlparams().getLimit())){
-                                                               responseString.append(" Guard Params <b>Limit</b> is Required " + "<br>");
+                                                               responseString.append(" Guard Params <b>Limit</b> is Required " + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }else if(!PolicyUtils.isInteger(policyData.getYamlparams().getLimit())){
-                                                               responseString.append(" Guard Params <b>Limit</b> Should be Integer " + "<br>");
+                                                               responseString.append(" Guard Params <b>Limit</b> Should be Integer " + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }
                                                        if(Strings.isNullOrEmpty(policyData.getYamlparams().getTimeWindow())){
-                                                               responseString.append("Guard Params <b>Time Window</b> is Required" + "<br>");
+                                                               responseString.append("Guard Params <b>Time Window</b> is Required" + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }else if(!PolicyUtils.isInteger(policyData.getYamlparams().getTimeWindow())){
-                                                               responseString.append(" Guard Params <b>Time Window</b> Should be Integer " + "<br>");
+                                                               responseString.append(" Guard Params <b>Time Window</b> Should be Integer " + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }
                                                        if(Strings.isNullOrEmpty(policyData.getYamlparams().getTimeUnits())){
-                                                               responseString.append("Guard Params <b>Time Units</b> is Required" + "<br>");
+                                                               responseString.append("Guard Params <b>Time Units</b> is Required" + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }
                                                }else if("GUARD_BL_YAML".equals(policyData.getRuleProvider())){
                                                        if(policyData.getYamlparams().getBlackList()==null || policyData.getYamlparams().getBlackList().isEmpty()){
-                                                               responseString.append(" Guard Params <b>BlackList</b> is Required " + "<br>");
+                                                               responseString.append(" Guard Params <b>BlackList</b> is Required " + HTML_ITALICS_LNBREAK);
                                                                valid = false;
                                                        }else{
                                                                for(String blackList: policyData.getYamlparams().getBlackList()){
-                                                                       if(blackList==null || !("success".equals(PolicyUtils.policySpecialCharValidator(blackList)))){
-                                                                               responseString.append(" Guard Params <b>BlackList</b> Should be valid String" + "<br>");
+                                                                       if(blackList==null || !(SUCCESS.equals(PolicyUtils.policySpecialCharValidator(blackList)))){
+                                                                               responseString.append(" Guard Params <b>BlackList</b> Should be valid String" + HTML_ITALICS_LNBREAK);
                                                                                valid = false;
                                                                                break;
                                                                        }
@@ -585,71 +790,25 @@ public class PolicyValidation {
                        if(ACTION_POLICY.equalsIgnoreCase(policyData.getPolicyType())){
                                if(!Strings.isNullOrEmpty(policyData.getActionPerformer())){
                                        String actionPerformer = PolicyUtils.policySpecialCharValidator(policyData.getActionPerformer());
-                                       if(!actionPerformer.contains("success")){
-                                               responseString.append("ActionPerformer:" +  actionPerformer + "<br>");
+                                       if(!actionPerformer.contains(SUCCESS)){
+                                               responseString.append("<b>ActionPerformer</b>:<i>" +  actionPerformer + HTML_ITALICS_LNBREAK);
                                                valid = false;
                                        }
                                }else{
-                                       responseString.append("ActionPerformer: ActionPerformer Should not be empty" + "<br>");
-                                       valid = false;
-                               }
-                               if(policyData.getAttributes() != null){
-                                       for(Object attribute : policyData.getAttributes()){
-                                               if(attribute instanceof LinkedHashMap<?, ?>){
-                                                       try{
-                                                               //This is for validation check if the value exists or not
-                                                               String key = ((LinkedHashMap<?, ?>) attribute).get("key").toString();
-                                                               String value =  ((LinkedHashMap<?, ?>) attribute).get("value").toString();
-                                                               if("".equals(key) || "".equals(value)){
-                                                                       responseString.append("Component Attributes: One or more Fields in Component Attributes is Empty." + "<br>");
-                                                                       valid = false;
-                                                                       break;  
-                                                               }
-                                                       }catch(Exception e){
-                                                               LOGGER.error("This is a Policy Validation check" +e);
-                                                               responseString.append("Component Attributes: One or more Fields in Component Attributes is Empty." + "<br>");
-                                                               valid = false;
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                               }else{
-                                       responseString.append("Component Attributes: One or more Fields in Component Attributes is Empty." + "<br>");
+                                       responseString.append("<b>ActionPerformer</b>:<i> ActionPerformer Should not be empty" + HTML_ITALICS_LNBREAK);
                                        valid = false;
                                }
+       
                                if(!Strings.isNullOrEmpty(policyData.getActionAttributeValue())){
                                        String actionAttribute = PolicyUtils.policySpecialCharValidator(policyData.getActionAttributeValue());
-                                       if(!actionAttribute.contains("success")){
-                                               responseString.append("ActionAttribute:" +  actionAttribute + "<br>");
+                                       if(!actionAttribute.contains(SUCCESS)){
+                                               responseString.append("<b>ActionAttribute</b>:<i>" +  actionAttribute + HTML_ITALICS_LNBREAK);
                                                valid = false;
-                                       };
+                                       }
                                }else{
-                                       responseString.append("ActionAttribute: ActionAttribute Should not be empty" + "<br>");
+                                       responseString.append("<b>ActionAttribute</b>:<i> ActionAttribute Should not be empty" + HTML_ITALICS_LNBREAK);
                                        valid = false;
                                }
-                               
-                               if(!policyData.getRuleAlgorithmschoices().isEmpty()){
-                                       for(Object attribute : policyData.getRuleAlgorithmschoices()){
-                                               if(attribute instanceof LinkedHashMap<?, ?>){
-                                                       try{
-                                                               String label = ((LinkedHashMap<?, ?>) attribute).get("id").toString();
-                                                               String key = ((LinkedHashMap<?, ?>) attribute).get("dynamicRuleAlgorithmField1").toString();
-                                                               String rule = ((LinkedHashMap<?, ?>) attribute).get("dynamicRuleAlgorithmCombo").toString();
-                                                               String value = ((LinkedHashMap<?, ?>) attribute).get("dynamicRuleAlgorithmField2").toString();
-
-                                                               if(Strings.isNullOrEmpty(label) || Strings.isNullOrEmpty(key) || Strings.isNullOrEmpty(rule) || Strings.isNullOrEmpty(value)){
-                                                                       responseString.append("Rule Algorithms: One or more Fields in Rule Algorithms is Empty." + "<br>");
-                                                                       valid = false;
-                                                               }
-                                                       }catch(Exception e){
-                                                               LOGGER.error("This is a Policy Validation check" +e);
-                                                               responseString.append("Rule Algorithms: One or more Fields in Rule Algorithms is Empty." + "<br>");
-                                                               valid = false;
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                               }
                        }
 
                        if(CONFIG_POLICY.equals(policyData.getPolicyType())){
@@ -659,14 +818,14 @@ public class PolicyValidation {
                                                List<Object> spData = commonClassDao.getDataById(SafePolicyWarning.class, "riskType", policyData.getRiskType());
                                                if (!spData.isEmpty()){
                                                        SafePolicyWarning safePolicyWarningData  = (SafePolicyWarning) spData.get(0);
-                                                       value = "Message:" +  safePolicyWarningData.getMessage();
+                                                       value = "<b>Message</b>:<i>" +  safePolicyWarningData.getMessage() +"</i>";
                                                }
                                        }
-                                       responseString.append("success" + "@#"+ value);
+                                       responseString.append(SUCCESS + "@#"+ value);
                                }
                        }else{
                                if(valid){
-                                       responseString.append("success");
+                                       responseString.append(SUCCESS);
                                }
                        }
 
@@ -679,15 +838,17 @@ public class PolicyValidation {
        }
 
        protected String emailValidation(String email, String response){
+               String res = response;
                if(email != null){
                        String validateEmail = PolicyUtils.validateEmailAddress(email.replace("\"", ""));
-                       if(!validateEmail.contains("success")){
-                               response += "<b>Email</b>:<i>" +  validateEmail+ "</i><br>";
-                       }else{
-                               return "success";
+                       if(!validateEmail.contains(SUCCESS)){
+                               res  += "<b>Email</b>:<i>" +  validateEmail + HTML_ITALICS_LNBREAK;
+                       }
+                       else {
+                               return SUCCESS;
                        }
                }
-               return response;
+               return res;
        }
 
        private MicroServiceModels getAttributeObject(String name, String version) {    
@@ -726,5 +887,60 @@ public class PolicyValidation {
                        }
                }
        }
+       
+       private void pullModelJsonKeyPairs(JsonNode rootNode) {
+               Iterator<Map.Entry<String, JsonNode>> fieldsIterator = rootNode.fields();
+               
+               while (fieldsIterator.hasNext()) {
+                       Map.Entry<String, JsonNode> field = fieldsIterator.next();
+                       final String key = field.getKey();
+                       final JsonNode value = field.getValue();
+                       
+                       if (value.isContainerNode() && !value.isArray()) {
+                               pullModelJsonKeyPairs(value); // RECURSIVE CALL
+                       } else if (value.isArray()) {
+                               try {
+                                       String stringValue = StringUtils.replaceEach(value.toString(), new String[]{"[", "]"}, new String[]{"",""});
+                                       ObjectMapper mapper = new ObjectMapper();
+                                       JsonNode newValue = mapper.readTree(stringValue);
+                                       pullModelJsonKeyPairs(newValue);
+                               } catch (IOException e) {
+                                       LOGGER.info("PolicyValidation: Exception occurred while mapping string to JsonNode " + e);
+                               }
+                       } else {
+                               jsonRequestMap.put(key, value.toString().trim());
+                       }
+               }
+                               
+       }
+       
+    private JsonObject stringToJsonObject(String value) {
+       try(JsonReader jsonReader = Json.createReader(new StringReader(value))){
+            return jsonReader.readObject();
+        } catch(JsonException| IllegalStateException e){
+            LOGGER.info(XACMLErrorConstants.ERROR_DATA_ISSUE+ "Improper JSON format... may or may not cause issues in validating the policy: " + value, e);
+            return null;
+        }
+    }
+    
+    private void findRequiredFields(JsonObject json) {
+
+       for(Entry<String, JsonValue> keyMap : json.entrySet()){
+               Object obj = keyMap.getValue();
+               if(obj instanceof JsonObject){
+                       JsonObject jsonObj = (JsonObject)obj;
+                       for(Entry<String, JsonValue> jsonMap : jsonObj.entrySet()){
+                               if(jsonMap.getValue().toString().contains("required-true")){
+                                       modelRequiredFieldsList.add(jsonMap.getKey());
+                               }
+                       }
+               } else {
+                       if(keyMap.getValue().toString().contains("required-true")){
+                               modelRequiredFieldsList.add(keyMap.getKey());
+                       }
+               }
+       }
+               
+    }
 
 }