Convert tabs to spaces basic refactoring

Change tabs into spaces for checkstyle fixes in ONAP REST module of
policy engine. These changes come in way for review. Hence doing them
before refactoring is better.

Issue-ID: POLICY-1014
Change-Id: I31a372ae527946927157bc23b576f3066679b0ae
Signed-off-by: Krishnajinka <kris.jinka@samsung.com>

1 files changed, 395 insertions, 395 deletions

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
index c80e5bb3b..66628e2da 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
@@ -49,411 +49,411 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
 
 public class PolicyValidationRequestWrapper {
-	
-	private static final Logger LOGGER	= FlexLogger.getLogger(PolicyValidationRequestWrapper.class);
-	public static final String CONFIG_NAME="configName";
-	public static final String INVALIDJSON = " improper JSON format: ";
-	public static final String ONAPNAME = "onapname";
-	public static final String CONTENT = "content";
-	public static final String GUARD = "guard";
-	public static final String LOCATION = "location";
-	public static final String POLICYSCOPE = "policyScope";
-	public static final String PRIORITY = "priority";
-	public static final String RISKLEVEL = "riskLevel";
-	public static final String RISKTYPE = "riskType";
-	public static final String SERVICE = "service";
-	public static final String VERSION = "version";
-
-	public static final String SERVICETYPE_POLICY_NAME = "serviceTypePolicyName";
-	
-	public PolicyRestAdapter populateRequestParameters(HttpServletRequest request) {
-		
-		PolicyRestAdapter policyData = null;
-		ClosedLoopFaultTrapDatas trapDatas = null;
-		ClosedLoopFaultTrapDatas faultDatas = null;
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			policyData = mapper.readValue(root.get("policyData").toString(), PolicyRestAdapter.class);
-			if(root.get("trapData") != null){
-				trapDatas = mapper.readValue(root.get("trapData").toString(), ClosedLoopFaultTrapDatas.class);
-				policyData.setTrapDatas(trapDatas);
-			}
-			if(root.get("faultData") != null){
-				faultDatas = mapper.readValue(root.get("faultData").toString(), ClosedLoopFaultTrapDatas.class);
-				policyData.setFaultDatas(faultDatas);
-			}
-			
-			JsonObject json;
-			json = stringToJsonObject(root.toString());
-			
-			if(json != null){
-				if(json.containsKey("policyJSON")){
-					policyData.setPolicyJSON(root.get("policyJSON"));
-				}else{
-					String jsonBodyData = json.getJsonObject("policyData").get("jsonBodyData").toString();
-					policyData.setJsonBody(jsonBodyData);
-				}
-			}			
-						
-		} catch (Exception e) {
-			LOGGER.error("Exception Occured while populating request parameters: " +e);
-		}
-		
-		return policyData;
-	}
-	
-	public PolicyRestAdapter populateRequestParameters(PolicyParameters parameters) {
-		
-		PolicyRestAdapter policyData = new PolicyRestAdapter();
+
+    private static final Logger LOGGER	= FlexLogger.getLogger(PolicyValidationRequestWrapper.class);
+    public static final String CONFIG_NAME="configName";
+    public static final String INVALIDJSON = " improper JSON format: ";
+    public static final String ONAPNAME = "onapname";
+    public static final String CONTENT = "content";
+    public static final String GUARD = "guard";
+    public static final String LOCATION = "location";
+    public static final String POLICYSCOPE = "policyScope";
+    public static final String PRIORITY = "priority";
+    public static final String RISKLEVEL = "riskLevel";
+    public static final String RISKTYPE = "riskType";
+    public static final String SERVICE = "service";
+    public static final String VERSION = "version";
+
+    public static final String SERVICETYPE_POLICY_NAME = "serviceTypePolicyName";
+
+    public PolicyRestAdapter populateRequestParameters(HttpServletRequest request) {
+
+        PolicyRestAdapter policyData = null;
+        ClosedLoopFaultTrapDatas trapDatas = null;
+        ClosedLoopFaultTrapDatas faultDatas = null;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            JsonNode root = mapper.readTree(request.getReader());
+            policyData = mapper.readValue(root.get("policyData").toString(), PolicyRestAdapter.class);
+            if(root.get("trapData") != null){
+                trapDatas = mapper.readValue(root.get("trapData").toString(), ClosedLoopFaultTrapDatas.class);
+                policyData.setTrapDatas(trapDatas);
+            }
+            if(root.get("faultData") != null){
+                faultDatas = mapper.readValue(root.get("faultData").toString(), ClosedLoopFaultTrapDatas.class);
+                policyData.setFaultDatas(faultDatas);
+            }
+
+            JsonObject json;
+            json = stringToJsonObject(root.toString());
+
+            if(json != null){
+                if(json.containsKey("policyJSON")){
+                    policyData.setPolicyJSON(root.get("policyJSON"));
+                }else{
+                    String jsonBodyData = json.getJsonObject("policyData").get("jsonBodyData").toString();
+                    policyData.setJsonBody(jsonBodyData);
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.error("Exception Occured while populating request parameters: " +e);
+        }
+
+        return policyData;
+    }
+
+    public PolicyRestAdapter populateRequestParameters(PolicyParameters parameters) {
+
+        PolicyRestAdapter policyData = new PolicyRestAdapter();
         
-		/*
-		 * set policy adapter values for Building JSON object containing policy data
-		 */
-		//Common Policy Fields
-		policyData.setPolicyName(parameters.getPolicyName());
-		policyData.setOnapName(parameters.getOnapName()); 
-		policyData.setPriority(parameters.getPriority()); //Micro Service
-		policyData.setConfigName(parameters.getConfigName());  //Base and Firewall
-		policyData.setRiskType(parameters.getRiskType()); //Safe parameters Attributes
-		policyData.setRiskLevel(parameters.getRiskLevel());//Safe parameters Attributes
-		policyData.setGuard(String.valueOf(parameters.getGuard()));//Safe parameters Attributes
-		policyData.setTtlDate(convertDate(parameters.getTtlDate()));//Safe parameters Attributes
-		policyData.setApiflag("API");
-		
-		//Some policies require jsonObject conversion from String for configBody (i.e. MicroService and Firewall)
-		JsonObject json = null;
+        /*
+         * set policy adapter values for Building JSON object containing policy data
+         */
+        //Common Policy Fields
+        policyData.setPolicyName(parameters.getPolicyName());
+        policyData.setOnapName(parameters.getOnapName());
+        policyData.setPriority(parameters.getPriority()); //Micro Service
+        policyData.setConfigName(parameters.getConfigName());  //Base and Firewall
+        policyData.setRiskType(parameters.getRiskType()); //Safe parameters Attributes
+        policyData.setRiskLevel(parameters.getRiskLevel());//Safe parameters Attributes
+        policyData.setGuard(String.valueOf(parameters.getGuard()));//Safe parameters Attributes
+        policyData.setTtlDate(convertDate(parameters.getTtlDate()));//Safe parameters Attributes
+        policyData.setApiflag("API");
+
+        //Some policies require jsonObject conversion from String for configBody (i.e. MicroService and Firewall)
+        JsonObject json = null;
         try{
-        	if(parameters.getConfigBody()!= null){
-        		json = stringToJsonObject(parameters.getConfigBody());
-        	}
+            if(parameters.getConfigBody()!= null){
+                json = stringToJsonObject(parameters.getConfigBody());
+            }
         } catch(JsonException| IllegalStateException e){
             String message = XACMLErrorConstants.ERROR_DATA_ISSUE+ INVALIDJSON + parameters.getConfigBody();
             LOGGER.error(message, e);
             return null;
         }
         
-		if(parameters.getPolicyClass()!=null && !"Config".equals(parameters.getPolicyClass().toString())){
-			
-			policyData.setPolicyType(parameters.getPolicyClass().toString());
-			
-			//Get Matching attribute values
-			Map<AttributeType, Map<String, String>> attributes = parameters.getAttributes();
-			Map<String, String> matching = null;
-			if(attributes != null){
-				matching = attributes.get(AttributeType.MATCHING);
-			}
-			
-			if("Decision".equals(parameters.getPolicyClass().toString())){
-				
-				String ruleProvider = parameters.getRuleProvider().toString();
-				policyData.setRuleProvider(ruleProvider);
-				
-				if("Rainy_Day".equals(ruleProvider)){
-					
-					// Set Matching attributes in RainyDayParams in adapter
-					RainyDayParams rainyday = new RainyDayParams();
-					
-					if(matching != null) {
-						rainyday.setServiceType(matching.get("ServiceType"));
-						rainyday.setVnfType(matching.get("VNFType"));
-						rainyday.setBbid(matching.get("BB_ID"));
-						rainyday.setWorkstep(matching.get("WorkStep"));
-					}
-
-					Map<String, String> treatments = parameters.getTreatments();
-					ArrayList<Object> treatmentsTableChoices = new ArrayList<>();
-					
-					for (String keyField : treatments.keySet()) {
-						LinkedHashMap<String, String> treatmentMap = new LinkedHashMap<>();
-						String errorcode = keyField;
-						String treatment = treatments.get(errorcode);
-						treatmentMap.put("errorcode", errorcode);
-						treatmentMap.put("treatment", treatment);
-						treatmentsTableChoices.add(treatmentMap);
-					}
-					rainyday.setTreatmentTableChoices(treatmentsTableChoices);
-					policyData.setRainyday(rainyday);
-					
-				}else if("GUARD_YAML".equals(ruleProvider) || "GUARD_BL_YAML".equals(ruleProvider)) {
-					
-					// Set Matching attributes in YAMLParams in adapter
-					YAMLParams yamlparams = new YAMLParams();
-					
-					if (matching != null) {
-						yamlparams.setActor(matching.get("actor"));
-						yamlparams.setRecipe(matching.get("recipe"));
-						yamlparams.setGuardActiveStart(matching.get("guardActiveStart"));
-						yamlparams.setGuardActiveEnd(matching.get("guardActiveEnd"));
-						
-						if("GUARD_YAML".equals(ruleProvider)){
-							yamlparams.setLimit(matching.get("limit"));
-							yamlparams.setTimeWindow(matching.get("timeWindow"));
-							yamlparams.setTimeUnits(matching.get("timeUnits"));	
-						}else{
-							
-							List<String> blackList = new ArrayList<>();
-
-							if(!Strings.isNullOrEmpty(matching.get("blackList"))){
-								String[] blackListArray = matching.get("blackList").split(",");
-								for(String element : blackListArray){
-									blackList.add(element);
-								}					
-							}	
-							
-							yamlparams.setBlackList(blackList);
-
-						}					
-					}
-					policyData.setYamlparams(yamlparams);
-				}
-				
-			} else if("Action".equals(parameters.getPolicyClass().toString())){
-				
-				ArrayList<Object> ruleAlgorithmChoices = new ArrayList<>();
-								
-				List<String> dynamicLabelRuleAlgorithms = parameters.getDynamicRuleAlgorithmLabels();
-				List<String> dynamicFieldFunctionRuleAlgorithms = parameters.getDynamicRuleAlgorithmFunctions();
-				List<String> dynamicFieldOneRuleAlgorithms = parameters.getDynamicRuleAlgorithmField1();
-				List<String> dyrnamicFieldTwoRuleAlgorithms = parameters.getDynamicRuleAlgorithmField2();
-	            
-				if (dynamicLabelRuleAlgorithms != null && !dynamicLabelRuleAlgorithms.isEmpty()) {
-	                int i = dynamicLabelRuleAlgorithms.size() - 1;
-
-	                for (String labelAttr : dynamicLabelRuleAlgorithms) {
-	    				LinkedHashMap<String, String> ruleAlgorithm = new LinkedHashMap<>();
-
-	                	String id = dynamicLabelRuleAlgorithms.get(i);
-	                	String dynamicRuleAlgorithmField1 = dynamicFieldOneRuleAlgorithms.get(i);
-	                	String dynamicRuleAlgorithmCombo = dynamicFieldFunctionRuleAlgorithms.get(i);
-	                	String dynamicRuleAlgorithmField2 = dyrnamicFieldTwoRuleAlgorithms.get(i);
-	                	
-	                	ruleAlgorithm.put("id", id);
-	                	ruleAlgorithm.put("dynamicRuleAlgorithmField1", dynamicRuleAlgorithmField1);
-	                	ruleAlgorithm.put("dynamicRuleAlgorithmCombo", dynamicRuleAlgorithmCombo);
-	                	ruleAlgorithm.put("dynamicRuleAlgorithmField2", dynamicRuleAlgorithmField2);
-	                	
-	                	ruleAlgorithmChoices.add(ruleAlgorithm);
-	                	
-	                	i--;
-	                	
-	                }
-	            }
-	            
-	            policyData.setRuleAlgorithmschoices(ruleAlgorithmChoices);
-	            
-	            ArrayList<Object> attributeList = new ArrayList<>();
-	            if (matching != null) {
-		            for (Map.Entry<String, String> entry : matching.entrySet()) {
-						LinkedHashMap<String, String> attributeMap = new LinkedHashMap<>();
-						String key = entry.getKey();
-						String value = entry.getValue();
-						attributeMap.put("key", key);
-						attributeMap.put("value", value);
-						attributeList.add(attributeMap);
-					}	
-	            }
-	            
-	            policyData.setAttributes(attributeList);	    
-	            policyData.setActionAttributeValue(parameters.getActionAttribute());
-	            policyData.setActionPerformer(parameters.getActionPerformer());
-				
-			}
-		}else {
-			
-			policyData.setPolicyType("Config");
-			policyData.setConfigPolicyType(parameters.getPolicyConfigType().toString());
-			
-			//Config Specific
-			policyData.setConfigBodyData(parameters.getConfigBody()); //Base
-			policyData.setConfigType((parameters.getConfigBodyType()!=null) ? parameters.getConfigBodyType().toString().toUpperCase(): null);  //Base
-			
-			if("FW".equalsIgnoreCase(parameters.getPolicyConfigType().toString())){
-				
-				policyData.setConfigPolicyType("Firewall Config"); 
-
-		        // get values and attributes from the JsonObject
-				if(json != null){
-			        if (json.get("securityZoneId")!=null){
-			        	String securityZone = json.get("securityZoneId").toString().replace("\"", "");
-			        	policyData.setSecurityZone(securityZone);
-			        }
-			        if (json.get(CONFIG_NAME)!=null){
-			            String configName = json.get(CONFIG_NAME).toString().replace("\"", "");
-			            policyData.setConfigName(configName);
-			        }
-				}
-								
-			}else if("MS".equals(parameters.getPolicyConfigType().toString())){
-				
-				policyData.setConfigPolicyType("Micro Service");
-				
-		        // get values and attributes from the JsonObject
-				if(json != null){
-					if (json.containsKey(CONTENT)){
-						String content = json.get(CONTENT).toString();
-						ObjectMapper mapper = new ObjectMapper();
-						JsonNode policyJSON = null;
-						try {
-							policyJSON = mapper.readTree(content);
-						} catch (IOException e) {
-				            String message = XACMLErrorConstants.ERROR_DATA_ISSUE+ INVALIDJSON + parameters.getConfigBody();
-				            LOGGER.error(message, e);
-				            return null;					
-				        }
-						policyData.setPolicyJSON(policyJSON);
-					}
-			        if (json.containsKey(SERVICE)){
-			        	String serviceType = json.get(SERVICE).toString().replace("\"", "");
-			        	policyData.setServiceType(serviceType);
-			        }
-			        if (json.containsKey("uuid")){
-			            String uuid = json.get("uuid").toString().replace("\"", "");
-			            policyData.setUuid(uuid);
-			        }
-			        if (json.containsKey(LOCATION)){
-			            String msLocation = json.get(LOCATION).toString().replace("\"", "");
-			            policyData.setLocation(msLocation);
-			        }
-			        if (json.containsKey(CONFIG_NAME)){
-			            String configName = json.get(CONFIG_NAME).toString().replace("\"", "");
-			            policyData.setConfigName(configName);
-			        }
-			        if(json.containsKey(PRIORITY)){
-			        	String priority = json.get(PRIORITY).toString().replace("\"", "");
-			        	policyData.setPriority(priority);
-			        }
-			        if(json.containsKey(VERSION)){
-			        	String version = json.get(VERSION).toString().replace("\"", "");
-			        	policyData.setVersion(version);
-			        }
-			        if(json.containsKey(POLICYSCOPE)){
-			        	String policyScope = json.get(POLICYSCOPE).toString().replace("\"", "");
-			        	policyData.setPolicyScope(policyScope);
-			        }
-			        if(json.containsKey(RISKTYPE)){
-			        	String riskType = json.get(RISKTYPE).toString().replace("\"", "");
-			        	policyData.setRiskType(riskType);
-			        }
-			        if(json.containsKey(RISKLEVEL)){
-			        	String riskLevel = json.get(RISKLEVEL).toString().replace("\"", "");
-			        	policyData.setRiskLevel(riskLevel);
-			        }
-			        if(json.containsKey(GUARD)){
-			        	String guard = json.get(GUARD).toString().replace("\"", "");
-			        	policyData.setGuard(guard);
-			        }
-				} else {
-		            String message = XACMLErrorConstants.ERROR_DATA_ISSUE+ INVALIDJSON + parameters.getConfigBody();
-		            LOGGER.error(message);
-		            return null;				
-				}
-				
-			}else if("Optimization".equals(parameters.getPolicyConfigType().toString())){
-				
-				policyData.setConfigPolicyType("Optimization");
-				
-		        // get values and attributes from the JsonObject
-				if(json != null){
-					if (json.containsKey(CONTENT)){
-						String content = json.get(CONTENT).toString();
-						ObjectMapper mapper = new ObjectMapper();
-						JsonNode policyJSON = null;
-						try {
-							policyJSON = mapper.readTree(content);
-						} catch (IOException e) {
-				            String message = XACMLErrorConstants.ERROR_DATA_ISSUE+ INVALIDJSON + parameters.getConfigBody();
-				            LOGGER.error(message, e);
-				            return null;					
-				        }
-						policyData.setPolicyJSON(policyJSON);
-					}
-			        if (json.containsKey(SERVICE)){
-			        	String serviceType = json.get(SERVICE).toString().replace("\"", "");
-			        	policyData.setServiceType(serviceType);
-			        }
-			        if (json.containsKey("uuid")){
-			            String uuid = json.get("uuid").toString().replace("\"", "");
-			            policyData.setUuid(uuid);
-			        }
-			        if (json.containsKey(LOCATION)){
-			            String msLocation = json.get(LOCATION).toString().replace("\"", "");
-			            policyData.setLocation(msLocation);
-			        }
-			        if (json.containsKey(CONFIG_NAME)){
-			            String configName = json.get(CONFIG_NAME).toString().replace("\"", "");
-			            policyData.setConfigName(configName);
-			        }
-			        if(json.containsKey(PRIORITY)){
-			        	String priority = json.get(PRIORITY).toString().replace("\"", "");
-			        	policyData.setPriority(priority);
-			        }
-			        if(json.containsKey(VERSION)){
-			        	String version = json.get(VERSION).toString().replace("\"", "");
-			        	policyData.setVersion(version);
-			        }
-			        if(json.containsKey(POLICYSCOPE)){
-			        	String policyScope = json.get(POLICYSCOPE).toString().replace("\"", "");
-			        	policyData.setPolicyScope(policyScope);
-			        }
-			        if(json.containsKey(RISKTYPE)){
-			        	String riskType = json.get(RISKTYPE).toString().replace("\"", "");
-			        	policyData.setRiskType(riskType);
-			        }
-			        if(json.containsKey(RISKLEVEL)){
-			        	String riskLevel = json.get(RISKLEVEL).toString().replace("\"", "");
-			        	policyData.setRiskLevel(riskLevel);
-			        }
-			        if(json.containsKey(GUARD)){
-			        	String guard = json.get(GUARD).toString().replace("\"", "");
-			        	policyData.setGuard(guard);
-			        }
-				}
-				
-			} else if("Fault".equals(parameters.getPolicyConfigType().toString())){
-				
-				policyData.setConfigPolicyType("ClosedLoop_Fault");
-				
-				if(json != null){
-					policyData.setJsonBody(json.toString());
-			        if (json.get(ONAPNAME)!=null){
-			        	String onapName = json.get(ONAPNAME).toString().replace("\"", "");
-			        	policyData.setOnapName(onapName);
-			        }
-				}
-				
-			} else if("PM".equals(parameters.getPolicyConfigType().toString())){
-				
-				policyData.setConfigPolicyType("ClosedLoop_PM");
-				
-				if(json != null){
-					policyData.setJsonBody(json.toString());
-			        if (json.get(ONAPNAME)!=null){
-			        	String onapName = json.get(ONAPNAME).toString().replace("\"", "");
-			        	policyData.setOnapName(onapName);
-			        }
-			        if (json.get(SERVICETYPE_POLICY_NAME)!=null){
-			        	String serviceType = json.get(SERVICETYPE_POLICY_NAME).toString().replace("\"", "");
-						LinkedHashMap<String, String> serviceTypePolicyName = new LinkedHashMap<>();
-						serviceTypePolicyName.put(SERVICETYPE_POLICY_NAME, serviceType);
-			        	policyData.setServiceTypePolicyName(serviceTypePolicyName);
-			        }
-				}
-			} else if("BRMS_Param".equals(parameters.getPolicyConfigType().toString())){
-				Map<AttributeType, Map<String, String>> drlRuleAndUIParams = parameters.getAttributes();
-				Map<String, String> rule = drlRuleAndUIParams.get(AttributeType.RULE);
-				policyData.setRuleName(rule.get("templateName"));
-				
-			}
-		}
-
-		return policyData;
-				
-	}
+        if(parameters.getPolicyClass()!=null && !"Config".equals(parameters.getPolicyClass().toString())){
+
+            policyData.setPolicyType(parameters.getPolicyClass().toString());
+
+            //Get Matching attribute values
+            Map<AttributeType, Map<String, String>> attributes = parameters.getAttributes();
+            Map<String, String> matching = null;
+            if(attributes != null){
+                matching = attributes.get(AttributeType.MATCHING);
+            }
+
+            if("Decision".equals(parameters.getPolicyClass().toString())){
+
+                String ruleProvider = parameters.getRuleProvider().toString();
+                policyData.setRuleProvider(ruleProvider);
+
+                if("Rainy_Day".equals(ruleProvider)){
+
+                    // Set Matching attributes in RainyDayParams in adapter
+                    RainyDayParams rainyday = new RainyDayParams();
+
+                    if(matching != null) {
+                        rainyday.setServiceType(matching.get("ServiceType"));
+                        rainyday.setVnfType(matching.get("VNFType"));
+                        rainyday.setBbid(matching.get("BB_ID"));
+                        rainyday.setWorkstep(matching.get("WorkStep"));
+                    }
+
+                    Map<String, String> treatments = parameters.getTreatments();
+                    ArrayList<Object> treatmentsTableChoices = new ArrayList<>();
+
+                    for (String keyField : treatments.keySet()) {
+                        LinkedHashMap<String, String> treatmentMap = new LinkedHashMap<>();
+                        String errorcode = keyField;
+                        String treatment = treatments.get(errorcode);
+                        treatmentMap.put("errorcode", errorcode);
+                        treatmentMap.put("treatment", treatment);
+                        treatmentsTableChoices.add(treatmentMap);
+                    }
+                    rainyday.setTreatmentTableChoices(treatmentsTableChoices);
+                    policyData.setRainyday(rainyday);
+
+                }else if("GUARD_YAML".equals(ruleProvider) || "GUARD_BL_YAML".equals(ruleProvider)) {
+
+                    // Set Matching attributes in YAMLParams in adapter
+                    YAMLParams yamlparams = new YAMLParams();
+
+                    if (matching != null) {
+                        yamlparams.setActor(matching.get("actor"));
+                        yamlparams.setRecipe(matching.get("recipe"));
+                        yamlparams.setGuardActiveStart(matching.get("guardActiveStart"));
+                        yamlparams.setGuardActiveEnd(matching.get("guardActiveEnd"));
+
+                        if("GUARD_YAML".equals(ruleProvider)){
+                            yamlparams.setLimit(matching.get("limit"));
+                            yamlparams.setTimeWindow(matching.get("timeWindow"));
+                            yamlparams.setTimeUnits(matching.get("timeUnits"));
+                        }else{
+
+                            List<String> blackList = new ArrayList<>();
+
+                            if(!Strings.isNullOrEmpty(matching.get("blackList"))){
+                                String[] blackListArray = matching.get("blackList").split(",");
+                                for(String element : blackListArray){
+                                    blackList.add(element);
+                                }
+                            }
+
+                            yamlparams.setBlackList(blackList);
+
+                        }
+                    }
+                    policyData.setYamlparams(yamlparams);
+                }
+
+            } else if("Action".equals(parameters.getPolicyClass().toString())){
+
+                ArrayList<Object> ruleAlgorithmChoices = new ArrayList<>();
+
+                List<String> dynamicLabelRuleAlgorithms = parameters.getDynamicRuleAlgorithmLabels();
+                List<String> dynamicFieldFunctionRuleAlgorithms = parameters.getDynamicRuleAlgorithmFunctions();
+                List<String> dynamicFieldOneRuleAlgorithms = parameters.getDynamicRuleAlgorithmField1();
+                List<String> dyrnamicFieldTwoRuleAlgorithms = parameters.getDynamicRuleAlgorithmField2();
+
+                if (dynamicLabelRuleAlgorithms != null && !dynamicLabelRuleAlgorithms.isEmpty()) {
+                    int i = dynamicLabelRuleAlgorithms.size() - 1;
+
+                    for (String labelAttr : dynamicLabelRuleAlgorithms) {
+                        LinkedHashMap<String, String> ruleAlgorithm = new LinkedHashMap<>();
+
+                        String id = dynamicLabelRuleAlgorithms.get(i);
+                        String dynamicRuleAlgorithmField1 = dynamicFieldOneRuleAlgorithms.get(i);
+                        String dynamicRuleAlgorithmCombo = dynamicFieldFunctionRuleAlgorithms.get(i);
+                        String dynamicRuleAlgorithmField2 = dyrnamicFieldTwoRuleAlgorithms.get(i);
+
+                        ruleAlgorithm.put("id", id);
+                        ruleAlgorithm.put("dynamicRuleAlgorithmField1", dynamicRuleAlgorithmField1);
+                        ruleAlgorithm.put("dynamicRuleAlgorithmCombo", dynamicRuleAlgorithmCombo);
+                        ruleAlgorithm.put("dynamicRuleAlgorithmField2", dynamicRuleAlgorithmField2);
+
+                        ruleAlgorithmChoices.add(ruleAlgorithm);
+
+                        i--;
+
+                    }
+                }
+
+                policyData.setRuleAlgorithmschoices(ruleAlgorithmChoices);
+
+                ArrayList<Object> attributeList = new ArrayList<>();
+                if (matching != null) {
+                    for (Map.Entry<String, String> entry : matching.entrySet()) {
+                        LinkedHashMap<String, String> attributeMap = new LinkedHashMap<>();
+                        String key = entry.getKey();
+                        String value = entry.getValue();
+                        attributeMap.put("key", key);
+                        attributeMap.put("value", value);
+                        attributeList.add(attributeMap);
+                    }
+                }
+
+                policyData.setAttributes(attributeList);
+                policyData.setActionAttributeValue(parameters.getActionAttribute());
+                policyData.setActionPerformer(parameters.getActionPerformer());
+
+            }
+        }else {
+
+            policyData.setPolicyType("Config");
+            policyData.setConfigPolicyType(parameters.getPolicyConfigType().toString());
+
+            //Config Specific
+            policyData.setConfigBodyData(parameters.getConfigBody()); //Base
+            policyData.setConfigType((parameters.getConfigBodyType()!=null) ? parameters.getConfigBodyType().toString().toUpperCase(): null);  //Base
+
+            if("FW".equalsIgnoreCase(parameters.getPolicyConfigType().toString())){
+
+                policyData.setConfigPolicyType("Firewall Config");
+
+                // get values and attributes from the JsonObject
+                if(json != null){
+                    if (json.get("securityZoneId")!=null){
+                        String securityZone = json.get("securityZoneId").toString().replace("\"", "");
+                        policyData.setSecurityZone(securityZone);
+                    }
+                    if (json.get(CONFIG_NAME)!=null){
+                        String configName = json.get(CONFIG_NAME).toString().replace("\"", "");
+                        policyData.setConfigName(configName);
+                    }
+                }
+
+            }else if("MS".equals(parameters.getPolicyConfigType().toString())){
+
+                policyData.setConfigPolicyType("Micro Service");
+
+                // get values and attributes from the JsonObject
+                if(json != null){
+                    if (json.containsKey(CONTENT)){
+                        String content = json.get(CONTENT).toString();
+                        ObjectMapper mapper = new ObjectMapper();
+                        JsonNode policyJSON = null;
+                        try {
+                            policyJSON = mapper.readTree(content);
+                        } catch (IOException e) {
+                            String message = XACMLErrorConstants.ERROR_DATA_ISSUE+ INVALIDJSON + parameters.getConfigBody();
+                            LOGGER.error(message, e);
+                            return null;
+                        }
+                        policyData.setPolicyJSON(policyJSON);
+                    }
+                    if (json.containsKey(SERVICE)){
+                        String serviceType = json.get(SERVICE).toString().replace("\"", "");
+                        policyData.setServiceType(serviceType);
+                    }
+                    if (json.containsKey("uuid")){
+                        String uuid = json.get("uuid").toString().replace("\"", "");
+                        policyData.setUuid(uuid);
+                    }
+                    if (json.containsKey(LOCATION)){
+                        String msLocation = json.get(LOCATION).toString().replace("\"", "");
+                        policyData.setLocation(msLocation);
+                    }
+                    if (json.containsKey(CONFIG_NAME)){
+                        String configName = json.get(CONFIG_NAME).toString().replace("\"", "");
+                        policyData.setConfigName(configName);
+                    }
+                    if(json.containsKey(PRIORITY)){
+                        String priority = json.get(PRIORITY).toString().replace("\"", "");
+                        policyData.setPriority(priority);
+                    }
+                    if(json.containsKey(VERSION)){
+                        String version = json.get(VERSION).toString().replace("\"", "");
+                        policyData.setVersion(version);
+                    }
+                    if(json.containsKey(POLICYSCOPE)){
+                        String policyScope = json.get(POLICYSCOPE).toString().replace("\"", "");
+                        policyData.setPolicyScope(policyScope);
+                    }
+                    if(json.containsKey(RISKTYPE)){
+                        String riskType = json.get(RISKTYPE).toString().replace("\"", "");
+                        policyData.setRiskType(riskType);
+                    }
+                    if(json.containsKey(RISKLEVEL)){
+                        String riskLevel = json.get(RISKLEVEL).toString().replace("\"", "");
+                        policyData.setRiskLevel(riskLevel);
+                    }
+                    if(json.containsKey(GUARD)){
+                        String guard = json.get(GUARD).toString().replace("\"", "");
+                        policyData.setGuard(guard);
+                    }
+                } else {
+                    String message = XACMLErrorConstants.ERROR_DATA_ISSUE+ INVALIDJSON + parameters.getConfigBody();
+                    LOGGER.error(message);
+                    return null;
+                }
+
+            }else if("Optimization".equals(parameters.getPolicyConfigType().toString())){
+
+                policyData.setConfigPolicyType("Optimization");
+
+                // get values and attributes from the JsonObject
+                if(json != null){
+                    if (json.containsKey(CONTENT)){
+                        String content = json.get(CONTENT).toString();
+                        ObjectMapper mapper = new ObjectMapper();
+                        JsonNode policyJSON = null;
+                        try {
+                            policyJSON = mapper.readTree(content);
+                        } catch (IOException e) {
+                            String message = XACMLErrorConstants.ERROR_DATA_ISSUE+ INVALIDJSON + parameters.getConfigBody();
+                            LOGGER.error(message, e);
+                            return null;
+                        }
+                        policyData.setPolicyJSON(policyJSON);
+                    }
+                    if (json.containsKey(SERVICE)){
+                        String serviceType = json.get(SERVICE).toString().replace("\"", "");
+                        policyData.setServiceType(serviceType);
+                    }
+                    if (json.containsKey("uuid")){
+                        String uuid = json.get("uuid").toString().replace("\"", "");
+                        policyData.setUuid(uuid);
+                    }
+                    if (json.containsKey(LOCATION)){
+                        String msLocation = json.get(LOCATION).toString().replace("\"", "");
+                        policyData.setLocation(msLocation);
+                    }
+                    if (json.containsKey(CONFIG_NAME)){
+                        String configName = json.get(CONFIG_NAME).toString().replace("\"", "");
+                        policyData.setConfigName(configName);
+                    }
+                    if(json.containsKey(PRIORITY)){
+                        String priority = json.get(PRIORITY).toString().replace("\"", "");
+                        policyData.setPriority(priority);
+                    }
+                    if(json.containsKey(VERSION)){
+                        String version = json.get(VERSION).toString().replace("\"", "");
+                        policyData.setVersion(version);
+                    }
+                    if(json.containsKey(POLICYSCOPE)){
+                        String policyScope = json.get(POLICYSCOPE).toString().replace("\"", "");
+                        policyData.setPolicyScope(policyScope);
+                    }
+                    if(json.containsKey(RISKTYPE)){
+                        String riskType = json.get(RISKTYPE).toString().replace("\"", "");
+                        policyData.setRiskType(riskType);
+                    }
+                    if(json.containsKey(RISKLEVEL)){
+                        String riskLevel = json.get(RISKLEVEL).toString().replace("\"", "");
+                        policyData.setRiskLevel(riskLevel);
+                    }
+                    if(json.containsKey(GUARD)){
+                        String guard = json.get(GUARD).toString().replace("\"", "");
+                        policyData.setGuard(guard);
+                    }
+                }
+
+            } else if("Fault".equals(parameters.getPolicyConfigType().toString())){
+
+                policyData.setConfigPolicyType("ClosedLoop_Fault");
+
+                if(json != null){
+                    policyData.setJsonBody(json.toString());
+                    if (json.get(ONAPNAME)!=null){
+                        String onapName = json.get(ONAPNAME).toString().replace("\"", "");
+                        policyData.setOnapName(onapName);
+                    }
+                }
+
+            } else if("PM".equals(parameters.getPolicyConfigType().toString())){
+
+                policyData.setConfigPolicyType("ClosedLoop_PM");
+
+                if(json != null){
+                    policyData.setJsonBody(json.toString());
+                    if (json.get(ONAPNAME)!=null){
+                        String onapName = json.get(ONAPNAME).toString().replace("\"", "");
+                        policyData.setOnapName(onapName);
+                    }
+                    if (json.get(SERVICETYPE_POLICY_NAME)!=null){
+                        String serviceType = json.get(SERVICETYPE_POLICY_NAME).toString().replace("\"", "");
+                        LinkedHashMap<String, String> serviceTypePolicyName = new LinkedHashMap<>();
+                        serviceTypePolicyName.put(SERVICETYPE_POLICY_NAME, serviceType);
+                        policyData.setServiceTypePolicyName(serviceTypePolicyName);
+                    }
+                }
+            } else if("BRMS_Param".equals(parameters.getPolicyConfigType().toString())){
+                Map<AttributeType, Map<String, String>> drlRuleAndUIParams = parameters.getAttributes();
+                Map<String, String> rule = drlRuleAndUIParams.get(AttributeType.RULE);
+                policyData.setRuleName(rule.get("templateName"));
+
+            }
+        }
+
+        return policyData;
+
+    }
     
     private JsonObject stringToJsonObject(String value) {
-    	try(JsonReader jsonReader = Json.createReader(new StringReader(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);