X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-XACML%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fxacml%2Fstd%2Fpap%2FStdPAPPolicy.java;h=c66d11b8c0c3fa440a2301c708347e25d562d0ce;hb=7d3735c062a378b4d5b05859e740c408fd2d0239;hp=d69f38d95ddf4cca22ddbbc5a66be6ec8e035084;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

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 d69f38d95..c66d11b8c 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
@@ -21,7 +21,6 @@ package org.onap.policy.xacml.std.pap;
 
 import java.io.Serializable;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,19 +35,20 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 	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 List<Object> dynamicVariableList;
+	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 ArrayList<String> brmsDependency;
+	private List<String> brmsDependency;
 	private String configType = null;
 	private Boolean editPolicy = false;
 	private Boolean draft = false;
@@ -82,7 +82,9 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 
 
 	public StdPAPPolicy() {
-
+		//
+		// Default empty constructor
+		//
 	}
 
 	//Constructor for sending location when pushing policies
@@ -125,8 +127,9 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 
 	}
 
-	//Constructor for Create/Update Decision Policies from Admin Console
-	public StdPAPPolicy(String policyName, String description, String onapName, String providerComboBox, Map<String, String> attributes, Map<String, String> settings, 
+	//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) {
@@ -147,10 +150,10 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 		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, 
@@ -247,7 +250,7 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 	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, ArrayList<String> brmsDependency) {
+			String configBodyData, String riskLevel, String riskType, String guard, String ttlDate, String brmsController, List<String> brmsDependency) {
 
 		this.configPolicyType = configPolicyType;
 		this.policyName = policyName;
@@ -271,7 +274,7 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 	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, ArrayList<String> brmsDependency) {
+			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;
@@ -674,6 +677,11 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 		return guard;
 	}
 
+	@Override
+	public Map<String, String> getTreatments() {
+		return treatments;
+	}
+	
 	@Override
 	public String toString() {
 		return "StdPAPPolicy [policyName=" + policyName + ", policyDescription=" + policyDescription + ", onapName="
@@ -688,9 +696,10 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 				+ ",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 + "]";
+				+ 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;
@@ -900,11 +909,15 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable{
 		this.brmsController = brmsController;
 	}
 
-	public ArrayList<String> getBrmsDependency() {
+	public List<String> getBrmsDependency() {
 		return brmsDependency;
 	}
 
-	public void setBrmsDependency(ArrayList<String> brmsDependency) {
+	public void setBrmsDependency(List<String> brmsDependency) {
 		this.brmsDependency = brmsDependency;
 	}
-}
\ No newline at end of file
+	
+	public void setTreatments(Map<String, String> treatments) {
+		this.treatments = treatments;
+	}
+}