Replace StringBuilder with String & inline return

Resolved merge conflicts

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

1 files changed, 10 insertions, 13 deletions

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 783fc2df30..3ef7e6e237 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
@@ -23,7 +23,7 @@ package org.openecomp.mso.db.catalog.beans;
 import java.io.Serializable;

 

 public class TempNetworkHeatTemplateLookup implements Serializable {

-	

+

 	private String networkResourceModelName;

 	private String heatTemplateArtifactUuid;

 	private String aicVersionMin;

@@ -33,14 +33,14 @@ public class TempNetworkHeatTemplateLookup implements Serializable {
 	public TempNetworkHeatTemplateLookup() {

 		super();

 	}

-	

+

 	public String getNetworkResourceModelName() {

 		return this.networkResourceModelName;

 	}

 	public void setNetworkResourceModelName(String networkResourceModelName) {

 		this.networkResourceModelName = networkResourceModelName;

 	}

-	

+

 	public String getHeatTemplateArtifactUuid() {

 		return this.heatTemplateArtifactUuid;

 	}

@@ -50,29 +50,26 @@ public class TempNetworkHeatTemplateLookup implements Serializable {
 	public String getAicVersionMin() {

 		return this.aicVersionMin;

 	}

-	

+

 	public void setAicVersionMin(String aicVersionMin) {

 		this.aicVersionMin = aicVersionMin;

 	}

-	

+

 	public String getAicVersionMax() {

 		return this.aicVersionMax;

 	}

-	

+

 	public void setAicVersionMax(String aicVersionMax) {

 		this.aicVersionMax = aicVersionMax;

 	}

 

 	@Override

 	public String toString() {

-		StringBuilder sb = new StringBuilder();

-		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();

+		return "NetworkResourceModelName=" + this.networkResourceModelName + "HeatTemplateArtifactUuid=" +

+			this.heatTemplateArtifactUuid + "aicVersionMin=" + this.aicVersionMin + "aicVersionMax=" + this.aicVersionMax;

 	}

-    @Override

+

+	@Override

     public boolean equals (Object o) {

         if (!(o instanceof TempNetworkHeatTemplateLookup)) {

             return false;