Fixed SONAR issues

Fixed blocker, critical, major & minor SONAR issues.

Issue-ID: SDC-343
Change-Id: I72e5a3a7fa7d7407a92f98f77e4334827f70f926
Signed-off-by: dd4616 <Divesh.Mirchandani@amdocs.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
index ddc1bb49b9..5297453369 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
@@ -55,7 +55,7 @@ import java.util.Objects;
 import java.util.Set;
 
 public class HeatValidator implements Validator {
-  public static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
+  public static final MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
   protected static Logger logger = (Logger) LoggerFactory.getLogger(HeatValidator.class);
 
   private static void validateAllRequiredArtifactsExist(String fileName,
@@ -244,7 +244,7 @@ public class HeatValidator implements Validator {
       if (CollectionUtils.isNotEmpty(parametersNames)) {
         for (Map.Entry<String, Object> envEntry : envContent.getParameters().entrySet()) {
           String envParameter = envEntry.getKey();
-          if (!parametersNames.contains(envParameter)) {
+          if (parametersNames != null && !parametersNames.contains(envParameter)) {
             globalContext.addMessage(envFile, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
                     .getErrorWithParameters(
                         Messages.ENV_INCLUDES_PARAMETER_NOT_IN_HEAT.getErrorMessage(), envFile,
@@ -278,7 +278,7 @@ public class HeatValidator implements Validator {
     Map<String, Parameter> parametersMap = heatOrchestrationTemplate.getParameters() == null ? null
         : heatOrchestrationTemplate.getParameters();
 
-    if (MapUtils.isNotEmpty(parametersMap)) {
+    if (parametersMap != null && MapUtils.isNotEmpty(parametersMap)) {
       for (Map.Entry<String, Parameter> parameterEntry : parametersMap.entrySet()) {
         Parameter parameter = parameterEntry.getValue();
         String parameterType = parameter.getType();
@@ -343,6 +343,7 @@ public class HeatValidator implements Validator {
     try {
       manifestContent = ValidationUtil.checkValidationPreCondition(globalContext);
     } catch (Exception exception) {
+      logger.debug("",exception);
       return;
     }
     String baseFileName;
@@ -370,7 +371,8 @@ public class HeatValidator implements Validator {
     Set<String> manifestArtifacts = ManifestUtil.getArtifacts(manifestContent);
 
     globalContext.getFiles().stream()
-        .filter(fileName -> manifestArtifacts.contains(fileName) && !artifacts.contains(fileName))
+        .filter(fileName -> isManifestArtifact(manifestArtifacts, fileName) &&
+            isNotArtifact(artifacts, fileName))
         .forEach(fileName -> globalContext.addMessage(fileName, ErrorLevel.WARNING,
             Messages.ARTIFACT_FILE_NOT_REFERENCED.getErrorMessage(),
             LoggerTragetServiceName.CHECK_FOR_ORPHAN_ARTIFACTS,
@@ -380,6 +382,14 @@ public class HeatValidator implements Validator {
 
   }
 
+  private boolean isManifestArtifact(Set<String> manifestArtifacts, String fileName) {
+    return manifestArtifacts.contains(fileName);
+  }
+
+  private boolean isNotArtifact(Set<String> artifacts, String fileName) {
+    return !artifacts.contains(fileName);
+  }
+
   private void validate(String fileName, String envFileName, String baseFileName,
                         Set<String> artifacts, Set<String> securityGroupsNamesFromBaseFileOutputs,
                         GlobalValidationContext globalContext) {