1 files changed, 22 insertions, 21 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdNodeTemplateBlockParser.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdNodeTemplateBlockParser.java
index 5539840561..5d7a6049cd 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdNodeTemplateBlockParser.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/PnfdNodeTemplateBlockParser.java
@@ -27,12 +27,11 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.commons.collections.MapUtils;
 import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
-import org.openecomp.core.converter.pnfd.parser.AbstractPnfdBlockParser;
 import org.openecomp.core.converter.impl.pnfd.PnfdQueryExecutor;
+import org.openecomp.core.converter.impl.pnfd.strategy.CopyConversionStrategy;
 import org.openecomp.core.converter.pnfd.model.ConversionDefinition;
 import org.openecomp.core.converter.pnfd.model.ConversionQuery;
 import org.openecomp.core.converter.pnfd.model.Transformation;
-import org.openecomp.core.converter.impl.pnfd.strategy.CopyConversionStrategy;
 import org.openecomp.core.converter.pnfd.strategy.PnfdConversionStrategy;
 import org.openecomp.sdc.tosca.services.DataModelUtil;
 
@@ -44,7 +43,25 @@ public class PnfdNodeTemplateBlockParser extends AbstractPnfdBlockParser {
         super(transformation);
     }
 
-    public Optional<Map<String, Object>> buildParsedBlock(final Map<String, Object> attributeQuery,
+    @Override
+    protected Set<Map<String, Object>> findBlocksToParse() {
+        final ConversionQuery conversionQuery = transformation.getConversionQuery();
+        final Map<String, Object> nodeTemplateMap = templateFrom.getNodeTemplates();
+        if (MapUtils.isEmpty(nodeTemplateMap)) {
+            return Collections.emptySet();
+        }
+
+        return nodeTemplateMap.entrySet().stream()
+            .filter(mapEntry -> PnfdQueryExecutor.find(conversionQuery, mapEntry.getValue()))
+            .map(stringObjectEntry -> {
+                final Map<String, Object> map = new HashMap<>();
+                map.put(stringObjectEntry.getKey(), stringObjectEntry.getValue());
+                return map;
+            }).collect(Collectors.toSet());
+    }
+
+    @Override
+    protected Optional<Map<String, Object>> buildParsedBlock(final Map<String, Object> attributeQuery,
         final Map<String, Object> fromNodeTemplateAttributeMap,
         final ConversionDefinition conversionDefinition) {
         //cannot query for more than one attribute
@@ -57,7 +74,7 @@ public class PnfdNodeTemplateBlockParser extends AbstractPnfdBlockParser {
         if (queryValue == null) {
             PnfdConversionStrategy pnfdConversionStrategy = conversionDefinition.getPnfdConversionStrategy();
             if (isGetInputFunction(attributeValueToConvert)) {
-                inputNameToConvertMap.put(extractGetInputFunctionValue(attributeValueToConvert)
+                inputNameToConvertMap.put(extractObjectValue(attributeValueToConvert)
                     , conversionDefinition.getToGetInput()
                 );
                 pnfdConversionStrategy = new CopyConversionStrategy();
@@ -83,24 +100,8 @@ public class PnfdNodeTemplateBlockParser extends AbstractPnfdBlockParser {
         }
     }
 
-    protected Set<Map<String, Object>> findBlocksToParse() {
-        final ConversionQuery conversionQuery = transformation.getConversionQuery();
-        final Map<String, Object> nodeTemplateMap = templateFrom.getNodeTemplates();
-        if (MapUtils.isEmpty(nodeTemplateMap)) {
-            return Collections.emptySet();
-        }
-
-        return nodeTemplateMap.entrySet().stream()
-            .filter(mapEntry -> PnfdQueryExecutor.find(conversionQuery, mapEntry.getValue()))
-            .map(stringObjectEntry -> {
-                final Map<String, Object> map = new HashMap<>();
-                map.put(stringObjectEntry.getKey(), stringObjectEntry.getValue());
-                return map;
-            }).collect(Collectors.toSet());
-    }
-
     @Override
-    public void write(final String nodeTemplateName, final Map<String, Object> parsedNodeTemplateMap) {
+    protected void write(final String nodeTemplateName, final Map<String, Object> parsedNodeTemplateMap) {
         if (!parsedNodeTemplateMap.isEmpty()) {
             final NodeTemplate parsedNodeTemplate = NodeTemplateYamlParser.parse(parsedNodeTemplateMap);
             DataModelUtil.addNodeTemplate(templateTo, nodeTemplateName, parsedNodeTemplate);