Sonar code smells

Change-Id: Ia43e9d0ff3de1b02d259c5bb05678b4cc6eb8b9b
Issue-ID: SDC-1941
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

5 files changed, 11 insertions, 10 deletions

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java
index af3ecb4c08..e6863fa2b5 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/deserializers/RequirementDefinitionDeserializer.java
@@ -9,7 +9,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
-import org.onap.sdc.tosca.datatypes.model.RequirementDefinition;
 
 import java.lang.reflect.Type;
 import java.util.Objects;
@@ -24,8 +23,7 @@ public class RequirementDefinitionDeserializer implements JsonDeserializer<Requi
 
   @Override
   public RequirementDefinition deserialize(JsonElement jsonElement, Type type,
-                                           JsonDeserializationContext jsonDeserializationContext)
-      throws JsonParseException {
+                                           JsonDeserializationContext jsonDeserializationContext) {
 
     JsonObject jsonObject = jsonElement.getAsJsonObject();
 
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonSchemaDataGenerator.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonSchemaDataGenerator.java
index 84e4f6d7c9..2db691a781 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonSchemaDataGenerator.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonSchemaDataGenerator.java
@@ -32,7 +32,7 @@ public class JsonSchemaDataGenerator {
 
   private static final String ROOT = "root";
   private static final Logger logger =
-      (Logger) LoggerFactory.getLogger(JsonSchemaDataGenerator.class);
+      LoggerFactory.getLogger(JsonSchemaDataGenerator.class);
   boolean includeDefaults = true;
   private JSONObject root;
   private Map<String, Object> referencesData;
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/ErrorMessageCode.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/ErrorMessageCode.java
index a958d27740..e3b6f5fe6f 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/ErrorMessageCode.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/ErrorMessageCode.java
@@ -21,8 +21,12 @@ public final class ErrorMessageCode {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         ErrorMessageCode that = (ErrorMessageCode) o;
 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/errors/ErrorMessagesFormatBuilder.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/errors/ErrorMessagesFormatBuilder.java
index 0656b02089..bd5a2ccc3c 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/errors/ErrorMessagesFormatBuilder.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/errors/ErrorMessagesFormatBuilder.java
@@ -24,7 +24,7 @@ package org.openecomp.core.validation.errors;
 import org.openecomp.core.validation.ErrorMessageCode;
 
 public class ErrorMessagesFormatBuilder {
-  private static final String messagePattern = "[%s]: %s";
+  private static final String MESSAGE_PATTERN = "[%s]: %s";
 
   public static String getErrorWithParameters(String error, String... params) {
     return String.format(error, params);
@@ -42,7 +42,7 @@ public class ErrorMessagesFormatBuilder {
     String message = getErrorWithParameters(errorMessage, params);
 
     return ( null != messageCode && null != messageCode.getMessageCode() )  ?
-            String.format(messagePattern, messageCode.getMessageCode(), message) : message;
+            String.format(MESSAGE_PATTERN, messageCode.getMessageCode(), message) : message;
   }
 
 }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java
index 993ea6b4df..3bc760c805 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java
@@ -41,8 +41,7 @@ public class FileValidationContext {
   }
 
   public InputStream getContent() {
-    ByteArrayInputStream is = new ByteArrayInputStream(content);
-    return is;
+    return new ByteArrayInputStream(content);
   }
 
   public String getFileName() {