Merge "Reorder modifiers"

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

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
index 0872f14..f8e6024 100644 (file)
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
@@ -35,23 +35,22 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
        
        private static final long serialVersionUID = 768026109321305392L;
 
-       private String modelUuid;
-       private String modelInvariantUuid;
-       private String modelName;
-    private String toscaNodeType;
-    private String description;
-    private String orchestrationMode;
-    private String aicVersionMin;
-    private String aicVersionMax;
-    private String category;
-    private String subCategory;
-    private String heatTemplateArtifactUUId;
-    private Timestamp created;
-    private String modelVersion;
-    private Set<VnfResourceCustomization> vnfResourceCustomizations;
-    private Set<VfModule> vfModules;
-    private List<VfModule> vfModuleList;
-    private List<VfModuleCustomization> vfModuleCustomizations;
+       private String modelUuid = null;
+       private String modelInvariantUuid = null;
+       private String modelName = null;
+    private String toscaNodeType = null;
+    private String description = null;
+    private String orchestrationMode = null;
+    private String aicVersionMin = null;
+    private String aicVersionMax = null;
+    private String category = null;
+    private String subCategory = null;
+    private String heatTemplateArtifactUUId = null;
+    private Timestamp created = null;
+    private String modelVersion = null;
+    private Set<VnfResourceCustomization> vnfResourceCustomizations = new HashSet<>();
+    private Set<VfModule> vfModules = new HashSet<>();
+    private List<VfModuleCustomization> vfModuleCustomizations = new ArrayList<>();
 
     public VnfResource () { }
 
@@ -195,9 +194,9 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
        }
 
        public List<VfModuleCustomization> getVfModuleCustomizations() {
-               return this.vfModuleCustomizations == null ? new ArrayList<VfModuleCustomization>() : this.vfModuleCustomizations;
+               return this.vfModuleCustomizations == null ? new ArrayList<>() : this.vfModuleCustomizations;
        }
-       public void setVfModuleCustomizations(ArrayList<VfModuleCustomization> vfModuleCustomizations) {
+       public void setVfModuleCustomizations(List<VfModuleCustomization> vfModuleCustomizations) {
                this.vfModuleCustomizations = vfModuleCustomizations;
        }
        public void addVfModuleCustomization(VfModuleCustomization vfmc) {
@@ -205,7 +204,7 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
                        if (this.vfModuleCustomizations != null) {
                                this.vfModuleCustomizations.add(vfmc);
                        } else {
-                               this.vfModuleCustomizations = new ArrayList<VfModuleCustomization>();
+                               this.vfModuleCustomizations = new ArrayList<>();
                                this.vfModuleCustomizations.add(vfmc);
                        }
        }
@@ -216,7 +215,7 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
                        if (this.vfModules != null) {
                                this.vfModules.add(vfm);
                        } else {
-                               this.vfModules = new HashSet<VfModule>();
+                               this.vfModules = new HashSet<>();
                                this.vfModules.add(vfm);
                        }
                }
@@ -225,10 +224,8 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
                if (this.vfModules == null || this.vfModules.size() < 1) {
                        return null;
        }
-               ArrayList<VfModule> list = new ArrayList<VfModule>();
-               for (VfModule vfm : this.vfModules) {
-                       list.add(vfm);
-       }
+               ArrayList<VfModule> list = new ArrayList<>();
+               list.addAll(this.vfModules);
                return list;
        }
        
@@ -242,45 +239,45 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
 
        @Override
        public String toString () {
-               StringBuffer buf = new StringBuffer();
-
-               buf.append("VNF=");
-               buf.append(",modelVersion=");
-               buf.append(modelVersion);
-               buf.append(",mode=");
-               buf.append(orchestrationMode);
-               buf.append(",heatTemplateArtifactUUId=");
-               buf.append(heatTemplateArtifactUUId);
-               buf.append(",envtId=");
-               buf.append(",asdcUuid=");
-               buf.append(",aicVersionMin=");
-               buf.append(this.aicVersionMin);
-               buf.append(",aicVersionMax=");
-               buf.append(this.aicVersionMax);
-        buf.append(",modelInvariantUuid=");
-        buf.append(this.modelInvariantUuid);
-        buf.append(",modelVersion=");
-        buf.append(",modelCustomizationName=");
-        buf.append(",modelName=");
-        buf.append(this.modelName);
-        buf.append(",serviceModelInvariantUUID=");
-               buf.append(",modelCustomizationUuid=");
-        buf.append(",toscaNodeType=");
-        buf.append(toscaNodeType);
+               StringBuilder sb = new StringBuilder();
+
+               sb.append("VNF=");
+               sb.append(",modelVersion=");
+               sb.append(modelVersion);
+               sb.append(",mode=");
+               sb.append(orchestrationMode);
+               sb.append(",heatTemplateArtifactUUId=");
+               sb.append(heatTemplateArtifactUUId);
+               sb.append(",envtId=");
+               sb.append(",asdcUuid=");
+               sb.append(",aicVersionMin=");
+               sb.append(this.aicVersionMin);
+               sb.append(",aicVersionMax=");
+               sb.append(this.aicVersionMax);
+        sb.append(",modelInvariantUuid=");
+        sb.append(this.modelInvariantUuid);
+        sb.append(",modelVersion=");
+        sb.append(",modelCustomizationName=");
+        sb.append(",modelName=");
+        sb.append(this.modelName);
+        sb.append(",serviceModelInvariantUUID=");
+               sb.append(",modelCustomizationUuid=");
+        sb.append(",toscaNodeType=");
+        sb.append(toscaNodeType);
 
                if (created != null) {
-                       buf.append(",created=");
-                       buf.append(DateFormat.getInstance().format(created));
+                       sb.append(",created=");
+                       sb.append(DateFormat.getInstance().format(created));
                }
                
                for(VnfResourceCustomization vrc : vnfResourceCustomizations) {
-                       buf.append("/n" + vrc.toString());
+                       sb.append("/n").append(vrc.toString());
                        }
                
                for(VfModule vfm : vfModules) {
-                       buf.append("/n" + vfm.toString());
+                       sb.append("/n").append(vfm.toString());
                }
-               return buf.toString();
+               return sb.toString();
     }
 
 }