From df1d6ebebe45708040048abc33aebb8980a0c9f2 Mon Sep 17 00:00:00 2001 From: franciscovila Date: Tue, 20 Jun 2023 10:38:45 +0100 Subject: Support custom tosca functions in operation input values Issue-ID: SDC-4545 Signed-off-by: franciscovila Change-Id: Icd466d4e2e1d2136f6e41b5c345e9244d5f295f6 --- .../be/components/impl/ServiceImportBusinessLogic.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'catalog-be') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java index 7d2f8c3170..b6a7fccff4 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java @@ -2296,13 +2296,17 @@ public class ServiceImportBusinessLogic { //Inputs ListDataDefinition instanceInputs = instanceOperation.getInputs(); mergeOperationInputDefinitions(templateOperation.getInputs(), instanceInputs); - component.getProperties() - .forEach(property -> instanceInputs.getListToscaDataDefinition().stream() - .filter(instanceInput -> instanceInput.getToscaFunction() instanceof ToscaGetFunctionDataDefinition && - property.getName().equals(instanceInput.getToscaFunction() != null ? - ((ToscaGetFunctionDataDefinition) instanceInput.getToscaFunction()).getPropertyName() : null)) - .forEach(oldInput -> oldInput.setType(property.getType())) - ); + if (null != instanceInputs) { + component.getProperties() + .forEach(property -> instanceInputs.getListToscaDataDefinition().stream() + .filter(instanceInput -> + instanceInput.getToscaFunction() instanceof ToscaGetFunctionDataDefinition && + property.getName().equals(instanceInput.getToscaFunction() != null ? + ((ToscaGetFunctionDataDefinition) instanceInput.getToscaFunction()).getPropertyName() : + null)) + .forEach(oldInput -> oldInput.setType(property.getType())) + ); + } templateOperation.setInputs(instanceInputs); //Implementation templateOperation.setImplementation(instanceOperation.getImplementation()); -- cgit 1.2.3-korg