Merge "Added "@Override" annotation method signature"
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 e8b33ba..d4d0507 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
@@ -44,9 +44,9 @@
super();
this.service = null;
this.vnfResources = new ArrayList<VnfResource>();
- this.networkResourceCustomizations = new ArrayList<NetworkResourceCustomization>();
- this.allottedResourceCustomizations = new ArrayList<AllottedResourceCustomization>();
- this.vnfResourceCustomizations = new ArrayList<VnfResourceCustomization>();
+ this.networkResourceCustomizations = new ArrayList<>();
+ this.allottedResourceCustomizations = new ArrayList<>();
+ this.vnfResourceCustomizations = new ArrayList<>();
}
public ServiceMacroHolder(Service service) {
this();
@@ -71,7 +71,7 @@
if (this.vnfResources != null) {
this.vnfResources.add(vr);
} else {
- this.vnfResources = new ArrayList<VnfResource>();
+ this.vnfResources = new ArrayList<>();
this.vnfResources.add(vr);
}
}
@@ -88,7 +88,7 @@
if (this.vnfResourceCustomizations != null) {
this.vnfResourceCustomizations.add(vrc);
} else {
- this.vnfResourceCustomizations = new ArrayList<VnfResourceCustomization>();
+ this.vnfResourceCustomizations = new ArrayList<>();
this.vnfResourceCustomizations.add(vrc);
}
}
@@ -104,7 +104,7 @@
if (this.networkResourceCustomizations != null) {
this.networkResourceCustomizations.add(nrc);
} else {
- this.networkResourceCustomizations = new ArrayList<NetworkResourceCustomization>();
+ this.networkResourceCustomizations = new ArrayList<>();
this.networkResourceCustomizations.add(nrc);
}
}
@@ -119,11 +119,12 @@
if (this.allottedResourceCustomizations != null) {
this.allottedResourceCustomizations.add(arc);
} else {
- this.allottedResourceCustomizations = new ArrayList<AllottedResourceCustomization>();
+ this.allottedResourceCustomizations = new ArrayList<>();
this.allottedResourceCustomizations.add(arc);
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("ServicePlus: ");