Make use of append instead of string concatenation

Change-Id: I94ad658026f165ba8b5a74352095188a27ee50e5
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>

40 files changed, 265 insertions, 256 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
index 8da3b212d9..2d6d0271f8 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
@@ -185,12 +185,12 @@ public class CloudConfigFactory implements Serializable {
             StringBuffer response = new StringBuffer ();
             response.append ("Cloud Sites:\n");
             for (CloudSite site : cloudConfig.getCloudSites ().values ()) {
-                response.append (site.toString () + "\n");
+                response.append(site.toString()).append("\n");
             }
     
             response.append ("\n\nCloud Identity Services:\n");
             for (CloudIdentity identity : cloudConfig.getIdentityServices ().values ()) {
-                response.append (identity.toString () + "\n");
+                response.append(identity.toString()).append("\n");
             }
     
             return Response.status (200).entity (response).build ();
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
index 20535e93c8..9fe2d4c786 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
@@ -1217,18 +1217,18 @@ public class MsoHeatUtils extends MsoCommonUtils {
 		} else {
 			for (String key : params.keySet()) {
 				if (params.get(key) instanceof String) {
-					sb.append("\n" + key + "=" + (String) params.get(key));
+					sb.append("\n").append(key).append("=").append((String) params.get(key));
 				} else if (params.get(key) instanceof JsonNode) {
 					String jsonStringOut = this.convertNode((JsonNode)params.get(key));
-					sb.append("\n" + key + "=" + jsonStringOut);
+					sb.append("\n").append(key).append("=").append(jsonStringOut);
 				} else if (params.get(key) instanceof Integer) {
 					String integerOut = "" + params.get(key);
-					sb.append("\n" + key + "=" + integerOut);
+					sb.append("\n").append(key).append("=").append(integerOut);
 
 				} else {
 					try {
 						String str = params.get(key).toString();
-						sb.append("\n" + key + "=" + str);
+						sb.append("\n").append(key).append("=").append(str);
 					} catch (Exception e) {
 						LOGGER.debug("Exception :",e);
 					}
@@ -1272,16 +1272,16 @@ public class MsoHeatUtils extends MsoCommonUtils {
 		int counter = 0;
 		sb.append("OUTPUTS:\n");
 		for (String key : outputs.keySet()) {
-			sb.append("outputs[" + counter++ + "]: " + key + "=");
+			sb.append("outputs[").append(counter++).append("]: ").append(key).append("=");
 			Object obj = outputs.get(key);
 			if (obj instanceof String) {
-				sb.append((String)obj +" (a string)");
+				sb.append((String) obj).append(" (a string)");
 			} else if (obj instanceof JsonNode) {
-				sb.append(this.convertNode((JsonNode)obj) + " (a JsonNode)");
+				sb.append(this.convertNode((JsonNode) obj)).append(" (a JsonNode)");
 			} else if (obj instanceof java.util.LinkedHashMap) {
 				try {
 					String str = JSON_MAPPER.writeValueAsString(obj);
-					sb.append(str + " (a java.util.LinkedHashMap)");
+					sb.append(str).append(" (a java.util.LinkedHashMap)");
 				} catch (Exception e) {
 					LOGGER.debug("Exception :",e);
 					sb.append("(a LinkedHashMap value that would not convert nicely)");
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsWithUpdate.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsWithUpdate.java
index 2465b30eca..0e0b9cb70d 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsWithUpdate.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtilsWithUpdate.java
@@ -365,16 +365,16 @@ public class MsoHeatUtilsWithUpdate extends MsoHeatUtils {
 		int counter = 0;
 		sb.append("OUTPUTS:\n");
 		for (String key : outputs.keySet()) {
-			sb.append("outputs[" + counter++ + "]: " + key + "=");
+			sb.append("outputs[").append(counter++).append("]: ").append(key).append("=");
 			Object obj = outputs.get(key);
 			if (obj instanceof String) {
-				sb.append((String)obj +" (a string)");
+				sb.append((String) obj).append(" (a string)");
 			} else if (obj instanceof JsonNode) {
-				sb.append(this.convertNode((JsonNode)obj) + " (a JsonNode)");
+				sb.append(this.convertNode((JsonNode) obj)).append(" (a JsonNode)");
 			} else if (obj instanceof java.util.LinkedHashMap) {
 				try {
 					String str = JSON_MAPPER.writeValueAsString(obj);
-					sb.append(str + " (a java.util.LinkedHashMap)");
+					sb.append(str).append(" (a java.util.LinkedHashMap)");
 				} catch (Exception e) {
 					LOGGER.debug("Exception :", e);
 					sb.append("(a LinkedHashMap value that would not convert nicely)");
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 9a82ed2c6e..f7758c315c 100644
--- 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
@@ -62,30 +62,30 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
 
 	@Override
 	public String toString () {
-		StringBuilder buf = new StringBuilder();
+		StringBuilder sb = new StringBuilder();
 
 		boolean first = true;
 		int i = 1;
 		for (AllottedResourceCustomization o : allottedResourceCustomization) {
-			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) {
-		StringBuilder buf = new StringBuilder();
-		if (!isEmbed && isArray) buf.append("{ ");
-		if (isArray) buf.append("\"serviceAllottedResources\": [");
+		StringBuilder sb = new StringBuilder();
+		if (!isEmbed && isArray) sb.append("{ ");
+		if (isArray) sb.append("\"serviceAllottedResources\": [");
 		Map<String, String> valueMap = new HashMap<>();
 		String sep = "";
 		boolean first = true;
 
 		if (this.allottedResourceCustomization != null) {
 		for (AllottedResourceCustomization o : allottedResourceCustomization) {
-			if (first) buf.append("\n"); first = false;
+			if (first) sb.append("\n"); first = false;
 
 				boolean arNull = o.getAllottedResource() == null ? true : false;
 	
@@ -104,14 +104,14 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
 			    put(valueMap, "NF_NAMING_CODE",     o.getNfNamingCode());
 			    put(valueMap, "PROVIDING_SERVICE_MODEL_INVARIANT_UUID",     o.getProvidingServiceModelInvariantUuid());
 
-            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();
 	}
 
 }
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 59c601ef19..c04068d680 100644
--- 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
@@ -67,30 +67,30 @@ public class QueryServiceNetworks extends CatalogQuery {
 
 	@Override
 	public String toString () {
-		StringBuilder buf = new StringBuilder();
+		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) {
-		StringBuilder buf = new StringBuilder();
-		if (!isEmbed && isArray) buf.append("{ ");
-		if (isArray) buf.append("\"serviceNetworks\": [");
-		//if (isArray) buf.append("[");
+		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 +104,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();
 	}
 }
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 cfbb781ae8..f0d4327950 100644
--- 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
@@ -72,29 +72,29 @@ public class QueryServiceVnfs extends CatalogQuery {
 
 	@Override
 	public String toString () {
-		StringBuilder buf = new StringBuilder();
+		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) {
-		StringBuilder buf = new StringBuilder();
-		if (!isEmbed && isArray) buf.append("{ ");
-		if (isArray) buf.append("\"serviceVnfs\": [");
+		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();
 	}
 }
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
index b2caa99a39..fe0f0cbc17 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
@@ -69,28 +69,28 @@ public class QueryVfModule extends CatalogQuery {
 
 	@Override
 	public String toString () {
-		StringBuilder buf = new StringBuilder();
+		StringBuilder sb = new StringBuilder();
 
 		boolean first = true;
 		int i = 1;
 		for (VfModuleCustomization o : vfModules) {
-			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 x) {
-		StringBuilder buf = new StringBuilder();
-		if (isArray) buf.append("\"vfModules\": [");
+		StringBuilder sb = new StringBuilder();
+		if (isArray) sb.append("\"vfModules\": [");
 		Map<String, String> valueMap = new HashMap<>();
 		String sep = "";
 		boolean first = true;
 
 		for (VfModuleCustomization o : vfModules) {
-			if (first) buf.append("\n"); first = false;
+			if (first) sb.append("\n"); first = false;
 
 			boolean vfNull = o.getVfModule() == null ? true : false;
 			boolean hasVolumeGroup = false;
@@ -109,11 +109,11 @@ public class QueryVfModule extends CatalogQuery {
 		    put(valueMap, "INITIAL_COUNT",            o.getInitialCount());
 		    put(valueMap, "HAS_VOLUME_GROUP", hasVolumeGroup);
 
-            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("]");
-		return buf.toString();
+		if (!first) sb.append("\n");
+		if (isArray) sb.append("]");
+		return sb.toString();
 	}
 }
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModules.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModules.java
index ff713991f9..00a5cafb29 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModules.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModules.java
@@ -58,17 +58,17 @@ public class QueryVfModules {
 	
 	@Override
 	public String toString () {
-		StringBuilder buf = new StringBuilder();
+		StringBuilder sb = new StringBuilder();
 
 		boolean first = true;
 		int i = 1;
 		for (VfModule o : vfModules) {
-			buf.append(i+"\t");
-			if (!first) buf.append("\n");
+			sb.append(i).append("\t");
+			if (!first) sb.append("\n");
 			first = false;
-			buf.append(o);
+			sb.append(o);
 		}
-		return buf.toString();
+		return sb.toString();
     }
 	
 	public String toJsonString() {
diff --git a/adapters/mso-network-adapter/src/main/java/org/openecomp/mso/adapters/network/MsoNetworkAdapterImpl.java b/adapters/mso-network-adapter/src/main/java/org/openecomp/mso/adapters/network/MsoNetworkAdapterImpl.java
index f050882586..82684bd43e 100644
--- a/adapters/mso-network-adapter/src/main/java/org/openecomp/mso/adapters/network/MsoNetworkAdapterImpl.java
+++ b/adapters/mso-network-adapter/src/main/java/org/openecomp/mso/adapters/network/MsoNetworkAdapterImpl.java
@@ -1747,20 +1747,20 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
             stackParams.put (VLANS, csl);
         }
         if (routeTargets != null && !routeTargets.isEmpty()) {
-            StringBuilder buf = new StringBuilder ();
+            StringBuilder sb = new StringBuilder ();
             String sep = "";
             for (String rt : routeTargets) {
             	if (!isNullOrEmpty(rt))
             	{
             		if (aic3template)
-            			buf.append (sep).append ("target:" + rt);
+            			sb.append(sep).append("target:").append(rt);
             		else
-            			buf.append (sep).append (rt);
+            			sb.append (sep).append (rt);
 
             		sep = ",";
             	}
             }
-            String csl = buf.toString ();
+            String csl = sb.toString ();
 
             stackParams.put ("route_targets", csl);
         }
diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
index b8a5d9b117..95e62a0e2d 100644
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
@@ -508,7 +508,8 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
                     LOGGER.debug("Exception :",e);
                     outputString = "Unable to call toString() on the value for " + str;
                 }
-                sb.append("\t\nitem " + i++ + ": '" + str + "'='" + outputString + "'");
+                sb.append("\t\nitem ").append(i++).append(": '").append(str).append("'='").append(outputString)
+                    .append("'");
             }
         }
         LOGGER.debug(sb.toString());
@@ -524,7 +525,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
             sb.append("\tEMPTY");
         } else {
             for (String str : inputs.keySet()) {
-                sb.append("\titem " + i++ + ": " + str + "=" + inputs.get(str));
+                sb.append("\titem ").append(i++).append(": ").append(str).append("=").append(inputs.get(str));
             }
         }
         LOGGER.debug(sb.toString());
@@ -1224,7 +1225,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
             int cntr = 0;
             try {
                 for (HeatTemplateParam htp : heatTemplate.getParameters()) {
-                    sb.append("param[" + cntr++ + "]=" + htp.getParamName());
+                    sb.append("param[").append(cntr++).append("]=").append(htp.getParamName());
                     parameterNames.add(htp.getParamName());
                     if (htp.getParamAlias() != null && !"".equals(htp.getParamAlias())) {
                         aliasToParam.put(htp.getParamAlias(), htp.getParamName());
@@ -1443,16 +1444,16 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
 
         StringBuilder sbInit = new StringBuilder();
         sbInit.append("updateVfModule: \n");
-        sbInit.append("cloudSiteId=" + cloudSiteId + "\n");
-        sbInit.append("tenantId=" + tenantId + "\n");
-        sbInit.append("vnfType=" + vnfType + "\n");
-        sbInit.append("vnfVersion=" + vnfVersion + "\n");
-        sbInit.append("vnfName=" + vnfName + "\n");
-        sbInit.append("requestType=" + requestType + "\n");
-        sbInit.append("volumeGroupHeatStackId=" + volumeGroupHeatStackId + "\n");
-        sbInit.append("baseVfHeatStackId=" + baseVfHeatStackId + "\n");
-        sbInit.append("vfModuleStackId=" + vfModuleStackId + "\n");
-        sbInit.append("modelCustomizationUuid=" + modelCustomizationUuid + "\n");
+        sbInit.append("cloudSiteId=").append(cloudSiteId).append("\n");
+        sbInit.append("tenantId=").append(tenantId).append("\n");
+        sbInit.append("vnfType=").append(vnfType).append("\n");
+        sbInit.append("vnfVersion=").append(vnfVersion).append("\n");
+        sbInit.append("vnfName=").append(vnfName).append("\n");
+        sbInit.append("requestType=").append(requestType).append("\n");
+        sbInit.append("volumeGroupHeatStackId=").append(volumeGroupHeatStackId).append("\n");
+        sbInit.append("baseVfHeatStackId=").append(baseVfHeatStackId).append("\n");
+        sbInit.append("vfModuleStackId=").append(vfModuleStackId).append("\n");
+        sbInit.append("modelCustomizationUuid=").append(modelCustomizationUuid).append("\n");
         LOGGER.debug(sbInit.toString());
 
         String mcu = modelCustomizationUuid;
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java
index a7ba01354d..2080be137c 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java
@@ -311,71 +311,71 @@ public class ASDCNotificationLogging {
 			return "NULL";
 		}
 
-		StringBuilder buffer = new StringBuilder("VfModuleMetaData:");
-		buffer.append(System.lineSeparator());
+		StringBuilder stringBuilder = new StringBuilder("VfModuleMetaData:");
+		stringBuilder.append(System.lineSeparator());
 
-		buffer.append("VfModuleModelName:");
-		buffer.append(testNull(moduleMetaData.getVfModuleModelName()));
-		buffer.append(System.lineSeparator());
+		stringBuilder.append("VfModuleModelName:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelName()));
+		stringBuilder.append(System.lineSeparator());
 
-		buffer.append("VfModuleModelVersion:");
-		buffer.append(testNull(moduleMetaData.getVfModuleModelVersion()));
-		buffer.append(System.lineSeparator());
+		stringBuilder.append("VfModuleModelVersion:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelVersion()));
+		stringBuilder.append(System.lineSeparator());
 
-		buffer.append("VfModuleModelUUID:");
-		buffer.append(testNull(moduleMetaData.getVfModuleModelUUID()));
-		buffer.append(System.lineSeparator());
+		stringBuilder.append("VfModuleModelUUID:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelUUID()));
+		stringBuilder.append(System.lineSeparator());
 
-		buffer.append("VfModuleModelInvariantUUID:");
-		buffer.append(testNull(moduleMetaData.getVfModuleModelInvariantUUID()));
-		buffer.append(System.lineSeparator());
+		stringBuilder.append("VfModuleModelInvariantUUID:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelInvariantUUID()));
+		stringBuilder.append(System.lineSeparator());
 
-		buffer.append("VfModuleModelDescription:");
-		buffer.append(testNull(moduleMetaData.getVfModuleModelDescription()));
-		buffer.append(System.lineSeparator());
+		stringBuilder.append("VfModuleModelDescription:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelDescription()));
+		stringBuilder.append(System.lineSeparator());
 
-		buffer.append("Artifacts UUID List:");
+		stringBuilder.append("Artifacts UUID List:");
 
 		if (moduleMetaData.getArtifacts() != null) {
-			buffer.append("{");
+			stringBuilder.append("{");
 
 			for (String artifactUUID:moduleMetaData.getArtifacts()) {
-				buffer.append(System.lineSeparator());
-				buffer.append(testNull(artifactUUID));
-				buffer.append(System.lineSeparator());
-				buffer.append(",");
+				stringBuilder.append(System.lineSeparator());
+				stringBuilder.append(testNull(artifactUUID));
+				stringBuilder.append(System.lineSeparator());
+				stringBuilder.append(",");
 			}
-			buffer.replace(buffer.length()-1,buffer.length(), System.lineSeparator());
-			buffer.append("}");
-			buffer.append(System.lineSeparator());
+			stringBuilder.replace(stringBuilder.length()-1,stringBuilder.length(), System.lineSeparator());
+			stringBuilder.append("}");
+			stringBuilder.append(System.lineSeparator());
 		} else {
-			buffer.append("NULL");
+			stringBuilder.append("NULL");
 		}
 
 		if (moduleMetaData.getProperties() != null) {
 			Map<String, String> vfModuleMap = moduleMetaData.getProperties();
-			buffer.append("Properties List:");
-			buffer.append("{");
+			stringBuilder.append("Properties List:");
+			stringBuilder.append("{");
 
 			for (Map.Entry<String, String> entry : vfModuleMap.entrySet()) {
-				buffer.append(System.lineSeparator());
-				buffer.append("  " + entry.getKey() + " : " + entry.getValue());
+				stringBuilder.append(System.lineSeparator());
+				stringBuilder.append("  ").append(entry.getKey()).append(" : ").append(entry.getValue());
 			}
-			buffer.replace(buffer.length()-1,buffer.length(), System.lineSeparator());
-			buffer.append("}");
-			buffer.append(System.lineSeparator());
+			stringBuilder.replace(stringBuilder.length()-1,stringBuilder.length(), System.lineSeparator());
+			stringBuilder.append("}");
+			stringBuilder.append(System.lineSeparator());
 		} else {
-			buffer.append("NULL");
+			stringBuilder.append("NULL");
 		}
 
 
-		buffer.append(System.lineSeparator());
+		stringBuilder.append(System.lineSeparator());
 
-		buffer.append("isBase:");
-		buffer.append(moduleMetaData.isBase());
-		buffer.append(System.lineSeparator());
+		stringBuilder.append("isBase:");
+		stringBuilder.append(moduleMetaData.isBase());
+		stringBuilder.append(System.lineSeparator());
 
-		return buffer.toString();
+		return stringBuilder.toString();
 	}
 
 	private static String testNull(Object object) {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
index c3912b48bc..8a9cb955b0 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
@@ -106,9 +106,9 @@ public class MsoRequest {
     @Override
     public String toString() {
         StringBuilder request = new StringBuilder();
-        request.append("<requestId>"+requestId+"</requestId>");
+        request.append("<requestId>").append(requestId).append("</requestId>");
         request.append('\n');
-        request.append("<serviceInstanceId>"+serviceInstanceId+"</serviceInstanceId>");
+        request.append("<serviceInstanceId>").append(serviceInstanceId).append("</serviceInstanceId>");
         return request.toString();
     }
 
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
index 584ccda1ac..9c79df85ff 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
@@ -240,7 +240,8 @@ public class HealthCheckHandler  {
         //now create a soap request message as follows:
         final StringBuilder payload = new StringBuilder();
         payload.append("\n");
-        payload.append("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:req=\"" + adapterNamespace + "/requestsdb\">\n");
+        payload.append("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:req=\"")
+            .append(adapterNamespace).append("/requestsdb\">\n");
         payload.append("<soapenv:Header/>\n");
         payload.append("<soapenv:Body>\n");
         payload.append("<req:getSiteStatus>\n");
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
index fbfe226a30..f5b9f8dc56 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
@@ -155,7 +155,7 @@ public final class XmlTool {
 				out.append("&amp;");
 				modified = true;
 			} else if (c < 32 || c > 126) {
-				out.append("&#" + (int)c + ";");
+				out.append("&#").append((int) c).append(";");
 				modified = true;
 			} else {
 				out.append(c);
@@ -199,7 +199,7 @@ public final class XmlTool {
 				out.append("&amp;");
 				modified = true;
 			} else if (c < 32 || c > 126) {
-				out.append("&#" + (int)c + ";");
+				out.append("&#").append((int) c).append(";");
 				modified = true;
 			} else {
 				out.append(c);
diff --git a/common/src/main/java/org/openecomp/mso/logger/MsoLoggingServlet.java b/common/src/main/java/org/openecomp/mso/logger/MsoLoggingServlet.java
index 5687775048..dd42efbfda 100644
--- a/common/src/main/java/org/openecomp/mso/logger/MsoLoggingServlet.java
+++ b/common/src/main/java/org/openecomp/mso/logger/MsoLoggingServlet.java
@@ -95,7 +95,8 @@ public class MsoLoggingServlet {
 		List <Logger> loggerList = context.getLoggerList();
         for (Logger logger:loggerList) {
         	//if (logger.getLevel() != null) {
-        		response.append (logger.getName () + ":" + logger.getLevel () + " (" + logger.getEffectiveLevel () + ")\n");
+        		response.append(logger.getName()).append(":").append(logger.getLevel()).append(" (")
+                    .append(logger.getEffectiveLevel()).append(")\n");
         	//}
         }
         return Response.status (200).entity (response).build ();
diff --git a/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java b/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java
index cf69e1c5a7..8da155fe08 100644
--- a/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java
+++ b/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java
@@ -160,8 +160,8 @@ public class MsoJsonProperties extends AbstractMsoProperties {
 	@Override
 	public String toString() {
 		StringBuilder response = new StringBuilder();
-		response.append("Config file " + propertiesFileName + "(Timer:" + automaticRefreshInMinutes + "mins):"
-				+ System.getProperty("line.separator"));
+		response.append("Config file ").append(propertiesFileName).append("(Timer:").append(automaticRefreshInMinutes)
+            .append("mins):").append(System.getProperty("line.separator"));
 		response.append(this.jsonRootNode.toString());
 		response.append(System.getProperty("line.separator"));
 		response.append(System.getProperty("line.separator"));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
index 891b0b27fb..2207bd7c38 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
@@ -3464,7 +3464,7 @@ public class CatalogDatabase implements Closeable {
                 	StringBuilder sb = new StringBuilder("Parameters: ");
                     for (HeatTemplateParam param : paramSet) {
                         param.setHeatTemplateArtifactUuid(heat.getArtifactUuid());
-                        sb.append(param.getParamName() + ", ");
+                        sb.append(param.getParamName()).append(", ");
                     }
                     LOGGER.debug(sb.toString());
                     heat.setParameters (paramSet);
@@ -4883,7 +4883,7 @@ public class CatalogDatabase implements Closeable {
         StringBuilder sb = new StringBuilder();
         if (variables != null) {
         	for(Map.Entry<String, String> entry : variables.entrySet()){
-        		sb.append(entry.getKey() + "=" + entry.getValue() + "\n");
+        		sb.append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
         		query.setParameter(entry.getKey(), entry.getValue());
         	}
         }
@@ -4934,7 +4934,7 @@ public class CatalogDatabase implements Closeable {
         StringBuilder sb = new StringBuilder();
         if (variables != null) {
         	for(Map.Entry<String, String> entry : variables.entrySet()){
-        		sb.append(entry.getKey() + "=" + entry.getValue()+ "\n");
+        		sb.append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
         		query.setParameter(entry.getKey(), entry.getValue());
         	}
         }
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
index dd628bb863..fcd9211ec6 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
@@ -88,7 +88,7 @@ public class HeatEnvironment extends MavenLikeVersioning implements Serializable
     @Override
 	public String toString () {
 		StringBuilder sb = new StringBuilder();
-		sb.append ("Artifact UUID=" + this.artifactUuid);
+		sb.append("Artifact UUID=").append(this.artifactUuid);
         sb.append (", name=");
         sb.append (name);
         sb.append (", version=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
index b90578d369..ec429c896e 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
@@ -103,23 +103,23 @@ public class HeatFiles extends MavenLikeVersioning implements Serializable {
 	@Override
 	public String toString () {
 		StringBuilder sb = new StringBuilder();
-		sb.append ("artifactUuid=" + this.artifactUuid);
+		sb.append("artifactUuid=").append(this.artifactUuid);
 		if (this.description == null) {
 			sb.append(", description=null");
 		} else {
-			sb.append(", description=" + this.description);
+			sb.append(", description=").append(this.description);
 		}
 		if (this.fileName == null) {
 			sb.append(", fileName=null");
 		} else {
-			sb.append(",fileName=" + this.fileName);
+			sb.append(",fileName=").append(this.fileName);
 		}
 		if (this.fileBody == null) {
 			sb.append(", fileBody=null");
 		} else {
-			sb.append(",fileBody=" + this.fileBody);
+			sb.append(",fileBody=").append(this.fileBody);
 		}
-		sb.append(", artifactChecksum=" + this.artifactChecksum);
+		sb.append(", artifactChecksum=").append(this.artifactChecksum);
 		if (created != null) {
 	        sb.append (",created=");
 	        sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
index eec0f410c6..df067445f6 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
@@ -61,12 +61,12 @@ public class HeatNestedTemplate implements Serializable {
     @Override
     public String toString () {
         StringBuilder sb = new StringBuilder ();
-        sb.append ("ParentTemplateId=" + this.parentTemplateId);
-        sb.append (", ChildTemplateId=" + this.childTemplateId);
+        sb.append("ParentTemplateId=").append(this.parentTemplateId);
+        sb.append(", ChildTemplateId=").append(this.childTemplateId);
         if (this.providerResourceFile == null) {
             sb.append (", providerResourceFile=null");
         } else {
-            sb.append (",providerResourceFile=" + this.providerResourceFile);
+            sb.append(",providerResourceFile=").append(this.providerResourceFile);
         }
         return sb.toString ();
     }
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
index 2c79d7d48c..54acf12ca8 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
@@ -48,8 +48,8 @@ public class HeatTemplateArtifactUuidModelUuid implements Serializable {
 	@Override

 	public String toString() {

 		StringBuilder sb = new StringBuilder();

-		sb.append("heatTemplateArtifactUuid=" + this.heatTemplateArtifactUuid);

-		sb.append(" modelUuid=" + this.modelUuid);

+		sb.append("heatTemplateArtifactUuid=").append(this.heatTemplateArtifactUuid);

+		sb.append(" modelUuid=").append(this.modelUuid);

 		return sb.toString();

 	}

 	

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
index 77beeb71df..96e6c616bf 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
@@ -185,13 +185,13 @@ public class Model extends MavenLikeVersioning implements Serializable {
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("Model: ");
-		sb.append("modelCustomizationId=" + modelCustomizationId);
-		sb.append(",modelCustomizationName=" + modelCustomizationName);
-		sb.append(",modelInvariantId=" + modelInvariantId);
-		sb.append(",modelName=" + modelName);
-		sb.append(",modelType=" + modelType);
-		sb.append(",modelVersion=" + modelVersion);
-		sb.append(",modelVersionId=" + modelVersionId);
+		sb.append("modelCustomizationId=").append(modelCustomizationId);
+		sb.append(",modelCustomizationName=").append(modelCustomizationName);
+		sb.append(",modelInvariantId=").append(modelInvariantId);
+		sb.append(",modelName=").append(modelName);
+		sb.append(",modelType=").append(modelType);
+		sb.append(",modelVersion=").append(modelVersion);
+		sb.append(",modelVersionId=").append(modelVersionId);
         if (created != null) {
 	        sb.append (",created=");
 	        sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
index fddea4791b..7f8c3dbacb 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
@@ -169,12 +169,12 @@ public class ModelRecipe extends MavenLikeVersioning implements Serializable {
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("ModelRecipe: ");
-		sb.append("modelId=" + modelId.toString());
-		sb.append(",action=" + action);
-		sb.append(",schemaVersion=" + schemaVersion);
-		sb.append(",orchestrationUri=" + orchestrationUri);
-		sb.append(",modelParamXSD=" + modelParamXSD);
-		sb.append(",recipeTimeout=" + recipeTimeout.toString());
+		sb.append("modelId=").append(modelId.toString());
+		sb.append(",action=").append(action);
+		sb.append(",schemaVersion=").append(schemaVersion);
+		sb.append(",orchestrationUri=").append(orchestrationUri);
+		sb.append(",modelParamXSD=").append(modelParamXSD);
+		sb.append(",recipeTimeout=").append(recipeTimeout.toString());
         if (created != null) {
 	        sb.append (",created=");
 	        sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
index 9ef1fb6fd3..f25a99ca2d 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
@@ -47,8 +47,8 @@ public class NetworkRecipe extends Recipe implements Serializable {
 	public String toString () {
 		StringBuilder sb = new StringBuilder();
 		sb.append(super.toString());
-		sb.append (",modelName=" + modelName);
-		sb.append (",networkParamXSD=" + networkParamXSD);
+		sb.append(",modelName=").append(modelName);
+		sb.append(",networkParamXSD=").append(networkParamXSD);
 		return sb.toString();
 	}
 }
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
index 668f666fcd..a425c1e96a 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
@@ -103,8 +103,8 @@ public class Recipe extends MavenLikeVersioning implements Serializable {
 	@Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("RECIPE: " + action);
-        sb.append(",uri=" + orchestrationUri);
+        sb.append("RECIPE: ").append(action);
+        sb.append(",uri=").append(orchestrationUri);
     	
         if (created != null) {
 	        sb.append (",created=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
index beb021ac11..f518678b44 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
@@ -150,14 +150,17 @@ public class Service extends MavenLikeVersioning implements Serializable {
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("SERVICE: name=" + modelName + ",modelVersion=" + modelVersion + ",description=" + description+",modelInvariantUUID="+modelInvariantUUID+",toscaCsarArtifactUUID="+toscaCsarArtifactUUID+",serviceType="+serviceType+",serviceRole="+serviceRole);
+		sb.append("SERVICE: name=").append(modelName).append(",modelVersion=").append(modelVersion)
+            .append(",description=").append(description).append(",modelInvariantUUID=").append(modelInvariantUUID)
+            .append(",toscaCsarArtifactUUID=").append(toscaCsarArtifactUUID).append(",serviceType=").append(serviceType)
+            .append(",serviceRole=").append(serviceRole);
 		for (String recipeAction : recipes.keySet()) {
 			ServiceRecipe recipe = recipes.get(recipeAction);
-			sb.append ("\n" + recipe.toString());
+			sb.append("\n").append(recipe.toString());
 		}
 		
 		for(ServiceToResourceCustomization serviceResourceCustomization : serviceResourceCustomizations) {
-			sb.append("\n" + serviceResourceCustomization.toString());
+			sb.append("\n").append(serviceResourceCustomization.toString());
 		}
 		if (created != null) {
 		        sb.append (",created=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
index d4d0507f20..645626d125 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
@@ -129,7 +129,7 @@ public class ServiceMacroHolder implements Serializable {
 		StringBuilder sb = new StringBuilder();
 		sb.append("ServicePlus: ");
 		if (this.service != null) {
-			sb.append("service: " + this.service.toString());
+			sb.append("service: ").append(this.service.toString());
 		} else {
 			sb.append("service: null");
 		}
@@ -137,7 +137,7 @@ public class ServiceMacroHolder implements Serializable {
 			int i=0;
 			sb.append("VnfResources: ");
 			for (VnfResourceCustomization vrc : this.vnfResourceCustomizations) {
-				sb.append(", vnfResourceCustomization[" + i++ + "]:" + vrc.toString());
+				sb.append(", vnfResourceCustomization[").append(i++).append("]:").append(vrc.toString());
 			}
 		} else {
 			sb.append("none");
@@ -146,7 +146,7 @@ public class ServiceMacroHolder implements Serializable {
 			int i=0;
 			sb.append("VnfResources: ");
 			for (VnfResource vr : this.vnfResources) {
-				sb.append(", vnfResource[" + i++ + "]:" + vr.toString());
+				sb.append(", vnfResource[").append(i++).append("]:").append(vr.toString());
 			}
 		} else {
 			sb.append("none");
@@ -155,14 +155,14 @@ public class ServiceMacroHolder implements Serializable {
 			int i=0;
 			sb.append("NetworkResourceCustomizations:");
 			for (NetworkResourceCustomization nrc : this.networkResourceCustomizations) {
-				sb.append("NRC[" + i++ + "]: " + nrc.toString());
+				sb.append("NRC[").append(i++).append("]: ").append(nrc.toString());
 			}
 		}
 		if (this.allottedResourceCustomizations != null && this.allottedResourceCustomizations.size() > 0) {
 			int i=0;
 			sb.append("AllottedResourceCustomizations:");
 			for (AllottedResourceCustomization arc : this.allottedResourceCustomizations) {
-				sb.append("ARC[" + i++ + "]: " + arc.toString());
+				sb.append("ARC[").append(i++).append("]: ").append(arc.toString());
 			}
 		}
 
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
index 3a3cc0aa69..303570a8d0 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
@@ -139,8 +139,8 @@ public class ServiceRecipe extends MavenLikeVersioning implements Serializable {
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("RECIPE: " + action);
-		sb.append(",uri=" + orchestrationUri);
+		sb.append("RECIPE: ").append(action);
+		sb.append(",uri=").append(orchestrationUri);
         if (created != null) {
 	        sb.append (",created=");
 	        sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
index f076e13e26..a380a58c6b 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
@@ -85,8 +85,8 @@ public class ServiceToNetworks implements Serializable {
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("ServiceToNetworks mapping: ");
-		sb.append("serviceModelUuid=" + this.serviceModelUuid);
-		sb.append(",networkModelCustomizationUuid=" + networkModelCustomizationUuid);
+		sb.append("serviceModelUuid=").append(this.serviceModelUuid);
+		sb.append(",networkModelCustomizationUuid=").append(networkModelCustomizationUuid);
 		return sb.toString();
 	}
 
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
index fcd20ef963..6d74ab38aa 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
@@ -99,7 +99,8 @@ public class ServiceToResourceCustomization implements Serializable {
 	@Override

 	public String toString() {

 		StringBuilder sb = new StringBuilder();

-		sb.append("ServiceToResourceCustomization: modelType=" + modelType + ",serviceModelUUID=" + serviceModelUUID+",resourceModelCustomizationUUID="+resourceModelCustomizationUUID);

+		sb.append("ServiceToResourceCustomization: modelType=").append(modelType).append(",serviceModelUUID=")

+            .append(serviceModelUUID).append(",resourceModelCustomizationUUID=").append(resourceModelCustomizationUUID);

 		if (created != null) {

 		        sb.append (",created=");

 		        sb.append (DateFormat.getInstance().format(created));

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
index 20801c105e..783fc2df30 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
@@ -66,10 +66,10 @@ public class TempNetworkHeatTemplateLookup implements Serializable {
 	@Override

 	public String toString() {

 		StringBuilder sb = new StringBuilder();

-		sb.append("NetworkResourceModelName=" + this.networkResourceModelName);

-		sb.append("HeatTemplateArtifactUuid=" + this.heatTemplateArtifactUuid);

-		sb.append("aicVersionMin=" + this.aicVersionMin);

-		sb.append("aicVersionMax=" + this.aicVersionMax);

+		sb.append("NetworkResourceModelName=").append(this.networkResourceModelName);

+		sb.append("HeatTemplateArtifactUuid=").append(this.heatTemplateArtifactUuid);

+		sb.append("aicVersionMin=").append(this.aicVersionMin);

+		sb.append("aicVersionMax=").append(this.aicVersionMax);

 		return sb.toString();

 	}

     @Override

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
index 88a358d364..591e648a33 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
@@ -100,9 +100,11 @@ public class ToscaCsar extends MavenLikeVersioning implements Serializable {
 	@Override

 	public String toString() {

 		StringBuilder sb = new StringBuilder();

-		sb.append("TOSCACSAR: artifactUUID=" + artifactUUID + ",name=" + name + ",version=" + version + ",description=" + description+",artifactChecksum="+artifactChecksum+",url="+url);

+		sb.append("TOSCACSAR: artifactUUID=").append(artifactUUID).append(",name=").append(name).append(",version=")

+            .append(version).append(",description=").append(description).append(",artifactChecksum=")

+            .append(artifactChecksum).append(",url=").append(url);

 		for (Service service : services) {

-			sb.append ("\n" + service.toString());

+			sb.append("\n").append(service.toString());

 		}

 		if (created != null) {

 		        sb.append (",created=");

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
index 4404834585..9f2dae5035 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
@@ -112,16 +112,16 @@ public class VfModuleCustomization implements Serializable {
 	@Override

 	public String toString() {

 		StringBuilder sb = new StringBuilder();

-		sb.append("modelCustomizationUuid=" + this.modelCustomizationUuid);

-		sb.append("vfModuleModelUuid=" + this.vfModuleModelUuid);

-		sb.append("label=" + this.label);

-		sb.append("initalCount=" + this.initialCount);

-		sb.append("minInstances=" + this.minInstances);

-		sb.append("maxInstances=" + this.maxInstances);

-		sb.append("availabilityZoneCount=" + this.availabilityZoneCount);

-		sb.append("heatEnvironmentArtifactUuid=" + this.heatEnvironmentArtifactUuid);

-		sb.append("volEnvironmentArtifactUuid=" + this.volEnvironmentArtifactUuid);

-		sb.append("created=" + this.created);

+		sb.append("modelCustomizationUuid=").append(this.modelCustomizationUuid);

+		sb.append("vfModuleModelUuid=").append(this.vfModuleModelUuid);

+		sb.append("label=").append(this.label);

+		sb.append("initalCount=").append(this.initialCount);

+		sb.append("minInstances=").append(this.minInstances);

+		sb.append("maxInstances=").append(this.maxInstances);

+		sb.append("availabilityZoneCount=").append(this.availabilityZoneCount);

+		sb.append("heatEnvironmentArtifactUuid=").append(this.heatEnvironmentArtifactUuid);

+		sb.append("volEnvironmentArtifactUuid=").append(this.volEnvironmentArtifactUuid);

+		sb.append("created=").append(this.created);

 		return sb.toString();

 	}

     @Override

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
index 63395c215c..476283e6b0 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
@@ -50,8 +50,8 @@ public class VfModuleToHeatFiles implements Serializable {
     @Override
     public String toString () {
         StringBuilder sb = new StringBuilder ();
-        sb.append ("vfModuleModelUuid=" + this.vfModuleModelUuid);
-        sb.append (", heatFilesArtifactUuid=" + this.heatFilesArtifactUuid);
+        sb.append("vfModuleModelUuid=").append(this.vfModuleModelUuid);
+        sb.append(", heatFilesArtifactUuid=").append(this.heatFilesArtifactUuid);
         return sb.toString ();
     }
 
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
index 8db4902cd8..e1795e1b04 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
@@ -78,10 +78,10 @@ public class VnfComponent implements Serializable {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("VnfComponent: ");
-        sb.append("vnfId=" + vnfId);
-        sb.append(",componentType=" + componentType);
-        sb.append(",heatTemplateId=" + heatTemplateId);
-        sb.append(",heatEnvironmentId=" + heatEnvironmentId);
+        sb.append("vnfId=").append(vnfId);
+        sb.append(",componentType=").append(componentType);
+        sb.append(",heatTemplateId=").append(heatTemplateId);
+        sb.append(",heatEnvironmentId=").append(heatEnvironmentId);
         
         if (created != null) {
 	        sb.append (",created=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
index 42d6b82f0f..8867170ba7 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
@@ -66,10 +66,10 @@ public class VnfComponentsRecipe extends Recipe implements Serializable {
 	public String toString () {
 		StringBuilder sb = new StringBuilder();
 		sb.append(super.toString());
-		sb.append (",vnfComponentParamXSD=" + vnfComponentParamXSD);
-		sb.append (",serviceType=" + getServiceType ());
-		sb.append (",vnfComponentType=" + getVnfComponentType ());
-		sb.append (",vfModuleId=" + getVfModuleModelUUId());
+		sb.append(",vnfComponentParamXSD=").append(vnfComponentParamXSD);
+		sb.append(",serviceType=").append(getServiceType());
+		sb.append(",vnfComponentType=").append(getVnfComponentType());
+		sb.append(",vfModuleId=").append(getVfModuleModelUUId());
 		return sb.toString();
 	}
 }
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
index 29e4b8909c..49865e8e9d 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
@@ -58,9 +58,9 @@ public class VnfRecipe extends Recipe implements Serializable {
 	public String toString () {
 		StringBuilder sb = new StringBuilder();
 		sb.append(super.toString());
-		sb.append (",vnfParamXSD=" + vnfParamXSD);
-		sb.append (",serviceType=" + getServiceType ());
-		sb.append (",vfModuleId=" + getVfModuleId ());
+		sb.append(",vnfParamXSD=").append(vnfParamXSD);
+		sb.append(",serviceType=").append(getServiceType());
+		sb.append(",vfModuleId=").append(getVfModuleId());
 		return sb.toString();
 	}
 }
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
index 9cd9f1ca78..7b2364d194 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
@@ -56,9 +56,9 @@ public class VnfResCustomToVfModuleCustom implements Serializable {
 	@Override

 	public String toString() {

 		StringBuilder sb = new StringBuilder();

-		sb.append("vnfResourceCustModelCustomizationUuid=" + this.vnfResourceCustModelCustomizationUuid);

-		sb.append("vfModuleCustModelCustomizationUuid=" + this.vfModuleCustModelCustomizationUuid);

-		sb.append("created=" + this.created);

+		sb.append("vnfResourceCustModelCustomizationUuid=").append(this.vnfResourceCustModelCustomizationUuid);

+		sb.append("vfModuleCustModelCustomizationUuid=").append(this.vfModuleCustModelCustomizationUuid);

+		sb.append("created=").append(this.created);

 		return sb.toString();

 	}

     @Override

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 37040d6a4e..f0b990acae 100644
--- 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
@@ -240,45 +240,45 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
 
 	@Override
 	public String toString () {
-		StringBuilder buf = new StringBuilder();
-
-		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();
     }
 
 }
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
index 8d580fd9a0..151c9e594e 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
@@ -180,18 +180,18 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder("VnfResourceCustomization: ");
-		sb.append("ModelCustUuid=" + this.modelCustomizationUuid ); 
-		sb.append(", ModelInstanceName=" + this.modelInstanceName);
-		sb.append(", vnfResourceModelUuid=" + this.vnfResourceModelUUID); 
-		sb.append(", creationTimestamp=" + this.created); 
-		sb.append(", minInstances=" + this.minInstances);
-		sb.append(", maxInstances=" + this.maxInstances);
-		sb.append(", availabilityZoneMaxCount=" + this.availabilityZoneMaxCount);
+		sb.append("ModelCustUuid=").append(this.modelCustomizationUuid);
+		sb.append(", ModelInstanceName=").append(this.modelInstanceName);
+		sb.append(", vnfResourceModelUuid=").append(this.vnfResourceModelUUID);
+		sb.append(", creationTimestamp=").append(this.created);
+		sb.append(", minInstances=").append(this.minInstances);
+		sb.append(", maxInstances=").append(this.maxInstances);
+		sb.append(", availabilityZoneMaxCount=").append(this.availabilityZoneMaxCount);
 //		sb.append(", vnfResource:\n" + this.vnfResource == null ? "null" : this.vnfResource.toString());
-		sb.append(", nfFunction=" + this.nfFunction); 
-		sb.append(", nfType=" + this.nfType);
-		sb.append(", nfRole=" + this.nfRole);
-		sb.append(", nfNamingCode=" + this.nfNamingCode);
+		sb.append(", nfFunction=").append(this.nfFunction);
+		sb.append(", nfType=").append(this.nfType);
+		sb.append(", nfRole=").append(this.nfRole);
+		sb.append(", nfNamingCode=").append(this.nfNamingCode);
 		
 		return sb.toString();
 	}