From: franciscovila <javier.paradela.vila@est.tech>
Date: Wed, 12 Jan 2022 14:03:15 +0000 (+0000)
Subject: Fix use of Optional in TranslatorHeatToToscaParameterConverter
X-Git-Tag: 1.10.1~28
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F126574%2F2;p=sdc.git

Fix use of Optional in TranslatorHeatToToscaParameterConverter

Checking the Optionals are present before getting
their values in the TranslatorHeatToToscaParameterConverter class

Issue-ID: SDC-3833
Signed-off-by: franciscovila <javier.paradela.vila@est.tech>
Change-Id: I6721c028c420734f3a02f78468e4b22acbfb5be8
---

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
index 64915a0af7..9361b33e65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
@@ -233,7 +233,7 @@ public class TranslatorHeatToToscaParameterConverter {
                 FunctionTranslator functionTranslator = new FunctionTranslator(
                     getFunctionTranslateTo(serviceTemplate, null, heatFileName, heatOrchestrationTemplate, context), parameterName,
                     functionMapEntry.getValue(), null);
-                return FunctionTranslationFactory.getInstance(functionMapEntry.getKey()).get().translateFunction(functionTranslator);
+                return FunctionTranslationFactory.getInstance(functionMapEntry.getKey()).isPresent() ? FunctionTranslationFactory.getInstance(functionMapEntry.getKey()).get().translateFunction(functionTranslator) : paramValue;
             }
         }
         return paramValue;