Replaced with Diamond symbol

Issue-Id:SO-118
Change-Id: I61310f341d86b765d0eff82ff758fcc4922b6576
Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
index 7373cb1..e514767 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
@@ -61,7 +61,7 @@ public class QueryServiceMacroHolder extends CatalogQuery {
                if (service == null) return "\"serviceResources\": null";
 
                StringBuilder buf = new StringBuilder();
-               Map<String, String> valueMap = new HashMap<String, String>();
+               Map<String, String> valueMap = new HashMap<>();
 
                put(valueMap, "SERVICE_MODEL_NAME",         service.getModelName()); //getServiceModelName());
                put(valueMap, "SERVICE_MODEL_UUID",         service.getModelUUID()); //getServiceModelUuid());

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..59c601e 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
@@ -51,10 +51,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,7 +67,7 @@ public class QueryServiceNetworks extends CatalogQuery {
 
        @Override
        public String toString () {
-               StringBuffer buf = new StringBuffer();
+               StringBuilder buf = new StringBuilder();
 
                boolean first = true;
                int i = 1;
@@ -81,11 +81,11 @@ public class QueryServiceNetworks extends CatalogQuery {
 
        @Override
        public String JSON2(boolean isArray, boolean isEmbed) {
-               StringBuffer buf = new StringBuffer();
+               StringBuilder buf = new StringBuilder();
                if (!isEmbed && isArray) buf.append("{ ");
                if (isArray) buf.append("\"serviceNetworks\": [");
                //if (isArray) buf.append("[");
-               Map<String, String> valueMap = new HashMap<String, String>();
+               Map<String, String> valueMap = new HashMap<>();
                String sep = "";
                boolean first = true;
 
@@ -112,4 +112,4 @@ public class QueryServiceNetworks extends CatalogQuery {
                if (!isEmbed && isArray) buf.append("}");
                return buf.toString();
        }
-}
\ No newline at end of file
+}

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..cfbb781 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,7 +72,7 @@ public class QueryServiceVnfs extends CatalogQuery {
 
        @Override
        public String toString () {
-               StringBuffer buf = new StringBuffer();
+               StringBuilder buf = new StringBuilder();
 
                boolean first = true;
                int i = 1;
@@ -86,10 +86,10 @@ public class QueryServiceVnfs extends CatalogQuery {
 
        @Override
        public String JSON2(boolean isArray, boolean isEmbed) {
-               StringBuffer buf = new StringBuffer();
+               StringBuilder buf = new StringBuilder();
                if (!isEmbed && isArray) buf.append("{ ");
                if (isArray) buf.append("\"serviceVnfs\": [");
-               Map<String, String> valueMap = new HashMap<String, String>();
+               Map<String, String> valueMap = new HashMap<>();
                String sep = "";
                boolean first = true;
 
@@ -121,4 +121,4 @@ public class QueryServiceVnfs extends CatalogQuery {
                if (!isEmbed && isArray) buf.append("}");
                return buf.toString();
        }
-}
\ No newline at end of file
+}