Merge "Adding Junit"

[so.git] / mso-catalog-db / src / main / java / org / openecomp / mso / db / catalog / beans / VnfResourceCustomization.java

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
index 151c9e5..64c0313 100644 (file)
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
@@ -44,6 +44,7 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
        private String nfType;
        private String nfRole;
        private String nfNamingCode;
+       private String multiStageDesign;
     private List<VfModuleCustomization> vfModuleCustomizations;
     private Set<ServiceToResourceCustomization> serviceResourceCustomizations;
 
@@ -144,6 +145,12 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
        public void setNfNamingCode(String nfNamingCode) {
                this.nfNamingCode = nfNamingCode;
        }
+       public String getMultiStageDesign() {
+               return this.multiStageDesign;
+       }
+       public void setMultiStageDesign(String multiStageDesign) {
+               this.multiStageDesign = multiStageDesign;
+       }
        public List<VfModuleCustomization> getVfModuleCustomizations() {
                return this.vfModuleCustomizations;
        }
@@ -155,7 +162,7 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
                        if (this.vfModuleCustomizations != null) {
                                this.vfModuleCustomizations.add(vfmc);
                        } else {
-                               this.vfModuleCustomizations = new ArrayList<VfModuleCustomization>();
+                               this.vfModuleCustomizations = new ArrayList<>();
                                this.vfModuleCustomizations.add(vfmc);
                        }
                }
@@ -179,21 +186,18 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
 
        @Override
        public String toString() {
-               StringBuilder sb = new StringBuilder("VnfResourceCustomization: ");
-               sb.append("ModelCustUuid=").append(this.modelCustomizationUuid);
-               sb.append(", ModelInstanceName=").append(this.modelInstanceName);
-               sb.append(", vnfResourceModelUuid=").append(this.vnfResourceModelUUID);
-               sb.append(", creationTimestamp=").append(this.created);
-               sb.append(", minInstances=").append(this.minInstances);
-               sb.append(", maxInstances=").append(this.maxInstances);
-               sb.append(", availabilityZoneMaxCount=").append(this.availabilityZoneMaxCount);
-//             sb.append(", vnfResource:\n" + this.vnfResource == null ? "null" : this.vnfResource.toString());
-               sb.append(", nfFunction=").append(this.nfFunction);
-               sb.append(", nfType=").append(this.nfType);
-               sb.append(", nfRole=").append(this.nfRole);
-               sb.append(", nfNamingCode=").append(this.nfNamingCode);
-               
-               return sb.toString();
+        return "VnfResourceCustomization: " + "ModelCustUuid=" + this.modelCustomizationUuid +
+            ", ModelInstanceName=" + this.modelInstanceName +
+            ", vnfResourceModelUuid=" + this.vnfResourceModelUUID +
+            ", creationTimestamp=" + this.created +
+            ", minInstances=" + this.minInstances +
+            ", maxInstances=" + this.maxInstances +
+            ", availabilityZoneMaxCount=" + this.availabilityZoneMaxCount +
+            ", nfFunction=" + this.nfFunction +
+            ", nfType=" + this.nfType +
+            ", nfRole=" + this.nfRole +
+            ", nfNamingCode=" + this.nfNamingCode +
+            ", multiStageDesign=" + this.multiStageDesign;
        }
 
 }