From: shikha0203 <shivani.khare@est.tech>
Date: Wed, 22 Feb 2023 15:48:48 +0000 (+0000)
Subject: TranslationService- Add null test before using nullable values
X-Git-Tag: 1.12.3~27
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d1565b3fb250c084c86d4fb8a7b96f40f2cd23f9;p=sdc.git

TranslationService- Add null test before using nullable values

Issue-ID: SDC-4414
Signed-off-by: shikha0203 <shivani.khare@est.tech>
Change-Id: I7b80df4c650af677fb194d04dc6013adff08473b
---

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
index 97b572235c..bf37d9b420 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
@@ -155,15 +155,15 @@ public class TranslationService {
     public void translateHelmFile(ServiceTemplate serviceTemplate, FileData heatFileData, TranslationContext context) {
         String heatFileName = heatFileData.getFile();
         Map<String, ParameterDefinition> inputs = serviceTemplate.getTopology_template().getInputs();
-        if (!Objects.isNull(inputs)) {
+        if (Objects.nonNull(inputs)) {
             inputs.entrySet().forEach(stringParameterDefinitionEntry -> {
                 List inputParamVFModuleList = getVFModulesList(inputs.get(stringParameterDefinitionEntry.getKey()));
                 if (!inputParamVFModuleList.contains(FileUtils.getFileWithoutExtention(heatFileName))) {
                     inputParamVFModuleList.add(FileUtils.getFileWithoutExtention(heatFileName));
                 }
             });
+            inputs.putAll(inputs);
         }
-        inputs.putAll(inputs);
     }
 
     private void handleHeatPseudoParam(String heatFileName, ServiceTemplate serviceTemplate, TranslationContext context) {