Merge "Removed the unused variables"

5 files changed, 7 insertions, 7 deletions

diff --git a/common/src/main/java/org/openecomp/mso/db/AbstractSessionFactoryManager.java b/common/src/main/java/org/openecomp/mso/db/AbstractSessionFactoryManager.java
index d639978770..2988e30254 100644
--- a/common/src/main/java/org/openecomp/mso/db/AbstractSessionFactoryManager.java
+++ b/common/src/main/java/org/openecomp/mso/db/AbstractSessionFactoryManager.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class AbstractSessionFactoryManager {
 
-    protected static Map<String, SessionFactory> sessionFactories = new ConcurrentHashMap<String, SessionFactory>();
+    protected static Map<String, SessionFactory> sessionFactories = new ConcurrentHashMap<>();
 
     protected synchronized SessionFactory initializeSessionFactory(URL hibernateConfigFile)
             throws MsoDatabaseException {
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 455620784d..dd628bb863 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
@@ -87,7 +87,7 @@ public class HeatEnvironment extends MavenLikeVersioning implements Serializable
 
     @Override
 	public String toString () {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append ("Artifact UUID=" + this.artifactUuid);
         sb.append (", name=");
         sb.append (name);
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 e38e598d57..b90578d369 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
@@ -82,10 +82,13 @@ public class HeatFiles extends MavenLikeVersioning implements Serializable {
 	public void setAsdcUuid(String artifactUuid) {
 		this.artifactUuid = artifactUuid;
 	}
+
+	@Override
 	public String getVersion() {
 		return version;
 	}
 
+	@Override
 	public void setVersion(String version) {
 		this.version = version;
 	}
@@ -99,7 +102,7 @@ public class HeatFiles extends MavenLikeVersioning implements Serializable {
 
 	@Override
 	public String toString () {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append ("artifactUuid=" + this.artifactUuid);
 		if (this.description == null) {
 			sb.append(", description=null");
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 d59f49a533..eec0f410c6 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
@@ -90,7 +90,7 @@ public class HeatNestedTemplate implements Serializable {
     public int hashCode () {
         // hash code does not have to be a unique result - only that two objects that should be treated as equal
         // return the same value. so this should work.
-        int result = 0;
+        int result;
         result = this.parentTemplateId.hashCode() + this.childTemplateId.hashCode();
         return result;
     }
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java
index b17fea460e..03813a7299 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java
@@ -26,14 +26,11 @@ import java.text.DateFormat;
 import java.util.Set;
 
 import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-import org.openecomp.mso.logger.MsoLogger;
 
 public class HeatTemplate extends MavenLikeVersioning implements Serializable {
 	
 	private static final long serialVersionUID = 768026109321305392L;
 
-    private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL);
-
     private String artifactUuid;
     private String templateName;
     private String templateBody = null;