From 56288ac75d57367587442043743879b8649055ac Mon Sep 17 00:00:00 2001 From: franciscovila Date: Thu, 1 Jun 2023 07:59:31 +0100 Subject: Fix different issues when adding properties Issue-ID: SDC-4522 Signed-off-by: franciscovila Change-Id: I6408570e5a3b571f3222f31ae30910061736a6c9 --- .../utils/PropertyValueConstraintValidationUtil.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'catalog-be/src') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java index 74cf8eb43f..fcaa840832 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/PropertyValueConstraintValidationUtil.java @@ -183,7 +183,8 @@ public class PropertyValueConstraintValidationUtil { List propertyDefinitions = dataTypeDefinitionCache.get(propertyDefinition.getType()).getProperties(); try { Map valueMap = MapUtils - .emptyIfNull(ConstraintUtil.parseToCollection(propertyDefinition.getValue(), new TypeReference<>() { + .emptyIfNull(ConstraintUtil.parseToCollection(null != propertyDefinition.getValue() ? + propertyDefinition.getValue() : propertyDefinition.getDefaultValue(), new TypeReference<>() { })); if (CollectionUtils.isEmpty(propertyDefinitions)) { checkAndEvaluatePrimitiveProperty(propertyDefinition, dataTypeDefinitionCache.get(propertyDefinition.getType())); @@ -252,7 +253,8 @@ public class PropertyValueConstraintValidationUtil { return CollectionUtils.isNotEmpty(list); } else { Map valueMap = MapUtils - .emptyIfNull(ConstraintUtil.parseToCollection(propertyDefinition.getValue(), new TypeReference<>() { + .emptyIfNull(ConstraintUtil.parseToCollection(null != propertyDefinition.getValue() ? + propertyDefinition.getValue() : propertyDefinition.getDefaultValue(), new TypeReference<>() { })); return MapUtils.isNotEmpty(valueMap); } @@ -295,11 +297,11 @@ public class PropertyValueConstraintValidationUtil { .forEach(propertyConstraint -> { try { if (ToscaType.LIST == toscaPropertyType1) { - Collection list = ConstraintUtil.parseToCollection(propertyDefinition.getValue(), new TypeReference<>() { + Collection list = ConstraintUtil.parseToCollection(null != propertyDefinition.getValue() ? propertyDefinition.getValue() : propertyDefinition.getDefaultValue(), new TypeReference<>() { }); propertyConstraint.validate(list); } else if (ToscaType.MAP == toscaPropertyType1) { - final Map map = ConstraintUtil.parseToCollection(propertyDefinition.getValue(), new TypeReference<>() { + final Map map = ConstraintUtil.parseToCollection(null != propertyDefinition.getValue() ? propertyDefinition.getValue() : propertyDefinition.getDefaultValue(), new TypeReference<>() { }); propertyConstraint.validate(map); } @@ -353,7 +355,8 @@ public class PropertyValueConstraintValidationUtil { if (propertyDefinition.getSchemaType() == null) { propertyDefinition.setSchema(createStringSchema()); } - final Map map = ConstraintUtil.parseToCollection(propertyDefinition.getValue(), new TypeReference<>() { + final Map map = ConstraintUtil.parseToCollection(null != propertyDefinition.getValue() ? + propertyDefinition.getValue() : propertyDefinition.getDefaultValue(), new TypeReference<>() { }); evaluateCollectionType(propertyDefinition, map); } catch (ConstraintValueDoNotMatchPropertyTypeException e) { -- cgit 1.2.3-korg