1 files changed, 32 insertions, 34 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
index 78f94e40c1..d199671621 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
@@ -19,11 +19,9 @@
  */
 package org.openecomp.mso.db.catalog.beans;
 
-import org.openecomp.mso.db.catalog.beans.Service;
-import org.openecomp.mso.db.catalog.beans.VnfResource;
-import org.openecomp.mso.db.catalog.beans.VfModule;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 
 /*
  * A simple holder for Service and its associated elements:
@@ -35,17 +33,17 @@ public class ServiceMacroHolder implements Serializable {
 	private static final long serialVersionUID = 768026109321305392L;
 
 	private Service service;
-	private ArrayList<VnfResource> vnfResources;
-	private ArrayList<NetworkResourceCustomization> networkResourceCustomizations;
-	private ArrayList<AllottedResourceCustomization> allottedResourceCustomizations;
-	private ArrayList<VnfResourceCustomization> vnfResourceCustomizations;
+	private List<VnfResource> vnfResources;
+	private List<NetworkResourceCustomization> networkResourceCustomization;
+	private List<AllottedResourceCustomization> allottedResourceCustomization;
+	private List<VnfResourceCustomization> vnfResourceCustomizations;
 
 	public ServiceMacroHolder() {
 		super();
 		this.service = null;
 		this.vnfResources = new ArrayList<>();
-		this.networkResourceCustomizations = new ArrayList<>();
-		this.allottedResourceCustomizations = new ArrayList<>();
+		this.networkResourceCustomization = new ArrayList<>();
+		this.allottedResourceCustomization = new ArrayList<>();
 		this.vnfResourceCustomizations = new ArrayList<>();
 	}
 	public ServiceMacroHolder(Service service) {
@@ -60,10 +58,10 @@ public class ServiceMacroHolder implements Serializable {
 		this.service = service;
 	}
 
-	public void setVnfResources(ArrayList<VnfResource> vnfResources) {
+	public void setVnfResources(List<VnfResource> vnfResources) {
 		this.vnfResources = vnfResources;
 	}
-	public ArrayList<VnfResource> getVnfResources() {
+	public List<VnfResource> getVnfResources() {
 		return this.vnfResources;
 	}
 	public void addVnfResource(VnfResource vr) {
@@ -77,10 +75,10 @@ public class ServiceMacroHolder implements Serializable {
 		}
 	}
 
-	public void setVnfResourceCustomizations(ArrayList<VnfResourceCustomization> vnfResourceCustomizations) {
+	public void setVnfResourceCustomizations(List<VnfResourceCustomization> vnfResourceCustomizations) {
 		this.vnfResourceCustomizations = vnfResourceCustomizations;
 	}
-	public ArrayList<VnfResourceCustomization> getVnfResourceCustomizations() {
+	public List<VnfResourceCustomization> getVnfResourceCustomizations() {
 		return this.vnfResourceCustomizations;
 	}
 	public void addVnfResourceCustomizations(VnfResourceCustomization vrc) {
@@ -94,33 +92,33 @@ public class ServiceMacroHolder implements Serializable {
 		}
 	}
 	
-	public void setNetworkResourceCustomization(ArrayList<NetworkResourceCustomization> networkResourceCustomizations) {
-		this.networkResourceCustomizations = networkResourceCustomizations;
+	public void setNetworkResourceCustomization(List<NetworkResourceCustomization> networkResourceCustomizations) {
+		this.networkResourceCustomization = networkResourceCustomizations;
 	}
-	public ArrayList<NetworkResourceCustomization> getNetworkResourceCustomization() {
-		return this.networkResourceCustomizations;
+	public List<NetworkResourceCustomization> getNetworkResourceCustomization() {
+		return this.networkResourceCustomization;
 	}
-	public void addNetworkResourceCustomization(NetworkResourceCustomization nrc) {
-		if (this.networkResourceCustomizations != null) {
-			this.networkResourceCustomizations.add(nrc);
+	public void addNetworkResourceCustomizations(NetworkResourceCustomization nrc) {
+		if (this.networkResourceCustomization != null) {
+			this.networkResourceCustomization.add(nrc);
 		} else {
-			this.networkResourceCustomizations = new ArrayList<>();
-			this.networkResourceCustomizations.add(nrc);
+			this.networkResourceCustomization = new ArrayList<>();
+			this.networkResourceCustomization.add(nrc);
 		}
 	}
 
-	public void setAllottedResourceCustomization(ArrayList<AllottedResourceCustomization> allottedResourceCustomizations) {
-		this.allottedResourceCustomizations = allottedResourceCustomizations;
+	public void setAllottedResourceCustomization(List<AllottedResourceCustomization> allottedResourceCustomizations) {
+		this.allottedResourceCustomization = allottedResourceCustomizations;
 	}
-	public ArrayList<AllottedResourceCustomization> getAllottedResourceCustomization() {
-		return this.allottedResourceCustomizations;
+	public List<AllottedResourceCustomization> getAllottedResourceCustomization() {
+		return this.allottedResourceCustomization;
 	}
 	public void addAllottedResourceCustomization(AllottedResourceCustomization arc) {
-		if (this.allottedResourceCustomizations != null) {
-			this.allottedResourceCustomizations.add(arc);
+		if (this.allottedResourceCustomization != null) {
+			this.allottedResourceCustomization.add(arc);
 		} else {
-			this.allottedResourceCustomizations = new ArrayList<>();
-			this.allottedResourceCustomizations.add(arc);
+			this.allottedResourceCustomization = new ArrayList<>();
+			this.allottedResourceCustomization.add(arc);
 		}
 	}
 
@@ -151,17 +149,17 @@ public class ServiceMacroHolder implements Serializable {
 		} else {
 			sb.append("none");
 		}
-		if (this.networkResourceCustomizations != null && this.networkResourceCustomizations.size() > 0) {
+		if (this.networkResourceCustomization != null && this.networkResourceCustomization.size() > 0) {
 			int i=0;
 			sb.append("NetworkResourceCustomizations:");
-			for (NetworkResourceCustomization nrc : this.networkResourceCustomizations) {
+			for (NetworkResourceCustomization nrc : this.networkResourceCustomization) {
 				sb.append("NRC[").append(i++).append("]: ").append(nrc.toString());
 			}
 		}
-		if (this.allottedResourceCustomizations != null && this.allottedResourceCustomizations.size() > 0) {
+		if (this.allottedResourceCustomization != null && this.allottedResourceCustomization.size() > 0) {
 			int i=0;
 			sb.append("AllottedResourceCustomizations:");
-			for (AllottedResourceCustomization arc : this.allottedResourceCustomizations) {
+			for (AllottedResourceCustomization arc : this.allottedResourceCustomization) {
 				sb.append("ARC[").append(i++).append("]: ").append(arc.toString());
 			}
 		}