Add PAP Policy parameter builder xacml policy

Fix Sonar flagged major issue about 14 params instead of 9
in the constructor of std pap policy class. Commit5 for
modify constrctor.fix test

Issue-ID: POLICY-1016
Change-Id: I79c8482b7fc4e203cb18402ba2b5a68a120c57b1
Signed-off-by: krisjinka <kris.jinka@samsung.com>

3 files changed, 1216 insertions, 948 deletions

diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
index 5974883ee..264b2b784 100644
--- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,900 +24,924 @@ import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.onap.policy.xacml.api.pap.OnapPAPPolicy;
 
-public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
-	private static final long serialVersionUID = 5260230629397322000L;
-
-	private String policyName = null;
-	private String oldPolicyFileName = null;
-	private String policyDescription = null;
-	private String onapName = null;
-	private String configName = null;
-	private Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
-	private Map<String, String> treatments = new HashMap<>();
-	private Map<String, String> dropDownMap = new HashMap<>();
-	private Map<String, String> dynamicSettingsMap = new HashMap<>();
-	private List<String> dynamicRuleAlgorithmLabels;
-	private List<String> dynamicRuleAlgorithmCombo;
-	private List<String> dynamicRuleAlgorithmField1;
-	private List<String> dynamicRuleAlgorithmField2;
-	private transient List<Object> dynamicVariableList;
-	private List<String> dataTypeList;
-	private String configBodyData = null;
-	private String policyID = null;
-	private String ruleID = null;
-	private String brmsController;
-	private List<String> brmsDependency;
-	private String configType = null;
-	private Boolean editPolicy = false;
-	private Boolean draft = false;
-	private String version = null;
-	private String domain = null;
-	private String configPolicyType = null; 
-	private String jsonBody = null;
-	private String serviceType = null;
-	private Integer highestVersion = null;
-	private URI location = null;
-	private String actionPerformer = null;
-	private String actionAttribute = null;
-	private String actionBody = null;
-	private String actionDictHeader = null;
-	private String actionDictType = null;
-	private String actionDictUrl = null;
-	private String actionDictMethod = null;
-	private String uuid = null;
-	private String msLocation = null;
-	private String priority = null;
-	private transient Map<String,String> drlRuleAndUIParams=null;
-	private String deleteCondition = null;
-	private String dictionaryType = null;
-	private String dictionary = null;
-	private String dictionaryFields = null;
-	private String providerComboBox = null;
-	private String riskType = null;
-	private String guard = null;
-	private String riskLevel;
-	private String ttlDate = null;
-
-
-	public StdPAPPolicy() {
-		//
-		// Default empty constructor
-		//
-	}
-
-	//Constructor for sending location when pushing policies
-	public StdPAPPolicy(URI location) {
-		this.location = location;
-	}
-
-	//Constructor for Validating Config Policies
-	public StdPAPPolicy(String policyName, String body, String configType, String configPolicyType) {
-		this.policyName = policyName;
-		this.configBodyData = body;
-		this.configType = configType;
-		this.configPolicyType = configPolicyType;
-	}
-
-	//convenience constructor
-	public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String configType, 
-			String body, Boolean editPolicy, String domain, String riskLevel, String riskType, String guard, String ttlDate){
-		this(configPolicyType, policyName, description, onapName, configName, attributes, configType, 
-				body, editPolicy, domain, 1, riskLevel, riskType, guard, ttlDate);
-	}
-
-	//Constructor for Create/Update Action Policies from API
-	public StdPAPPolicy(String policyName, String description, Map<String, String> attributes, List<String> dynamicRuleAlgorithmLabels, List<String> dynamicRuleAlgorithmCombo, 
-			List<String> dynamicRuleAlgorithmField1, List<String> dynamicRuleAlgorithmField2, String actionPerformer,String actionAttribute, Boolean editPolicy, 
-			String domain, int highestVersion) {
-
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.dyanamicFieldConfigAttributes = attributes;
-		this.dynamicRuleAlgorithmLabels = dynamicRuleAlgorithmLabels;
-		this.dynamicRuleAlgorithmCombo = dynamicRuleAlgorithmCombo;
-		this.dynamicRuleAlgorithmField1 = dynamicRuleAlgorithmField1;
-		this.dynamicRuleAlgorithmField2 = dynamicRuleAlgorithmField2;
-		this.actionPerformer = actionPerformer;
-		this.actionAttribute = actionAttribute;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.highestVersion = highestVersion;	
-
-	}
-
-	//Constructor for Create/Update Decision Policies
-	public StdPAPPolicy(String policyName, String description, String onapName, String providerComboBox, 
-			Map<String, String> attributes, Map<String, String> settings, Map<String, String> treatments,
-			List<String> dynamicRuleAlgorithmLabels, List<String> dynamicRuleAlgorithmCombo, List<String> dynamicRuleAlgorithmField1, 
-			List<String> dynamicRuleAlgorithmField2, Map<String, String> dropDownMap, List<Object> dynamicVariableList, 
-			List<String> dataTypeList, Boolean editPolicy, String domain, int highestVersion) {
-
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.onapName = onapName;
-		this.setProviderComboBox(providerComboBox);
-		this.dyanamicFieldConfigAttributes = attributes;
-		this.dynamicSettingsMap = settings;
-		this.dynamicRuleAlgorithmLabels = dynamicRuleAlgorithmLabels;
-		this.dynamicRuleAlgorithmCombo = dynamicRuleAlgorithmCombo;
-		this.dynamicRuleAlgorithmField1 = dynamicRuleAlgorithmField1;
-		this.dynamicRuleAlgorithmField2 = dynamicRuleAlgorithmField2;
-		this.dynamicVariableList = dynamicVariableList;
-		this.dataTypeList = dataTypeList;
-		this.dropDownMap = dropDownMap;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.highestVersion = highestVersion;	
-		this.treatments = treatments;
-
-	}
-
-	//Constructor for Create Config Policies from API and Admin Console
-	//Constructor for Updating Config Policies from the API
-	public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String configType, 
-			String body, Boolean editPolicy, String domain, int highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.onapName = onapName;
-		this.configName = configName;
-		this.dyanamicFieldConfigAttributes = attributes;
-		this.configType = configType;
-		this.configBodyData = body;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.highestVersion = highestVersion;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	//convenience constructor
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String body, String policyID, 
-			String ruleID, String configType, Boolean editPolicy, String version, String domain, String riskLevel, String riskType, String guard, String ttlDate) {
-		this (configPolicyType, policyName, description, onapName, configName, attributes, body, policyID, 
-				ruleID, configType, editPolicy, version, domain,  1, riskLevel, riskType, guard, ttlDate); 
-	}
-
-	//Constructor for Updating Config Policies from Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String onapName, String configName, Map<String, String> attributes, String body, String policyID, 
-			String ruleID, String configType, Boolean editPolicy, String version, String domain,  int highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.onapName = onapName;
-		this.configName = configName;
-		this.dyanamicFieldConfigAttributes = attributes;
-		this.configBodyData = body;
-		this.policyID = policyID;
-		this.ruleID = ruleID;
-		this.configType = configType;
-		this.editPolicy = editPolicy;
-		this.version = version;
-		this.domain = domain;
-		this.highestVersion = highestVersion;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-
-	//Constructor for Creating Config Firewall Policies
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String configName, 
-			Boolean editPolicy, String domain, String jsonBody,  Integer highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.jsonBody = jsonBody;
-		this.highestVersion = highestVersion;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-
-	}
-
-	//Constructor for Creating Goc Policies
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String configName, 
-			Boolean editPolicy, String domain, String jsonBody,  Integer highestVersion, String eCompName, String riskLevel, String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.jsonBody = jsonBody;
-		this.highestVersion = highestVersion;
-		this.onapName=eCompName;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	//Constructor for Creating BRMS Policies from the Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, 
-			String configName, Boolean editPolicy, String domain, 
-			Map<String,String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName, 
-			String configBodyData, String riskLevel, String riskType, String guard, String ttlDate, String brmsController, List<String> brmsDependency) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-		this.highestVersion = highestVersion;
-		this.onapName=eCompName;
-		this.configBodyData=configBodyData;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-		this.brmsController = brmsController;
-		this.brmsDependency = brmsDependency;
-	}
-
-	//Constructor for Creating BRMS Param Policies from the Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, 
-			String configName, Boolean editPolicy, String domain, 
-			Map<String,String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName, 
-			String configBodyData,Map<String,String> drlRuleAndUIParams, String riskLevel, String riskType, String guard, String ttlDate, String brmsController, List<String> brmsDependency) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-		this.highestVersion = highestVersion;
-		this.onapName=eCompName;
-		this.configBodyData=configBodyData;
-		this.drlRuleAndUIParams=drlRuleAndUIParams;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-		this.brmsController = brmsController;
-		this.brmsDependency = brmsDependency;
-	}
-
-	//Constructor for Creating CloseLoop_Fault and Performance Metric Policies
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String onapName, 
-			String jsonBody, Boolean draft, String oldPolicyFileName, String serviceType, Boolean editPolicy, 
-			String domain, Integer highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.onapName = onapName;
-		this.jsonBody = jsonBody;
-		this.draft = draft;
-		this.oldPolicyFileName = oldPolicyFileName;
-		this.serviceType = serviceType;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.highestVersion = highestVersion;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	//Constructor for Updating Config Firewall Policies from the Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, String configName, Boolean editPolicy, String domain, String policyID, 
-			String ruleID, String version, String jsonBody,  Integer highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.policyID = policyID;
-		this.ruleID = ruleID;
-		this.version = version;
-		this.jsonBody = jsonBody;
-		this.highestVersion = highestVersion;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	//Constructor for Micro Service Creating/Updating Policies from the Admin Console
-	public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName, String configName, String serviceType, String uuid, 
-			String msLocation, String jsonBody, String priority, String version, Boolean editPolicy, String domain, int highestVersion, String riskLevel, 
-			String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.onapName = onapName;
-		this.configName = configName;
-		this.serviceType = serviceType;
-		this.uuid = uuid;
-		this.msLocation = msLocation;
-		this.priority = priority;
-		this.version = version;
-		this.jsonBody = jsonBody;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.highestVersion = highestVersion;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	//Constructor for Updating Goc Policies from the Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, 
-			String configName, Boolean editPolicy, String domain, 
-			String policyID, String ruleID, String version, 
-			String jsonBody,  Integer highestVersion, String eCompName,String riskLevel, String riskType, String guard, String ttlDate) {
-
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.policyID = policyID;
-		this.ruleID = ruleID;
-		this.version = version;
-		this.jsonBody = jsonBody;
-		this.highestVersion = highestVersion;
-		this.onapName=eCompName;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	//Constructor for Updating Brms Policies from the Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, 
-			String configName, Boolean editPolicy, String domain, 
-			String policyID, String ruleID, String version, 
-			Map<String,String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName, 
-			String configBodyData , String riskLevel, String riskType, String guard, String ttlDate
-			) {
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.policyID = policyID;
-		this.ruleID = ruleID;
-		this.version = version;
-		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-		this.highestVersion = highestVersion;
-		this.onapName=eCompName;
-		this.configBodyData=configBodyData;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	//Constructor for Updating Brms Param Policies from the Admin Console
-	public StdPAPPolicy (String configPolicyType, String policyName, String description, 
-			String configName, Boolean editPolicy, String domain, 
-			String policyID, String ruleID, String version, 
-			Map<String,String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName, 
-			Map<String,String> drlRuleAndUIParams, String riskLevel, String riskType, String guard, String ttlDate
-			) {
-		this.configPolicyType = configPolicyType;
-		this.policyName = policyName;
-		this.policyDescription = description;
-		this.configName = configName;
-		this.editPolicy = editPolicy;
-		this.domain = domain;
-		this.policyID = policyID;
-		this.ruleID = ruleID;
-		this.version = version;
-		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-		this.highestVersion = highestVersion;
-		this.onapName=eCompName;
-		this.drlRuleAndUIParams=drlRuleAndUIParams;
-		this.riskLevel = riskLevel;
-		this.riskType = riskType;
-		this.guard = guard;	
-		this.ttlDate = ttlDate;
-	}
-
-	// Constructor for deleting policies from the API
-	public StdPAPPolicy(String policyName, String deleteCondition) {
-		this.policyName = policyName;
-		this.deleteCondition = deleteCondition;
-	}
-
-	// Constructor for creating dictionary items from the API>
-	public StdPAPPolicy(String dictionaryType, String dictionary, String dictionaryFields) {
-		this.dictionaryType = dictionaryType;
-		this.dictionary = dictionary;
-		this.dictionaryFields = dictionaryFields;
-	}
-
-	@Override
-	public String getPolicyName() {
-		return policyName;
-	}
-
-	@Override
-	public String getPolicyDescription() {
-		return policyDescription;
-	}
-
-	@Override
-	public String getOnapName() {
-		return onapName;
-	}
-
-	@Override
-	public String getConfigName() {
-		return configName;
-	}
-
-	@Override
-	public Map<String, String> getDynamicFieldConfigAttributes() {
-		return dyanamicFieldConfigAttributes;
-	}
-
-	@Override
-	public String getConfigBodyData() {
-		return configBodyData;
-	}
-
-	@Override
-	public String getPolicyID() {
-		return policyID;
-	}
-
-	@Override
-	public String getRuleID() {
-		return ruleID;
-	}
-
-	@Override
-	public String getConfigType() {
-		return configType;
-	}
-
-	@Override
-	public Boolean isEditPolicy() {
-		return editPolicy;
-	}
-
-	@Override
-	public Boolean isDraft() {
-		return draft;
-	}
-
-	@Override
-	public String getVersion() {
-		return version;
-	}
-
-	@Override
-	public String getDomainDir() {
-		return domain;
-	}
-
-	@Override
-	public String getConfigPolicyType() {
-		return configPolicyType;
-	}
-
-	@Override
-	public String getJsonBody() {
-		return jsonBody;
-	}
-
-	@Override
-	public Integer getHighestVersion() {
-		return highestVersion;
-	}
-
-	@Override
-	public URI getLocation() {
-		return location;
-	}
-
-	@Override
-	public List<String> getDynamicRuleAlgorithmLabels() {
-		return dynamicRuleAlgorithmLabels;
-	}
-
-	@Override
-	public List<String> getDynamicRuleAlgorithmCombo() {
-		return dynamicRuleAlgorithmCombo;
-	}
-
-	@Override
-	public List<String> getDynamicRuleAlgorithmField1() {
-		return dynamicRuleAlgorithmField1;
-	}
-
-	@Override
-	public List<String> getDynamicRuleAlgorithmField2() {
-		return dynamicRuleAlgorithmField2;
-	}
-
-	@Override
-	public String getActionPerformer() {
-		return actionPerformer;
-	}
-
-	@Override
-	public String getActionAttribute() {
-		return actionAttribute;
-	}
-
-	@Override
-	public String getActionBody() {
-		return actionBody;
-	}
-
-	@Override
-	public Map<String, String> getDropDownMap() {
-		return dropDownMap;
-	}
-
-	@Override
-	public String getActionDictHeader() {
-		return actionDictHeader;
-	}
-
-	@Override
-	public String getActionDictType() {
-		return actionDictType;
-	}
-
-	@Override
-	public String getActionDictUrl() {
-		return actionDictUrl;
-	}
-
-	@Override
-	public String getActionDictMethod() {
-		return actionDictMethod;
-	}
-
-	@Override
-	public Map<String, String> getDynamicSettingsMap() {
-		return dynamicSettingsMap;
-	}
-
-	@Override
-	public List<Object> getDynamicVariableList() {
-		return dynamicVariableList;
-	}
-
-	@Override
-	public List<String> getDataTypeList() {
-		return dataTypeList;
-	}
-
-	@Override
-	public String getOldPolicyFileName() {
-		return oldPolicyFileName;
-	}
-
-	@Override
-	public String getServiceType() {
-		return serviceType;
-	}
-
-	@Override
-	public String getUuid() {
-		return uuid;
-	}
-
-	@Override
-	public String getMsLocation() {
-		return msLocation;
-	}
-
-	@Override
-	public String getPriority() {
-		return priority;
-	}
-
-	@Override
-	public String getDeleteCondition() {
-		return deleteCondition;
-	}
-
-	@Override
-	public String getDictionaryType() {
-		return dictionaryType;
-	}
-
-	@Override
-	public String getDictionary() {
-		return dictionary;
-	}
-
-	@Override
-	public String getTTLDate(){
-		return ttlDate;
-	}
-
-	@Override
-	public String getDictionaryFields() {
-		return dictionaryFields;
-	}
-
-	@Override
-	public String getRiskType() {
-		return riskType;
-	}
-
-	@Override
-	public String getRiskLevel() {
-		return riskLevel;
-	}
-
-	@Override
-	public String getGuard() {
-		return guard;
-	}
-
-	@Override
-	public Map<String, String> getTreatments() {
-		return treatments;
-	}
-	
-	@Override
-	public String toString() {
-		return "StdPAPPolicy [policyName=" + policyName + ", policyDescription=" + policyDescription + ", onapName="
-				+ onapName + ", configName=" + configName + ", dyanamicFieldConfigAttributes=" + dyanamicFieldConfigAttributes + ", configBodyData=" + configBodyData
-				+ ", policyID=" + policyID + ", ruleID=" + ruleID + ", configType=" + configType + ", editPolicy=" + ", version=" + ", domain=" + domain  
-				+ ", configPolicyType=" + configPolicyType + ", jsonBody=" + jsonBody + ", highestVersion=" + highestVersion + ", location=" + location 
-				+ ",dynamicRuleAlgorithmLabels=" + dynamicRuleAlgorithmLabels + ",dynamicRuleAlgorithmCombo=" + dynamicRuleAlgorithmCombo 
-				+ ",dynamicRuleAlgorithmField1=" + dynamicRuleAlgorithmField1 + ",dynamicRuleAlgorithmField2=" + dynamicRuleAlgorithmField2 
-				+ ",actionPerformer=" + actionPerformer + ",actionAttribute=" + actionAttribute + ",actionBody=" + actionBody + ",dropDownMap=" + dropDownMap
-				+ ",actionDictHeader=" + actionDictHeader + ",actionDictType=" + actionDictType + ",actionDictUrl=" + actionDictUrl 
-				+ ",actionDictMethod=" + actionDictMethod + ",dynamicSettingsMap=" + dynamicSettingsMap + ",dynamicVariableList=" + dynamicVariableList + ",providerComboBox=" + providerComboBox
-				+ ",dataTypeList=" + dataTypeList + ",draft=" + ",oldPolicyFileName=" + oldPolicyFileName + ",serviceType=" + serviceType
-				+ ",uuid=" + uuid + ",msLocation=" + msLocation + ",priority=" + priority + ",deleteCondition=" + deleteCondition + ",dictionaryType=" + dictionaryType 
-				+ ",dictionary=" + dictionary + ",dictionaryFields=" + dictionaryFields + ",uuid=" + uuid + ",msLocation=" + msLocation + ",priority=" 
-				+ priority + ",deleteCondition=" + deleteCondition + ",riskType="+riskType + ",riskLevel="+riskLevel + ",guard="+ guard + ",ttlDate="+ ttlDate 
-				+ ",treatments=" + treatments + "]";
-	}
-	
-	// Methods needed for JSON Deserialization
-	public void setPolicyName(String policyName) {
-		this.policyName = policyName;
-	}
-
-	public void setPolicyDescription(String policyDescription) {
-		this.policyDescription = policyDescription;
-	}
-
-	public void setOnapName(String onapName) {
-		this.onapName = onapName;
-	}
-
-	public void setConfigName(String configName) {
-		this.configName = configName;
-	}
-
-	public void setDyanamicFieldConfigAttributes(
-			Map<String, String> dyanamicFieldConfigAttributes) {
-		this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-	}
-
-	public void setConfigBodyData(String configBodyData) {
-		this.configBodyData = configBodyData;
-	}
-
-	public void setPolicyID(String policyID) {
-		this.policyID = policyID;
-	}
-
-	public void setRuleID(String ruleID) {
-		this.ruleID = ruleID;
-	}
-
-	public void setConfigType(String configType) {
-		this.configType = configType;
-	}
-
-	public void setEditPolicy(Boolean editPolicy) {
-		this.editPolicy = editPolicy;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public void setDomainDir(String domain) {
-		this.domain = domain;
-	}
-
-	public void setConfigPolicyType(String configPolicyType) {
-		this.configPolicyType = configPolicyType;
-	}
-
-	public void setJsonBody(String jsonBody) {
-		this.jsonBody = jsonBody;
-	}
-
-	public void setHighestVersion(Integer highestVersion) {
-		this.highestVersion = highestVersion;
-	}
-
-	public void setLocation (URI location) {
-		this.location = location;
-	}
-
-	public void setDynamicRuleAlgorithmLabels(
-			List<String> dynamicRuleAlgorithmLabels) {
-		this.dynamicRuleAlgorithmLabels = dynamicRuleAlgorithmLabels;
-	}
-
-	public void setDynamicRuleAlgorithmCombo(List<String> dynamicRuleAlgorithmCombo) {
-		this.dynamicRuleAlgorithmCombo = dynamicRuleAlgorithmCombo;
-	}
-
-	public void setDynamicRuleAlgorithmField1(
-			List<String> dynamicRuleAlgorithmField1) {
-		this.dynamicRuleAlgorithmField1 = dynamicRuleAlgorithmField1;
-	}
-
-	public void setDynamicRuleAlgorithmField2(
-			List<String> dynamicRuleAlgorithmField2) {
-		this.dynamicRuleAlgorithmField2 = dynamicRuleAlgorithmField2;
-	}
-
-	public void setActionPerformer(String actionPerformer) {
-		this.actionPerformer = actionPerformer;
-	}
-
-	public void setActionAttribute(String actionAttribute) {
-		this.actionAttribute = actionAttribute;
-	}
-
-	public void setActionBody(String actionBody) {
-		this.actionBody = actionBody;
-	}
-
-	public void setDropDownMap(Map<String, String> dropDownMap) {
-		this.dropDownMap = dropDownMap;
-	}
-
-	public void setActionDictHeader(String actionDictHeader) {
-		this.actionDictHeader = actionDictHeader;
-	}
+public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
+    private static final long serialVersionUID = 5260230629397322000L;
+
+    private String policyName = null;
+    private String oldPolicyFileName = null;
+    private String policyDescription = null;
+    private String onapName = null;
+    private String configName = null;
+    private Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
+    private Map<String, String> treatments = new HashMap<>();
+    private Map<String, String> dropDownMap = new HashMap<>();
+    private Map<String, String> dynamicSettingsMap = new HashMap<>();
+    private List<String> dynamicRuleAlgorithmLabels;
+    private List<String> dynamicRuleAlgorithmCombo;
+    private List<String> dynamicRuleAlgorithmField1;
+    private List<String> dynamicRuleAlgorithmField2;
+    private transient List<Object> dynamicVariableList;
+    private List<String> dataTypeList;
+    private String configBodyData = null;
+    private String policyID = null;
+    private String ruleID = null;
+    private String brmsController;
+    private List<String> brmsDependency;
+    private String configType = null;
+    private Boolean editPolicy = false;
+    private Boolean draft = false;
+    private String version = null;
+    private String domain = null;
+    private String configPolicyType = null;
+    private String jsonBody = null;
+    private String serviceType = null;
+    private Integer highestVersion = null;
+    private URI location = null;
+    private String actionPerformer = null;
+    private String actionAttribute = null;
+    private String actionBody = null;
+    private String actionDictHeader = null;
+    private String actionDictType = null;
+    private String actionDictUrl = null;
+    private String actionDictMethod = null;
+    private String uuid = null;
+    private String msLocation = null;
+    private String priority = null;
+    private transient Map<String, String> drlRuleAndUIParams = null;
+    private String deleteCondition = null;
+    private String dictionaryType = null;
+    private String dictionary = null;
+    private String dictionaryFields = null;
+    private String providerComboBox = null;
+    private String riskType = null;
+    private String guard = null;
+    private String riskLevel;
+    private String ttlDate = null;
+
+
+    public StdPAPPolicy() {
+        //
+        // Default empty constructor
+        //
+    }
+
+    //Constructor for sending location when pushing policies
+    public StdPAPPolicy(URI location) {
+        this.location = location;
+    }
+
+    //Constructor for Validating Config Policies
+    public StdPAPPolicy(String policyName, String body, String configType, String configPolicyType) {
+        this.policyName = policyName;
+        this.configBodyData = body;
+        this.configType = configType;
+        this.configPolicyType = configPolicyType;
+    }
+
+    //Constructor for Create Config Policies from API and Admin Console
+    //Constructor for Updating Config Policies from the API
+    //convenience constructor
+    public StdPAPPolicy(StdPAPPolicyParams stdPAPPolicyParams) {
+        this.configPolicyType=stdPAPPolicyParams.getConfigPolicyType();
+        this.policyName = stdPAPPolicyParams.getPolicyName();
+        this.policyDescription = stdPAPPolicyParams.getDescription();
+        this.onapName = stdPAPPolicyParams.getOnapName();
+        this.configName = stdPAPPolicyParams.getConfigName();
+        this.dyanamicFieldConfigAttributes = stdPAPPolicyParams.getAttributes();
+        this.configType = stdPAPPolicyParams.getConfigType();
+        this.configBodyData = stdPAPPolicyParams.getConfigBodyData();
+        this.editPolicy = stdPAPPolicyParams.getEditPolicy();
+        this.domain = stdPAPPolicyParams.getDomain();
+        this.highestVersion = stdPAPPolicyParams.getHighestVersion();
+        this.riskLevel = stdPAPPolicyParams.getRiskLevel();
+        this.riskType = stdPAPPolicyParams.getRiskType();
+        this.guard = stdPAPPolicyParams.getGuard();
+        this.ttlDate = stdPAPPolicyParams.getTtlDate();
+    }
+
+    //Constructor for Create/Update Action Policies from API
+    public StdPAPPolicy(String policyName, String description, Map<String, String> attributes,
+                        List<String> dynamicRuleAlgorithmLabels, List<String> dynamicRuleAlgorithmCombo,
+                        List<String> dynamicRuleAlgorithmField1, List<String> dynamicRuleAlgorithmField2,
+                        String actionPerformer, String actionAttribute, Boolean editPolicy,
+                        String domain, int highestVersion) {
+
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.dyanamicFieldConfigAttributes = attributes;
+        this.dynamicRuleAlgorithmLabels = dynamicRuleAlgorithmLabels;
+        this.dynamicRuleAlgorithmCombo = dynamicRuleAlgorithmCombo;
+        this.dynamicRuleAlgorithmField1 = dynamicRuleAlgorithmField1;
+        this.dynamicRuleAlgorithmField2 = dynamicRuleAlgorithmField2;
+        this.actionPerformer = actionPerformer;
+        this.actionAttribute = actionAttribute;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.highestVersion = highestVersion;
+
+    }
+
+    //Constructor for Create/Update Decision Policies
+    public StdPAPPolicy(String policyName, String description, String onapName, String providerComboBox,
+                        Map<String, String> attributes, Map<String, String> settings, Map<String, String> treatments,
+                        List<String> dynamicRuleAlgorithmLabels, List<String> dynamicRuleAlgorithmCombo,
+                        List<String> dynamicRuleAlgorithmField1,
+                        List<String> dynamicRuleAlgorithmField2, Map<String, String> dropDownMap,
+                        List<Object> dynamicVariableList,
+                        List<String> dataTypeList, Boolean editPolicy, String domain, int highestVersion) {
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.onapName = onapName;
+        this.setProviderComboBox(providerComboBox);
+        this.dyanamicFieldConfigAttributes = attributes;
+        this.dynamicSettingsMap = settings;
+        this.dynamicRuleAlgorithmLabels = dynamicRuleAlgorithmLabels;
+        this.dynamicRuleAlgorithmCombo = dynamicRuleAlgorithmCombo;
+        this.dynamicRuleAlgorithmField1 = dynamicRuleAlgorithmField1;
+        this.dynamicRuleAlgorithmField2 = dynamicRuleAlgorithmField2;
+        this.dynamicVariableList = dynamicVariableList;
+        this.dataTypeList = dataTypeList;
+        this.dropDownMap = dropDownMap;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.highestVersion = highestVersion;
+        this.treatments = treatments;
+    }
+
+    //convenience constructor
+    public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName,
+                        String configName, Map<String, String> attributes, String body, String policyID,
+                        String ruleID, String configType, Boolean editPolicy, String version, String domain,
+                        String riskLevel, String riskType, String guard, String ttlDate) {
+        this(configPolicyType, policyName, description, onapName, configName, attributes, body, policyID,
+                ruleID, configType, editPolicy, version, domain, 1, riskLevel, riskType, guard, ttlDate);
+    }
+
+    //Constructor for Updating Config Policies from Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName,
+                        String configName, Map<String, String> attributes, String body, String policyID,
+                        String ruleID, String configType, Boolean editPolicy, String version, String domain,
+                        int highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.onapName = onapName;
+        this.configName = configName;
+        this.dyanamicFieldConfigAttributes = attributes;
+        this.configBodyData = body;
+        this.policyID = policyID;
+        this.ruleID = ruleID;
+        this.configType = configType;
+        this.editPolicy = editPolicy;
+        this.version = version;
+        this.domain = domain;
+        this.highestVersion = highestVersion;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+
+    //Constructor for Creating Config Firewall Policies
+    public StdPAPPolicy(String configPolicyType, String policyName, String description, String configName,
+                        Boolean editPolicy, String domain, String jsonBody, Integer highestVersion, String riskLevel,
+                        String riskType, String guard, String ttlDate) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.jsonBody = jsonBody;
+        this.highestVersion = highestVersion;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+
+    }
+
+    //Constructor for Creating Goc Policies
+    public StdPAPPolicy(String configPolicyType, String policyName, String description, String configName,
+                        Boolean editPolicy, String domain, String jsonBody, Integer highestVersion, String eCompName,
+                        String riskLevel, String riskType, String guard, String ttlDate) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.jsonBody = jsonBody;
+        this.highestVersion = highestVersion;
+        this.onapName = eCompName;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+    //Constructor for Creating BRMS Policies from the Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description,
+                        String configName, Boolean editPolicy, String domain,
+                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
+                        String configBodyData, String riskLevel, String riskType, String guard, String ttlDate,
+                        String brmsController, List<String> brmsDependency) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
+        this.highestVersion = highestVersion;
+        this.onapName = eCompName;
+        this.configBodyData = configBodyData;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+        this.brmsController = brmsController;
+        this.brmsDependency = brmsDependency;
+    }
+
+    //Constructor for Creating BRMS Param Policies from the Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description,
+                        String configName, Boolean editPolicy, String domain,
+                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
+                        String configBodyData, Map<String, String> drlRuleAndUIParams, String riskLevel,
+                        String riskType, String guard, String ttlDate, String brmsController,
+                        List<String> brmsDependency) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
+        this.highestVersion = highestVersion;
+        this.onapName = eCompName;
+        this.configBodyData = configBodyData;
+        this.drlRuleAndUIParams = drlRuleAndUIParams;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+        this.brmsController = brmsController;
+        this.brmsDependency = brmsDependency;
+    }
+
+    //Constructor for Creating CloseLoop_Fault and Performance Metric Policies
+    public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName,
+                        String jsonBody, Boolean draft, String oldPolicyFileName, String serviceType,
+                        Boolean editPolicy,
+                        String domain, Integer highestVersion, String riskLevel, String riskType, String guard,
+                        String ttlDate) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.onapName = onapName;
+        this.jsonBody = jsonBody;
+        this.draft = draft;
+        this.oldPolicyFileName = oldPolicyFileName;
+        this.serviceType = serviceType;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.highestVersion = highestVersion;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+    //Constructor for Updating Config Firewall Policies from the Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description, String configName,
+                        Boolean editPolicy, String domain, String policyID,
+                        String ruleID, String version, String jsonBody, Integer highestVersion, String riskLevel,
+                        String riskType, String guard, String ttlDate) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.policyID = policyID;
+        this.ruleID = ruleID;
+        this.version = version;
+        this.jsonBody = jsonBody;
+        this.highestVersion = highestVersion;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+    //Constructor for Micro Service Creating/Updating Policies from the Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName,
+                        String configName, String serviceType, String uuid,
+                        String msLocation, String jsonBody, String priority, String version, Boolean editPolicy,
+                        String domain, int highestVersion, String riskLevel,
+                        String riskType, String guard, String ttlDate) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.onapName = onapName;
+        this.configName = configName;
+        this.serviceType = serviceType;
+        this.uuid = uuid;
+        this.msLocation = msLocation;
+        this.priority = priority;
+        this.version = version;
+        this.jsonBody = jsonBody;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.highestVersion = highestVersion;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+    //Constructor for Updating Goc Policies from the Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description,
+                        String configName, Boolean editPolicy, String domain,
+                        String policyID, String ruleID, String version,
+                        String jsonBody, Integer highestVersion, String eCompName, String riskLevel, String riskType,
+                        String guard, String ttlDate) {
+
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.policyID = policyID;
+        this.ruleID = ruleID;
+        this.version = version;
+        this.jsonBody = jsonBody;
+        this.highestVersion = highestVersion;
+        this.onapName = eCompName;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+    //Constructor for Updating Brms Policies from the Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description,
+                        String configName, Boolean editPolicy, String domain,
+                        String policyID, String ruleID, String version,
+                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
+                        String configBodyData, String riskLevel, String riskType, String guard, String ttlDate
+    ) {
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.policyID = policyID;
+        this.ruleID = ruleID;
+        this.version = version;
+        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
+        this.highestVersion = highestVersion;
+        this.onapName = eCompName;
+        this.configBodyData = configBodyData;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+    //Constructor for Updating Brms Param Policies from the Admin Console
+    public StdPAPPolicy(String configPolicyType, String policyName, String description,
+                        String configName, Boolean editPolicy, String domain,
+                        String policyID, String ruleID, String version,
+                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
+                        Map<String, String> drlRuleAndUIParams, String riskLevel, String riskType, String guard,
+                        String ttlDate
+    ) {
+        this.configPolicyType = configPolicyType;
+        this.policyName = policyName;
+        this.policyDescription = description;
+        this.configName = configName;
+        this.editPolicy = editPolicy;
+        this.domain = domain;
+        this.policyID = policyID;
+        this.ruleID = ruleID;
+        this.version = version;
+        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
+        this.highestVersion = highestVersion;
+        this.onapName = eCompName;
+        this.drlRuleAndUIParams = drlRuleAndUIParams;
+        this.riskLevel = riskLevel;
+        this.riskType = riskType;
+        this.guard = guard;
+        this.ttlDate = ttlDate;
+    }
+
+    // Constructor for deleting policies from the API
+    public StdPAPPolicy(String policyName, String deleteCondition) {
+        this.policyName = policyName;
+        this.deleteCondition = deleteCondition;
+    }
+
+    // Constructor for creating dictionary items from the API>
+    public StdPAPPolicy(String dictionaryType, String dictionary, String dictionaryFields) {
+        this.dictionaryType = dictionaryType;
+        this.dictionary = dictionary;
+        this.dictionaryFields = dictionaryFields;
+    }
+
+    @Override
+    public String getPolicyName() {
+        return policyName;
+    }
+
+    @Override
+    public String getPolicyDescription() {
+        return policyDescription;
+    }
+
+    @Override
+    public String getOnapName() {
+        return onapName;
+    }
+
+    @Override
+    public String getConfigName() {
+        return configName;
+    }
+
+    @Override
+    public Map<String, String> getDynamicFieldConfigAttributes() {
+        return dyanamicFieldConfigAttributes;
+    }
+
+    @Override
+    public String getConfigBodyData() {
+        return configBodyData;
+    }
+
+    @Override
+    public String getPolicyID() {
+        return policyID;
+    }
+
+    @Override
+    public String getRuleID() {
+        return ruleID;
+    }
+
+    @Override
+    public String getConfigType() {
+        return configType;
+    }
+
+    @Override
+    public Boolean isEditPolicy() {
+        return editPolicy;
+    }
+
+    @Override
+    public Boolean isDraft() {
+        return draft;
+    }
+
+    @Override
+    public String getVersion() {
+        return version;
+    }
+
+    @Override
+    public String getDomainDir() {
+        return domain;
+    }
+
+    @Override
+    public String getConfigPolicyType() {
+        return configPolicyType;
+    }
+
+    @Override
+    public String getJsonBody() {
+        return jsonBody;
+    }
+
+    @Override
+    public Integer getHighestVersion() {
+        return highestVersion;
+    }
+
+    @Override
+    public URI getLocation() {
+        return location;
+    }
+
+    @Override
+    public List<String> getDynamicRuleAlgorithmLabels() {
+        return dynamicRuleAlgorithmLabels;
+    }
+
+    @Override
+    public List<String> getDynamicRuleAlgorithmCombo() {
+        return dynamicRuleAlgorithmCombo;
+    }
+
+    @Override
+    public List<String> getDynamicRuleAlgorithmField1() {
+        return dynamicRuleAlgorithmField1;
+    }
+
+    @Override
+    public List<String> getDynamicRuleAlgorithmField2() {
+        return dynamicRuleAlgorithmField2;
+    }
+
+    @Override
+    public String getActionPerformer() {
+        return actionPerformer;
+    }
+
+    @Override
+    public String getActionAttribute() {
+        return actionAttribute;
+    }
+
+    @Override
+    public String getActionBody() {
+        return actionBody;
+    }
+
+    @Override
+    public Map<String, String> getDropDownMap() {
+        return dropDownMap;
+    }
+
+    @Override
+    public String getActionDictHeader() {
+        return actionDictHeader;
+    }
+
+    @Override
+    public String getActionDictType() {
+        return actionDictType;
+    }
+
+    @Override
+    public String getActionDictUrl() {
+        return actionDictUrl;
+    }
+
+    @Override
+    public String getActionDictMethod() {
+        return actionDictMethod;
+    }
+
+    @Override
+    public Map<String, String> getDynamicSettingsMap() {
+        return dynamicSettingsMap;
+    }
+
+    @Override
+    public List<Object> getDynamicVariableList() {
+        return dynamicVariableList;
+    }
+
+    @Override
+    public List<String> getDataTypeList() {
+        return dataTypeList;
+    }
+
+    @Override
+    public String getOldPolicyFileName() {
+        return oldPolicyFileName;
+    }
+
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public String getMsLocation() {
+        return msLocation;
+    }
+
+    @Override
+    public String getPriority() {
+        return priority;
+    }
+
+    @Override
+    public String getDeleteCondition() {
+        return deleteCondition;
+    }
+
+    @Override
+    public String getDictionaryType() {
+        return dictionaryType;
+    }
+
+    @Override
+    public String getDictionary() {
+        return dictionary;
+    }
+
+    @Override
+    public String getTTLDate() {
+        return ttlDate;
+    }
+
+    @Override
+    public String getDictionaryFields() {
+        return dictionaryFields;
+    }
+
+    @Override
+    public String getRiskType() {
+        return riskType;
+    }
+
+    @Override
+    public String getRiskLevel() {
+        return riskLevel;
+    }
+
+    @Override
+    public String getGuard() {
+        return guard;
+    }
+
+    @Override
+    public Map<String, String> getTreatments() {
+        return treatments;
+    }
+
+    @Override
+    public String toString() {
+        return "StdPAPPolicy [policyName=" + policyName + ", policyDescription=" + policyDescription + ", onapName="
+                + onapName + ", configName=" + configName + ", dyanamicFieldConfigAttributes=" +
+                dyanamicFieldConfigAttributes + ", configBodyData=" + configBodyData
+                + ", policyID=" + policyID + ", ruleID=" + ruleID + ", configType=" + configType + ", editPolicy=" +
+                ", version=" + ", domain=" + domain
+                + ", configPolicyType=" + configPolicyType + ", jsonBody=" + jsonBody + ", highestVersion=" +
+                highestVersion + ", location=" + location
+                + ",dynamicRuleAlgorithmLabels=" + dynamicRuleAlgorithmLabels + ",dynamicRuleAlgorithmCombo=" +
+                dynamicRuleAlgorithmCombo
+                + ",dynamicRuleAlgorithmField1=" + dynamicRuleAlgorithmField1 + ",dynamicRuleAlgorithmField2=" +
+                dynamicRuleAlgorithmField2
+                + ",actionPerformer=" + actionPerformer + ",actionAttribute=" + actionAttribute + ",actionBody=" +
+                actionBody + ",dropDownMap=" + dropDownMap
+                + ",actionDictHeader=" + actionDictHeader + ",actionDictType=" + actionDictType + ",actionDictUrl=" +
+                actionDictUrl
+                + ",actionDictMethod=" + actionDictMethod + ",dynamicSettingsMap=" + dynamicSettingsMap + "," +
+                "dynamicVariableList=" + dynamicVariableList + ",providerComboBox=" + providerComboBox
+                + ",dataTypeList=" + dataTypeList + ",draft=" + ",oldPolicyFileName=" + oldPolicyFileName + "," +
+                "serviceType=" + serviceType
+                + ",uuid=" + uuid + ",msLocation=" + msLocation + ",priority=" + priority + ",deleteCondition=" +
+                deleteCondition + ",dictionaryType=" + dictionaryType
+                + ",dictionary=" + dictionary + ",dictionaryFields=" + dictionaryFields + ",uuid=" + uuid + "," +
+                "msLocation=" + msLocation + ",priority="
+                + priority + ",deleteCondition=" + deleteCondition + ",riskType=" + riskType + ",riskLevel=" +
+                riskLevel + ",guard=" + guard + ",ttlDate=" + ttlDate
+                + ",treatments=" + treatments + "]";
+    }
+
+    // Methods needed for JSON Deserialization
+    public void setPolicyName(String policyName) {
+        this.policyName = policyName;
+    }
+
+    public void setPolicyDescription(String policyDescription) {
+        this.policyDescription = policyDescription;
+    }
+
+    public void setOnapName(String onapName) {
+        this.onapName = onapName;
+    }
+
+    public void setConfigName(String configName) {
+        this.configName = configName;
+    }
+
+    public void setDyanamicFieldConfigAttributes(
+            Map<String, String> dyanamicFieldConfigAttributes) {
+        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
+    }
+
+    public void setConfigBodyData(String configBodyData) {
+        this.configBodyData = configBodyData;
+    }
+
+    public void setPolicyID(String policyID) {
+        this.policyID = policyID;
+    }
+
+    public void setRuleID(String ruleID) {
+        this.ruleID = ruleID;
+    }
+
+    public void setConfigType(String configType) {
+        this.configType = configType;
+    }
+
+    public void setEditPolicy(Boolean editPolicy) {
+        this.editPolicy = editPolicy;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public void setDomainDir(String domain) {
+        this.domain = domain;
+    }
+
+    public void setConfigPolicyType(String configPolicyType) {
+        this.configPolicyType = configPolicyType;
+    }
+
+    public void setJsonBody(String jsonBody) {
+        this.jsonBody = jsonBody;
+    }
+
+    public void setHighestVersion(Integer highestVersion) {
+        this.highestVersion = highestVersion;
+    }
+
+    public void setLocation(URI location) {
+        this.location = location;
+    }
+
+    public void setDynamicRuleAlgorithmLabels(
+            List<String> dynamicRuleAlgorithmLabels) {
+        this.dynamicRuleAlgorithmLabels = dynamicRuleAlgorithmLabels;
+    }
+
+    public void setDynamicRuleAlgorithmCombo(List<String> dynamicRuleAlgorithmCombo) {
+        this.dynamicRuleAlgorithmCombo = dynamicRuleAlgorithmCombo;
+    }
+
+    public void setDynamicRuleAlgorithmField1(
+            List<String> dynamicRuleAlgorithmField1) {
+        this.dynamicRuleAlgorithmField1 = dynamicRuleAlgorithmField1;
+    }
+
+    public void setDynamicRuleAlgorithmField2(
+            List<String> dynamicRuleAlgorithmField2) {
+        this.dynamicRuleAlgorithmField2 = dynamicRuleAlgorithmField2;
+    }
+
+    public void setActionPerformer(String actionPerformer) {
+        this.actionPerformer = actionPerformer;
+    }
+
+    public void setActionAttribute(String actionAttribute) {
+        this.actionAttribute = actionAttribute;
+    }
+
+    public void setActionBody(String actionBody) {
+        this.actionBody = actionBody;
+    }
+
+    public void setDropDownMap(Map<String, String> dropDownMap) {
+        this.dropDownMap = dropDownMap;
+    }
+
+    public void setActionDictHeader(String actionDictHeader) {
+        this.actionDictHeader = actionDictHeader;
+    }
+
+    public void setActionDictType(String actionDictType) {
+        this.actionDictType = actionDictType;
+    }
+
+    public void setActionDictUrl(String actionDictUrl) {
+        this.actionDictUrl = actionDictUrl;
+    }
+
+    public void setActionDictMethod(String actionDictMethod) {
+        this.actionDictMethod = actionDictMethod;
+    }
+
+    public void setDynamicSettingsMap(Map<String, String> dynamicSettingsMap) {
+        this.dynamicSettingsMap = dynamicSettingsMap;
+    }
+
+    public void setDynamicVariableList(List<Object> dynamicVariableList) {
+        this.dynamicVariableList = dynamicVariableList;
+    }
+
+    public void setDataTypeList(List<String> dataTypeList) {
+        this.dataTypeList = dataTypeList;
+    }
+
+    public void setDraft(Boolean draft) {
+        this.draft = draft;
+    }
+
+    public void setOldPolicyFileName(String oldPolicyFileName) {
+        this.oldPolicyFileName = oldPolicyFileName;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public Map<String, String> getDrlRuleAndUIParams() {
+        return drlRuleAndUIParams;
+    }
+
+    public void setDrlRuleAndUIParams(Map<String, String> drlRuleAndUIParams) {
+        this.drlRuleAndUIParams = drlRuleAndUIParams;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public void setMsLocation(String msLocation) {
+        this.msLocation = msLocation;
+    }
+
+    public void setPriority(String priority) {
+        this.priority = priority;
+    }
+
+    public void setDeleteCondition(String deleteCondition) {
+        this.deleteCondition = deleteCondition;
+    }
+
+    public void setDictionaryType(String dictionaryType) {
+        this.dictionaryType = dictionaryType;
+    }
+
+    public void setDictionary(String dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    public void setDictionaryFields(String dictionaryFields) {
+        this.dictionaryFields = dictionaryFields;
+    }
+
+    public String getProviderComboBox() {
+        return providerComboBox;
+    }
+
+    public void setProviderComboBox(String providerComboBox) {
+        this.providerComboBox = providerComboBox;
+    }
+
+    public void setRiskType(String riskType) {
+        this.riskType = riskType;
+    }
+
+    public void setRiskLevel(String riskLevel) {
+        this.riskLevel = riskLevel;
+    }
+
+    public void setGuard(String guard) {
+        this.guard = guard;
+    }
+
+    public void setTTLDate(String ttlDate) {
+        this.ttlDate = ttlDate;
+    }
+
+    public String getBrmsController() {
+        return brmsController;
+    }
+
+    public void setBrmsController(String brmsController) {
+        this.brmsController = brmsController;
+    }
 
-	public void setActionDictType(String actionDictType) {
-		this.actionDictType = actionDictType;
-	}
+    public List<String> getBrmsDependency() {
+        return brmsDependency;
+    }
 
-	public void setActionDictUrl(String actionDictUrl) {
-		this.actionDictUrl = actionDictUrl;
-	}
+    public void setBrmsDependency(List<String> brmsDependency) {
+        this.brmsDependency = brmsDependency;
+    }
 
-	public void setActionDictMethod(String actionDictMethod) {
-		this.actionDictMethod = actionDictMethod;
-	}
-
-	public void setDynamicSettingsMap(Map<String, String> dynamicSettingsMap) {
-		this.dynamicSettingsMap = dynamicSettingsMap;
-	}
-
-	public void setDynamicVariableList(List<Object> dynamicVariableList) {
-		this.dynamicVariableList = dynamicVariableList;
-	}
-
-	public void setDataTypeList(List<String> dataTypeList) {
-		this.dataTypeList = dataTypeList;
-	}
-
-	public void setDraft(Boolean draft) {
-		this.draft = draft;
-	}
-
-	public void setOldPolicyFileName(String oldPolicyFileName) {
-		this.oldPolicyFileName = oldPolicyFileName;
-	}
-
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-
-	public Map<String, String> getDrlRuleAndUIParams() {
-		return drlRuleAndUIParams;
-	}
-
-	public void setDrlRuleAndUIParams(Map<String, String> drlRuleAndUIParams) {
-		this.drlRuleAndUIParams = drlRuleAndUIParams;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	public void setMsLocation(String msLocation) {
-		this.msLocation = msLocation;
-	}
-
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-
-	public void setDeleteCondition(String deleteCondition) {
-		this.deleteCondition = deleteCondition;
-	}
-
-	public void setDictionaryType(String dictionaryType) {
-		this.dictionaryType = dictionaryType;
-	}
-
-	public void setDictionary(String dictionary) {
-		this.dictionary = dictionary;
-	}
-
-	public void setDictionaryFields(String dictionaryFields) {
-		this.dictionaryFields = dictionaryFields;
-	}
-
-	public String getProviderComboBox() {
-		return providerComboBox;
-	}
-
-	public void setProviderComboBox(String providerComboBox) {
-		this.providerComboBox = providerComboBox;
-	}
-
-	public void setRiskType(String riskType){
-		this.riskType = riskType;
-	}
-
-	public void setRiskLevel(String riskLevel){
-		this.riskLevel = riskLevel;
-	}
-
-	public void setGuard(String guard){
-		this.guard = guard;
-	}
-
-	public void setTTLDate(String ttlDate){
-		this.ttlDate = ttlDate;
-	}
-
-	public String getBrmsController() {
-		return brmsController;
-	}
-
-	public void setBrmsController(String brmsController) {
-		this.brmsController = brmsController;
-	}
-
-	public List<String> getBrmsDependency() {
-		return brmsDependency;
-	}
-
-	public void setBrmsDependency(List<String> brmsDependency) {
-		this.brmsDependency = brmsDependency;
-	}
-	
-	public void setTreatments(Map<String, String> treatments) {
-		this.treatments = treatments;
-	}
+    public void setTreatments(Map<String, String> treatments) {
+        this.treatments = treatments;
+    }
 }
diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicyParams.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicyParams.java
new file mode 100644
index 000000000..a9daa9e97
--- /dev/null
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicyParams.java
@@ -0,0 +1,193 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-XACML
+ * ================================================================================
+ * Copyright (C) 2018 Samsung Electronics Co., Ltd. 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.xacml.std.pap;
+
+import java.util.Map;
+
+public class StdPAPPolicyParams {
+    private String configPolicyType;
+    private String policyName;
+    private String description;
+    private String onapName;
+    private String configName;
+    private Map<String, String> attributes;
+    private String configType;
+    private String configBodyData;
+    private Boolean editPolicy;
+    private String domain;
+    private String riskLevel;
+    private String riskType;
+    private String guard;
+    private String ttlDate;
+    private int highestVersion;
+
+    private StdPAPPolicyParams() {
+        super();
+    }
+
+    public int getHighestVersion() {
+        return highestVersion;
+    }
+
+    public static StdPAPPolicyParamsBuilder builder() {
+        return new StdPAPPolicyParamsBuilder();
+    }
+
+    public String getConfigPolicyType() {
+        return configPolicyType;
+    }
+
+    public String getPolicyName() {
+        return policyName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getOnapName() {
+        return onapName;
+    }
+
+    public String getConfigName() {
+        return configName;
+    }
+
+    public Map<String, String> getAttributes() {
+        return attributes;
+    }
+
+    public String getConfigType() {
+        return configType;
+    }
+
+    public String getConfigBodyData() {
+        return configBodyData;
+    }
+
+    public Boolean getEditPolicy() {
+        return editPolicy;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public String getRiskLevel() {
+        return riskLevel;
+    }
+
+    public String getRiskType() {
+        return riskType;
+    }
+
+    public String getGuard() {
+        return guard;
+    }
+
+    public String getTtlDate() {
+        return ttlDate;
+    }
+
+    public static class StdPAPPolicyParamsBuilder {
+        StdPAPPolicyParams m = new StdPAPPolicyParams();
+
+        public StdPAPPolicyParams build() {
+            return m;
+        }
+
+        public StdPAPPolicyParamsBuilder configPolicyType(String configPolicyType) {
+            m.configPolicyType = configPolicyType;
+            return this;
+        }
+
+
+        public StdPAPPolicyParamsBuilder policyName(String policyName) {
+            m.policyName = policyName;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder description(String description) {
+            m.description = description;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder onapName(String onapName) {
+            m.onapName = onapName;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder configName(String configName) {
+            m.configName = configName;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder attributes(Map<String, String> attributes) {
+            m.attributes = attributes;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder configType(String configType) {
+            m.configType = configType;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder configBodyData(String body) {
+            m.configBodyData = body;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder editPolicy(boolean editPolicy) {
+            m.editPolicy = editPolicy;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder domain(String domain) {
+            m.domain = domain;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder riskLevel(String riskLevel) {
+            m.riskLevel = riskLevel;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder riskType(String riskType) {
+            m.riskType = riskType;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder guard(String guard) {
+            m.guard = guard;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder ttlDate(String ttlDate) {
+            m.ttlDate = ttlDate;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder highestVersion(int highVer) {
+            m.highestVersion = highVer;
+            return this;
+        }
+    }
+}
diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java
index 42fa87288..aa57c27f0 100644
--- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,6 +21,7 @@ package org.onap.policy.xacml.test.std.pap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
@@ -29,11 +30,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.xacml.std.pap.StdPAPPolicyParams;
 
 public class StdPAPPolicyTest {
 
@@ -569,13 +572,30 @@ public class StdPAPPolicyTest {
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
     }
 
-    
+
     @Test
-    public void testConstructorStringStringStringStringStringMapStringStringStringStringBooleanStringStringStringStringString() throws URISyntaxException {
+    public void testConstructorStringStringStringStringStringMapStringStringStringStringBooleanStringStringStringStringString()
+            throws URISyntaxException {
         Map<String, String> attributes = new HashMap<>();
         attributes.put("aKey", "aValue");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName", "configName", attributes, 
-                "configType", "body", true, "domain", "riskLevel", "riskType", "guard", "ttlDate");
+
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(
+                StdPAPPolicyParams.builder()
+                        .configPolicyType("configTypePolicy")
+                        .policyName("policyName")
+                        .description("description")
+                        .onapName("onapName")
+                        .configName("configName")
+                        .attributes(attributes)
+                        .configType("configType")
+                        .configBodyData("body")
+                        .editPolicy(true)
+                        .domain("domain")
+                        .highestVersion(1)
+                        .riskLevel("riskLevel")
+                        .riskType("riskType")
+                        .guard("guard")
+                        .ttlDate("ttlDate").build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -591,9 +611,9 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringMapStringStringListStringListStringListStringListStringStringStringBooleanStringint(){
+    public void testConstructorStringStringMapStringStringListStringListStringListStringListStringStringStringBooleanStringint() {
         Map<String, String> attributes = new HashMap<>();
         attributes.put("aKey", "aValue");
         List<String> dynamicRuleAlgorithmLabels = new ArrayList<>();
@@ -604,7 +624,9 @@ public class StdPAPPolicyTest {
         dynamicRuleAlgorithmField1.add("dynamicRuleAlgorithmField1");
         List<String> dynamicRuleAlgorithmField2 = new ArrayList<>();
         dynamicRuleAlgorithmField2.add("dynamicRuleAlgorithmField2");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("policyName", "description", attributes, dynamicRuleAlgorithmLabels, dynamicRuleAlgorithmCombo, dynamicRuleAlgorithmField1, dynamicRuleAlgorithmField2,
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("policyName", "description", attributes,
+                dynamicRuleAlgorithmLabels, dynamicRuleAlgorithmCombo, dynamicRuleAlgorithmField1,
+                dynamicRuleAlgorithmField2,
                 "actionPerformer", "actionAttribute", true, "domain", 1);
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -619,9 +641,9 @@ public class StdPAPPolicyTest {
         assertEquals("domain", stdPAPPolicy.getDomainDir());
         assertEquals(Integer.valueOf(1), stdPAPPolicy.getHighestVersion());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringMapStringStringMapStringStringMapStringStringListStringListStringListStringListStringMapStringStringListObjectListStringBooleanStringint(){
+    public void testConstructorStringStringStringStringMapStringStringMapStringStringMapStringStringListStringListStringListStringListStringMapStringStringListObjectListStringBooleanStringint() {
         Map<String, String> attributes = new HashMap<>();
         attributes.put("aKey1", "aValue1");
         Map<String, String> settings = new HashMap<>();
@@ -642,8 +664,10 @@ public class StdPAPPolicyTest {
         dynamicVariableList.add("dynamicVariableList");
         List<String> dataTypeList = new ArrayList<>();
         dataTypeList.add("dataTypeList");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("policyName", "description", "onapName", "providerComboBox", attributes, settings, treatments, dynamicRuleAlgorithmLabels, dynamicRuleAlgorithmCombo, 
-                dynamicRuleAlgorithmField1, dynamicRuleAlgorithmField2, dropDownMap, dynamicVariableList, dataTypeList, true, "domain", 1);
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("policyName", "description", "onapName", "providerComboBox",
+                attributes, settings, treatments, dynamicRuleAlgorithmLabels, dynamicRuleAlgorithmCombo,
+                dynamicRuleAlgorithmField1, dynamicRuleAlgorithmField2, dropDownMap, dynamicVariableList,
+                dataTypeList, true, "domain", 1);
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
         assertEquals("onapName", stdPAPPolicy.getOnapName());
@@ -662,13 +686,16 @@ public class StdPAPPolicyTest {
         assertEquals("domain", stdPAPPolicy.getDomainDir());
         assertEquals(Integer.valueOf(1), stdPAPPolicy.getHighestVersion());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringStringMapStringStringStringStringStringStringBooleanStringStringintStringStringStringString() throws URISyntaxException {
+    public void testConstructorStringStringStringStringStringMapStringStringStringStringStringStringBooleanStringStringintStringStringStringString()
+            throws URISyntaxException {
         Map<String, String> attributes = new HashMap<>();
         attributes.put("aKey", "aValue");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName", "configName", attributes, 
-                "body", "policyId", "ruleId", "configType", true, "version", "domain", 1, "riskLevel", "riskType", "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName",
+                "configName", attributes,
+                "body", "policyId", "ruleId", "configType", true, "version", "domain", 1, "riskLevel", "riskType",
+                "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -688,10 +715,12 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringString() throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, 
+    public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringString()
+            throws URISyntaxException {
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true,
                 "domain", "jasonBody", 1, "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
@@ -706,10 +735,12 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringStringString() throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, 
+    public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringStringString()
+            throws URISyntaxException {
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true,
                 "domain", "jasonBody", 1, "eCompName", "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
@@ -725,15 +756,18 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorMapStringStringIntegerStringStringStringStringStringStringStringArrayListString() throws URISyntaxException {
+    public void testConstructorMapStringStringIntegerStringStringStringStringStringStringStringArrayListString()
+            throws URISyntaxException {
         Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
         dyanamicFieldConfigAttributes.put("aKey", "aValue");
         ArrayList<String> brmsDependency = new ArrayList<>();
         brmsDependency.add("brmsDependency");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, 
-                "domain", dyanamicFieldConfigAttributes, 1, "eCompName", "configBodyData", "riskLevel", "riskType", "guard", "ttlDate", "brmsController", brmsDependency);
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true,
+                "domain", dyanamicFieldConfigAttributes, 1, "eCompName", "configBodyData", "riskLevel", "riskType",
+                "guard", "ttlDate", "brmsController", brmsDependency);
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -751,17 +785,20 @@ public class StdPAPPolicyTest {
         assertEquals("brmsController", stdPAPPolicy.getBrmsController());
         assertEquals(brmsDependency, stdPAPPolicy.getBrmsDependency());
     }
-    
+
     @Test
-    public void testConstructorMapStringStringIntegerStringStringMapStringStringStringStringStringStringStringArrayListString() throws URISyntaxException {
+    public void testConstructorMapStringStringIntegerStringStringMapStringStringStringStringStringStringStringArrayListString()
+            throws URISyntaxException {
         Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
         dyanamicFieldConfigAttributes.put("aKey", "aValue");
         Map<String, String> drlRuleAndUIParams = new HashMap<>();
         drlRuleAndUIParams.put("aDrlRuleKey", "aDrlRuleValue");
         ArrayList<String> brmsDependency = new ArrayList<>();
         brmsDependency.add("brmsDependency");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, 
-                "domain", dyanamicFieldConfigAttributes, 1, "eCompName", "configBodyData", drlRuleAndUIParams, "riskLevel", "riskType", "guard", "ttlDate", "brmsController", brmsDependency);
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true,
+                "domain", dyanamicFieldConfigAttributes, 1, "eCompName", "configBodyData", drlRuleAndUIParams,
+                "riskLevel", "riskType", "guard", "ttlDate", "brmsController", brmsDependency);
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -780,10 +817,12 @@ public class StdPAPPolicyTest {
         assertEquals("brmsController", stdPAPPolicy.getBrmsController());
         assertEquals(brmsDependency, stdPAPPolicy.getBrmsDependency());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringStringBooleanStringStringBooleanStringIntegerStringStringStringString() throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName", "jasonBody", true, 
+    public void testConstructorStringStringStringStringStringBooleanStringStringBooleanStringIntegerStringStringStringString()
+            throws URISyntaxException {
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName",
+                "jasonBody", true,
                 "oldPolicyFileName", "serviceType", true, "domain", 1, "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
@@ -801,10 +840,12 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringString() throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, "domain", "policyId", "ruleId", 
+    public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringString()
+            throws URISyntaxException {
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true, "domain", "policyId", "ruleId",
                 "version", "jasonBody", 1, "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
@@ -822,11 +863,13 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringStringStringStringStringStringStringStringBooleanStringintStringStringStringString() throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName", "configName", "serviceType", 
-                "uuid", "msLocation", "jasonBody", "priority" , "version", true, "domain", 
+    public void testConstructorStringStringStringStringStringStringStringStringStringStringStringBooleanStringintStringStringStringString()
+            throws URISyntaxException {
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName",
+                "configName", "serviceType",
+                "uuid", "msLocation", "jasonBody", "priority", "version", true, "domain",
                 1, "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
@@ -847,10 +890,12 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringStringString() throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, "domain", "policyId", "ruleId", "version", 
+    public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringStringString()
+            throws URISyntaxException {
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true, "domain", "policyId", "ruleId", "version",
                 "jasonBody", 1, "ecompName", "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
@@ -869,13 +914,16 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringStringStringStringString() throws URISyntaxException {
+    public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringStringStringStringString()
+            throws URISyntaxException {
         Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
         dyanamicFieldConfigAttributes.put("aKey", "aValue");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, 
-                "domain", "policyId", "ruleId", "version", dyanamicFieldConfigAttributes, 1, "eCompName", "configBodyData", "riskLevel", "riskType", "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true,
+                "domain", "policyId", "ruleId", "version", dyanamicFieldConfigAttributes, 1, "eCompName",
+                "configBodyData", "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -894,15 +942,18 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
-    public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringMapStringStringStringStringStringString() throws URISyntaxException {
+    public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringMapStringStringStringStringStringString()
+            throws URISyntaxException {
         Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
         dyanamicFieldConfigAttributes.put("aKey", "aValue");
         Map<String, String> drlRuleAndUIParams = new HashMap<>();
         drlRuleAndUIParams.put("aDrlRuleKey", "aDrlRuleValue");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName", true, 
-                "domain", "policyId", "ruleId", "version", dyanamicFieldConfigAttributes, 1, "eCompName", drlRuleAndUIParams, "riskLevel", "riskType", "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
+                true,
+                "domain", "policyId", "ruleId", "version", dyanamicFieldConfigAttributes, 1, "eCompName",
+                drlRuleAndUIParams, "riskLevel", "riskType", "guard", "ttlDate");
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -921,19 +972,19 @@ public class StdPAPPolicyTest {
         assertEquals("guard", stdPAPPolicy.getGuard());
         assertEquals("ttlDate", stdPAPPolicy.getTTLDate());
     }
-    
+
     @Test
     public void testConstructorStringString() {
         StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("policyName", "deleteCondition");
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("deleteCondition", stdPAPPolicy.getDeleteCondition());
     }
-    
+
     @Test
     public void testConstructorStringStringString() {
         StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("dictionaryType", "dictionary", "dictionaryFields");
         assertEquals("dictionaryType", stdPAPPolicy.getDictionaryType());
         assertEquals("dictionary", stdPAPPolicy.getDictionary());
         assertEquals("dictionaryFields", stdPAPPolicy.getDictionaryFields());
-    }   
+    }
 }