Replaced with Diamond symbol

Issue-Id:SO-118
Change-Id: I744c8e8278157aefd001ebc27e35e77e115d3b71
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/CatalogQueryExceptionCommon.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
index 9f70914..a1bc085 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
@@ -40,7 +40,7 @@ public abstract class CatalogQueryExceptionCommon {
 
        public String toJsonString() {
                try {
-                       String jsonString = null;
+                       String jsonString;
                        ObjectMapper mapper = new ObjectMapper();
                        mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
                        jsonString = mapper.writeValueAsString(this);

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
index 75262e3..9a82ed2 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
@@ -54,7 +54,7 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
                "\t}";
 //             "\t}}";
 
-       public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList<AllottedResourceCustomization>(); }
+       public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList<>(); }
        public QueryAllottedResourceCustomization(List<AllottedResourceCustomization> vlist) { allottedResourceCustomization = vlist; }
 
        public List<AllottedResourceCustomization> getServiceAllottedResources(){ return this.allottedResourceCustomization; }
@@ -62,7 +62,7 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
 
        @Override
        public String toString () {
-               StringBuffer buf = new StringBuffer();
+               StringBuilder buf = new StringBuilder();
 
                boolean first = true;
                int i = 1;
@@ -76,10 +76,10 @@ public class QueryAllottedResourceCustomization 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("\"serviceAllottedResources\": [");
-               Map<String, String> valueMap = new HashMap<String, String>();
+               Map<String, String> valueMap = new HashMap<>();
                String sep = "";
                boolean first = true;
 
@@ -114,4 +114,4 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
                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/QueryServiceMacroHolder.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
index 0e2aa71..7373cb1 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
@@ -60,7 +60,7 @@ public class QueryServiceMacroHolder extends CatalogQuery {
                Service service = serviceMacroHolder.getService();
                if (service == null) return "\"serviceResources\": null";
 
-               StringBuffer buf = new StringBuffer();
+               StringBuilder buf = new StringBuilder();
                Map<String, String> valueMap = new HashMap<String, String>();
 
                put(valueMap, "SERVICE_MODEL_NAME",         service.getModelName()); //getServiceModelName());
@@ -84,4 +84,4 @@ public class QueryServiceMacroHolder extends CatalogQuery {
                return buf.toString();
        }
 
-}
\ No newline at end of file
+}