fix NPE in extract

fix NPE when extracting components without images / flavors

Issue - Id : SDC-694

Change-Id: I3e4444132a40a2567833375ceea1951803dd16b0
Signed-off-by: talio <tali.orenbach@amdocs.com>

1 files changed, 3 insertions, 15 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
index f38b7e096a..e7ff3aa8ee 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
@@ -1,7 +1,6 @@
 package org.openecomp.core.impl;
 
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.openecomp.core.converter.ServiceTemplateReaderService;
 import org.openecomp.core.converter.ToscaConverter;
 import org.openecomp.core.converter.datatypes.Constants;
@@ -284,26 +283,15 @@ public class ToscaConverterImpl implements ToscaConverter {
                     entry.getKey(), entry.getValue(), ParameterDefinition.class);
 
             parameterDefinition.ifPresent(parameterDefinitionValue -> {
-                handleDefaultValue(entry.getValue(), parameterDefinition.get());
+                Optional<Object> defaultValue =
+                    ToscaConverterUtil.getDefaultValue(entry.getValue(), parameterDefinition.get());
+                defaultValue.ifPresent(parameterDefinitionValue::set_default);
                 addToServiceTemplateAccordingToSection(
                     serviceTemplate, inputsOrOutputs, entry.getKey(), parameterDefinition.get());
             } );
         }
     }
 
-    private void handleDefaultValue(Object entryValue,
-                                    ParameterDefinition parameterDefinition) {
-        if(!(entryValue instanceof Map)
-            || Objects.isNull(parameterDefinition)){
-            return;
-        }
-
-        Object defaultValue = ((Map) entryValue).get("default");
-        if(Objects.nonNull(defaultValue)) {
-            parameterDefinition.set_default(defaultValue);
-        }
-    }
-
     private void addToServiceTemplateAccordingToSection(ServiceTemplate serviceTemplate,
                                                         String inputsOrOutputs,
                                                         String parameterId,