X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fadapter%2FPolicyRestAdapter.java;h=e815fe2b9ff76b67e61175d9ca597c058f50f554;hb=95524c8ef8be0d41de8bb2b918f320e464ebb897;hp=de424683d7ec51d7ef9f6acf511a02a942628a0e;hpb=fb3cc27605623672fb8971bd9030872f117c7af8;p=policy%2Fengine.git

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 de424683d..e815fe2b9 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 package org.onap.policy.rest.adapter;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -83,25 +82,27 @@ 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;
 	private String trapMaxAge;
 	private String verificationclearTimeOut;
 	private Map<String , String> dynamicLayoutMap;
+	private ClosedLoopFaultTrapDatas trapDatas;
+	private ClosedLoopFaultTrapDatas faultDatas;
 	
     //FireWall
     private String fwPolicyType;
-	private ArrayList<Object> fwattributes;
+	private List<Object> fwattributes;
 	private String parentForChild;
 	private String securityZone;
 	
@@ -126,6 +127,9 @@ public class PolicyRestAdapter {
 	private String actionDictUrl = null;
 	private String actionDictMethod = null;
 	private YAMLParams yamlparams; 
+	private List<String> blackListEntries;
+	private List<String> appendBlackListEntries;
+	private String blackListEntryType;
 	
 	//Rainy Day Decision
 	private RainyDayParams rainyday;
@@ -145,7 +149,7 @@ public class PolicyRestAdapter {
     private String ruleName;
 	private Map<String,String> brmsParamBody=null;
 	private String brmsController = null;
-    private ArrayList<String> brmsDependency = null;
+    private List<String> brmsDependency = null;
     private LinkedHashMap<?, ?>  ruleData;
 	private LinkedHashMap<?,?>   ruleListData;
 	private Map<String,String> drlRuleAndUIParams=null;
@@ -159,24 +163,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() {
@@ -599,10 +603,10 @@ public class PolicyRestAdapter {
     public void setBrmsController(String brmsController) {
         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;
     }
     public Map<String, String> getMatching() {
@@ -647,43 +651,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 +723,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() {
@@ -893,4 +897,35 @@ public class PolicyRestAdapter {
 	public void setPolicyJSON(Object policyJSON) {
 		this.policyJSON = policyJSON;
 	}
+	
+	public ClosedLoopFaultTrapDatas getTrapDatas() {
+		return trapDatas;
+	}
+	public void setTrapDatas(ClosedLoopFaultTrapDatas trapDatas) {
+		this.trapDatas = trapDatas;
+	}
+	public ClosedLoopFaultTrapDatas getFaultDatas() {
+		return faultDatas;
+	}
+	public void setFaultDatas(ClosedLoopFaultTrapDatas faultDatas) {
+		this.faultDatas = faultDatas;
+	}
+	public List<String> getAppendBlackListEntries() {
+		return appendBlackListEntries;
+	}
+	public void setAppendBlackListEntries(List<String> appendBlackListEntries) {
+		this.appendBlackListEntries = appendBlackListEntries;
+	}
+	public List<String> getBlackListEntries() {
+		return blackListEntries;
+	}
+	public void setBlackListEntries(List<String> blackListEntries) {
+		this.blackListEntries = blackListEntries;
+	}
+	public String getBlackListEntryType() {
+		return blackListEntryType;
+	}
+	public void setBlackListEntryType(String blackListEntryType) {
+		this.blackListEntryType = blackListEntryType;
+	}
 }