Merge "Make use of getOrDefault"

[so.git] / adapters / mso-catalog-db-adapter / src / main / java / org / openecomp / mso / adapters / catalogdb / catalogrest / QueryServiceVnfs.java

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
index ee3c86a..f0d4327 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
@@ -55,10 +55,10 @@ public class QueryServiceVnfs extends CatalogQuery {
                        "\t}";
 //                     "\t}}";
 
-       public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<VnfResourceCustomization>(); }
+       public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<>(); }
        public QueryServiceVnfs(List<VnfResourceCustomization> vlist) { 
                LOGGER.debug ("QueryServiceVnfs:");
-               serviceVnfs = new ArrayList<VnfResourceCustomization>();
+               serviceVnfs = new ArrayList<>();
                for (VnfResourceCustomization o : vlist) {
                        LOGGER.debug ("-- o is a  serviceVnfs ----");
                        LOGGER.debug (o.toString());
@@ -72,29 +72,29 @@ public class QueryServiceVnfs extends CatalogQuery {
 
        @Override
        public String toString () {
-               StringBuffer buf = new StringBuffer();
+               StringBuilder sb = new StringBuilder();
 
                boolean first = true;
                int i = 1;
                for (VnfResourceCustomization o : serviceVnfs) {
-                       buf.append(i+"\t");
-                       if (!first) buf.append("\n"); first = false;
-                       buf.append(o);
+                       sb.append(i).append("\t");
+                       if (!first) sb.append("\n"); first = false;
+                       sb.append(o);
                }
-               return buf.toString();
+               return sb.toString();
     }
 
        @Override
        public String JSON2(boolean isArray, boolean isEmbed) {
-               StringBuffer buf = new StringBuffer();
-               if (!isEmbed && isArray) buf.append("{ ");
-               if (isArray) buf.append("\"serviceVnfs\": [");
-               Map<String, String> valueMap = new HashMap<String, String>();
+               StringBuilder sb = new StringBuilder();
+               if (!isEmbed && isArray) sb.append("{ ");
+               if (isArray) sb.append("\"serviceVnfs\": [");
+               Map<String, String> valueMap = new HashMap<>();
                String sep = "";
                boolean first = true;
 
                for (VnfResourceCustomization o : serviceVnfs) {
-                       if (first) buf.append("\n"); first = false;
+                       if (first) sb.append("\n"); first = false;
 
                        boolean vrNull = o.getVnfResource() == null ? true : false;
 
@@ -113,12 +113,12 @@ public class QueryServiceVnfs extends CatalogQuery {
                    String subitem = new QueryVfModule(vrNull ? null : o.getVfModuleCustomizations()).JSON2(true, true); 
                    valueMap.put("_VFMODULES_",               subitem.replaceAll("(?m)^", "\t\t"));
 
-            buf.append(sep+ this.setTemplate(template, valueMap));
+            sb.append(sep).append(this.setTemplate(template, valueMap));
             sep = ",\n";
                }
-               if (!first) buf.append("\n");
-               if (isArray) buf.append("]");
-               if (!isEmbed && isArray) buf.append("}");
-               return buf.toString();
+               if (!first) sb.append("\n");
+               if (isArray) sb.append("]");
+               if (!isEmbed && isArray) sb.append("}");
+               return sb.toString();
        }
-}
\ No newline at end of file
+}