Merge "Remove unneeded param type definition"

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

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
index 42b6b65..9795dee 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
@@ -20,7 +20,6 @@
 package org.openecomp.mso.adapters.catalogdb.catalogrest;
 
 import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
-import org.jboss.resteasy.annotations.providers.NoJackson;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
@@ -29,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 
 @XmlRootElement(name = "serviceNetworks")
-@NoJackson
 public class QueryServiceNetworks extends CatalogQuery {
        private List<NetworkResourceCustomization> serviceNetworks;
        private final String template =
@@ -51,10 +49,10 @@ public class QueryServiceNetworks extends CatalogQuery {
                "\t}";
 //             "\t}}";
 
-       public QueryServiceNetworks() { super(); serviceNetworks = new ArrayList<NetworkResourceCustomization>(); }
+       public QueryServiceNetworks() { super(); serviceNetworks = new ArrayList<>(); }
        public QueryServiceNetworks(List<NetworkResourceCustomization> vlist) {
                LOGGER.debug ("QueryServiceNetworks:");
-               serviceNetworks = new ArrayList<NetworkResourceCustomization>();
+               serviceNetworks = new ArrayList<>();
                for (NetworkResourceCustomization o : vlist) {
                        LOGGER.debug (o.toString());
                        serviceNetworks.add(o);
@@ -67,30 +65,30 @@ public class QueryServiceNetworks extends CatalogQuery {
 
        @Override
        public String toString () {
-               StringBuffer buf = new StringBuffer();
+               StringBuilder sb = new StringBuilder();
 
                boolean first = true;
                int i = 1;
                for (NetworkResourceCustomization o : serviceNetworks) {
-                       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("\"serviceNetworks\": [");
-               //if (isArray) buf.append("[");
-               Map<String, String> valueMap = new HashMap<String, String>();
+               StringBuilder sb = new StringBuilder();
+               if (!isEmbed && isArray) sb.append("{ ");
+               if (isArray) sb.append("\"serviceNetworks\": [");
+
+               Map<String, String> valueMap = new HashMap<>();
                String sep = "";
                boolean first = true;
 
                for (NetworkResourceCustomization o : serviceNetworks) {
-                       if (first) buf.append("\n"); first = false;
+                       if (first) sb.append("\n"); first = false;
                        boolean nrNull = o.getNetworkResource() == null ? true : false;
                    put(valueMap, "MODEL_NAME",               nrNull ? null : o.getNetworkResource().getModelName());
                    put(valueMap, "MODEL_UUID",               nrNull ? null : o.getNetworkResource().getModelUUID());
@@ -104,12 +102,12 @@ public class QueryServiceNetworks extends CatalogQuery {
                    put(valueMap, "NETWORK_SCOPE",             o.getNetworkScope());
                    put(valueMap, "NETWORK_TECHNOLOGY",             o.getNetworkTechnology());
 
-            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
+}