From 32d8a1dba11780a622b337e77830f9095f0767ee Mon Sep 17 00:00:00 2001 From: JvD_Ericsson Date: Mon, 29 May 2023 09:48:42 +0100 Subject: Fix various bugs related to tosca custom functions Issue-ID: SDC-4512 Signed-off-by: JvD_Ericsson Change-Id: Ia501b124ddf0c77c97ca0c14bbaa18be39b8f631 --- .../datatypes/elements/ToscaFunctionJsonDeserializer.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'common-be/src/main/java') diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java index f77c6f949b..e234a4666f 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java @@ -37,6 +37,7 @@ import org.openecomp.sdc.be.datatypes.enums.PropertySource; import org.openecomp.sdc.be.datatypes.tosca.ToscaGetFunctionType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.util.CollectionUtils; import org.yaml.snakeyaml.Yaml; public class ToscaFunctionJsonDeserializer extends StdDeserializer { @@ -150,23 +151,25 @@ public class ToscaFunctionJsonDeserializer extends StdDeserializer getNumberAsTextOrElseNull(final JsonNode node, final String fieldName, final DeserializationContext context) throws JsonMappingException{ + private List getNumberAsTextOrElseNull(final JsonNode node, final String fieldName, final DeserializationContext context) + throws JsonMappingException { List toscaIndexList = new ArrayList(); final JsonNode jsonNode = node.get(fieldName); if (jsonNode != null) { if (!jsonNode.isArray()) { throw context.instantiationException(ToscaGetFunctionDataDefinition.class, "Expecting an array for toscaIndexList attribute"); } - for (int index=0;index customFunctions = ConfigurationManager.getConfigurationManager().getConfiguration().getDefaultCustomToscaFunctions(); - if (customFunctions.isEmpty()) { + if (CollectionUtils.isEmpty(customFunctions)) { return ToscaFunctionType.CUSTOM; } Optional optionalFunc = customFunctions.stream().filter(func -> func.getName().equals(name)).findFirst(); -- cgit 1.2.3-korg