X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fadapter%2FPolicyRestAdapter.java;h=b4056a3a0876a620be4fc576a88c59619111814e;hp=1eb4da8902751efebeac970e3b94d3748332905e;hb=401b48bc573561f097960a9ca7abe6d788456f28;hpb=9301fed7c290f52208922f780fdfe4b5a880b5aa

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
index 1eb4da890..b4056a3a0 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
@@ -83,15 +83,15 @@ public class PolicyRestAdapter {
 	private Object jsonBodyData;
 	private String dirPath;
 	private String configBodyPath;
-	private ArrayList<Object> attributes;
-	private ArrayList<Object> settings;
-	private ArrayList<Object> ruleAlgorithmschoices;
+	private List<Object> attributes;
+	private List<Object> settings;
+	private List<Object> ruleAlgorithmschoices;
 	
-	private LinkedHashMap<?, ?> serviceTypePolicyName;
+	private Map<?, ?> serviceTypePolicyName;
    
-	private LinkedHashMap<?, ?> verticaMetrics;
-    private LinkedHashMap<?, ?> description;
-    private LinkedHashMap<?, ?> attributeFields;
+	private Map<?, ?> verticaMetrics;
+    private Map<?, ?> description;
+    private Map<?, ?> attributeFields;
     
     //ClosedLoop
 	private String clearTimeOut;
@@ -101,7 +101,7 @@ public class PolicyRestAdapter {
 	
     //FireWall
     private String fwPolicyType;
-	private ArrayList<Object> fwattributes;
+	private List<Object> fwattributes;
 	private String parentForChild;
 	private String securityZone;
 	
@@ -159,24 +159,24 @@ public class PolicyRestAdapter {
 	private String ttlDate;
 	private Map<String,String> matching; 
 	
-	private ArrayList<Object> triggerSignatures;
-    private ArrayList<Object> symptomSignatures;
+	private List<Object> triggerSignatures;
+    private List<Object> symptomSignatures;
     private String logicalConnector;
     private String policyStatus;
     private String gocServerScope;
     private String supressionType;
     
     
-	public ArrayList<Object> getTriggerSignatures() {
+	public List<Object> getTriggerSignatures() {
 		return triggerSignatures;
 	}
-	public void setTriggerSignatures(ArrayList<Object> triggerSignatures) {
+	public void setTriggerSignatures(List<Object> triggerSignatures) {
 		this.triggerSignatures = triggerSignatures;
 	}
-	public ArrayList<Object> getSymptomSignatures() {
+	public List<Object> getSymptomSignatures() {
 		return symptomSignatures;
 	}
-	public void setSymptomSignatures(ArrayList<Object> symptomSignatures) {
+	public void setSymptomSignatures(List<Object> symptomSignatures) {
 		this.symptomSignatures = symptomSignatures;
 	}
 	public String getLogicalConnector() {
@@ -647,43 +647,43 @@ public class PolicyRestAdapter {
 	public void setConfigBodyPath(String configBodyPath) {
 		this.configBodyPath = configBodyPath;
 	}
-	public ArrayList<Object> getAttributes() {
+	public List<Object> getAttributes() {
 		return attributes;
 	}
-	public void setAttributes(ArrayList<Object> attributes) {
+	public void setAttributes(List<Object> attributes) {
 		this.attributes = attributes;
 	}
-	public ArrayList<Object> getSettings() {
+	public List<Object> getSettings() {
 		return settings;
 	}
-	public void setSettings(ArrayList<Object> settings) {
+	public void setSettings(List<Object> settings) {
 		this.settings = settings;
 	}
-	public ArrayList<Object> getRuleAlgorithmschoices() {
+	public List<Object> getRuleAlgorithmschoices() {
 		return ruleAlgorithmschoices;
 	}
-	public void setRuleAlgorithmschoices(ArrayList<Object> ruleAlgorithmschoices) {
+	public void setRuleAlgorithmschoices(List<Object> ruleAlgorithmschoices) {
 		this.ruleAlgorithmschoices = ruleAlgorithmschoices;
 	}
-	public LinkedHashMap<?, ?> getServiceTypePolicyName() {
+	public Map<?, ?> getServiceTypePolicyName() {
 		return serviceTypePolicyName;
 	}
-	public void setServiceTypePolicyName(LinkedHashMap<?, ?> serviceTypePolicyName) {
+	public void setServiceTypePolicyName(Map<?, ?> serviceTypePolicyName) {
 		this.serviceTypePolicyName = serviceTypePolicyName;
 	}
-	public LinkedHashMap<?, ?> getVerticaMetrics() {
+	public Map<?, ?> getVerticaMetrics() {
 		return verticaMetrics;
 	}
-	public void setVerticaMetrics(LinkedHashMap<?, ?> verticaMetrics) {
+	public void setVerticaMetrics(Map<?, ?> verticaMetrics) {
 		this.verticaMetrics = verticaMetrics;
 	}
-	public LinkedHashMap<?, ?> getDescription() {
+	public Map<?, ?> getDescription() {
 		return description;
 	}
 	public void setDescription(LinkedHashMap<?, ?> description) {
 		this.description = description;
 	}
-	public LinkedHashMap<?, ?> getAttributeFields() {
+	public Map<?, ?> getAttributeFields() {
 		return attributeFields;
 	}
 	public void setAttributeFields(LinkedHashMap<?, ?> attributeFields) {
@@ -719,10 +719,10 @@ public class PolicyRestAdapter {
 	public void setFwPolicyType(String fwPolicyType) {
 		this.fwPolicyType = fwPolicyType;
 	}
-	public ArrayList<Object> getFwattributes() {
+	public List<Object> getFwattributes() {
 		return fwattributes;
 	}
-	public void setFwattributes(ArrayList<Object> fwattributes) {
+	public void setFwattributes(List<Object> fwattributes) {
 		this.fwattributes = fwattributes;
 	}
 	public String getParentForChild() {