Commit includes ControlLoopPolicy API and bugfixes

[policy/engine.git] / ECOMP-REST / src / main / java / org / openecomp / policy / rest / adapter / TermCollector.java

diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TermCollector.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TermCollector.java
index 26853d3..ca7c0dc 100644 (file)
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TermCollector.java
+++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/adapter/TermCollector.java
@@ -29,19 +29,19 @@ import java.util.Set;
 
 
 public class TermCollector {
-       String serviceTypeId;
-       String configName;
-       DeployNowJson deploymentOption;
-       String securityZoneId;
-       
-    protected Set<Object> serviceGroups;
-    protected Set<Object> addressGroups;
-    protected List<Term> firewallRuleList;
-    
-    private String primaryParentZoneId;
-    
-    protected List<Tags> ruleToTag;
-       
+       private String serviceTypeId;
+       private String configName;
+       private DeployNowJson deploymentOption;
+       private String securityZoneId;
+       private String vendorServiceId;
+       private VendorSpecificData vendorSpecificData= new VendorSpecificData();
+
+       protected Set<Object> serviceGroups;
+       protected Set<Object> addressGroups;
+       protected List<Term> firewallRuleList;
+
+       protected List<Tags> ruleToTag;
+
        public List<Tags> getRuleToTag() {
                return ruleToTag;
        }
@@ -51,91 +51,95 @@ public class TermCollector {
        }
 
        //SecurityTypeId
-    public String getServiceTypeId() {
-        return serviceTypeId;
-    }
-    
-    public void setServiceTypeId(String serviceTypeId) {
-        this.serviceTypeId = serviceTypeId;
-    }
-    
-    //ConfigName
-    public String getConfigName() {
-        return configName;
-    }
-    
-    public void setConfigName(String configName) {
-        this.configName = configName;
-    }
-    
-    //DeploymentControl
-    public DeployNowJson getDeploymentOption() {
-        return deploymentOption;
-    }
-    
-    public void setDeploymentOption(DeployNowJson deploymentOption) {
-        this.deploymentOption = deploymentOption;
-    }
-    
-    //SecurityZoneId
-    public String getSecurityZoneId() {
-        return securityZoneId;
-    }
-    public void setSecurityZoneId(String securityZoneId) {
-        this.securityZoneId = securityZoneId;
-    }
-    
-
-    //ServiceGroup
-    public Set<Object> getServiceGroups() {
-       if(serviceGroups==null)
-       {
-               serviceGroups= new HashSet<Object>();
-       }
-        return this.serviceGroups;
-    }
-    
-    public void setServiceGroups(Set<Object> servListArray) {
+       public String getServiceTypeId() {
+               return serviceTypeId;
+       }
+
+       public void setServiceTypeId(String serviceTypeId) {
+               this.serviceTypeId = serviceTypeId;
+       }
+
+       //ConfigName
+       public String getConfigName() {
+               return configName;
+       }
+
+       public void setConfigName(String configName) {
+               this.configName = configName;
+       }
+
+       //DeploymentControl
+       public DeployNowJson getDeploymentOption() {
+               return deploymentOption;
+       }
+
+       public void setDeploymentOption(DeployNowJson deploymentOption) {
+               this.deploymentOption = deploymentOption;
+       }
+
+       //SecurityZoneId
+       public String getSecurityZoneId() {
+               return securityZoneId;
+       }
+       public void setSecurityZoneId(String securityZoneId) {
+               this.securityZoneId = securityZoneId;
+       }
+
+
+       //ServiceGroup
+       public Set<Object> getServiceGroups() {
+               if(serviceGroups==null)
+               {
+                       serviceGroups= new HashSet<Object>();
+               }
+               return this.serviceGroups;
+       }
+
+       public void setServiceGroups(Set<Object> servListArray) {
                this.serviceGroups = servListArray;
        }
 
-    //AddressGroup
-    public Set<Object> getAddressGroups() {
-       if(addressGroups==null)
-       {
-               addressGroups= new HashSet<Object>();
-       }
-        return this.addressGroups;
-    }
-
-    public void setAddressGroups(Set<Object> addressGroups) {
-        this.addressGroups = addressGroups;
-    }
-    
-    //FirewallRuleList
-    public List<Term> getFirewallRuleList() {
-       
-       if(firewallRuleList==null)
-       {
-               firewallRuleList= new ArrayList<Term>();
-       }
-        return this.firewallRuleList;
-    }
-
-    public void setFirewallRuleList(List<Term> firewallRuleList) {
-        this.firewallRuleList = firewallRuleList;
-    }
-    
-    
-    //primaryParentZoneId
-    public String getPrimaryParentZoneId() {
-               return primaryParentZoneId;
-       }
-
-       public void setPrimaryParentZoneId(String primaryParentZoneId) {
-               this.primaryParentZoneId = primaryParentZoneId;
-       }
-
-       
+       //AddressGroup
+       public Set<Object> getAddressGroups() {
+               if(addressGroups==null)
+               {
+                       addressGroups= new HashSet<Object>();
+               }
+               return this.addressGroups;
+       }
+
+       public void setAddressGroups(Set<Object> addressGroups) {
+               this.addressGroups = addressGroups;
+       }
+
+       //FirewallRuleList
+       public List<Term> getFirewallRuleList() {
+
+               if(firewallRuleList==null)
+               {
+                       firewallRuleList= new ArrayList<Term>();
+               }
+               return this.firewallRuleList;
+       }
+
+       public void setFirewallRuleList(List<Term> firewallRuleList) {
+               this.firewallRuleList = firewallRuleList;
+       }
 
+       //vendorServiceId
+       public String getVendorServiceId() {
+               return vendorServiceId;
+       }
+
+       public void setVendorServiceId(String vendorServiceId) {
+               this.vendorServiceId = vendorServiceId;
+       }
+
+       public VendorSpecificData getVendorSpecificData() {
+               return vendorSpecificData;
+       }
+
+       public void setVendorSpecificData(VendorSpecificData vendorSpecificData) {
+               this.vendorSpecificData = vendorSpecificData;
+       }
 }