diff options
Diffstat (limited to 'catalog-be/src')
2 files changed, 5 insertions, 4 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java index a586e23da7..cad9a92ab3 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java @@ -700,6 +700,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic { } else { PropertyDefinition propertyDefinition = new PropertyDefinition(); propertyDefinition.setType(operationInputDefinition.getType()); + propertyDefinition.setSchema(operationInputDefinition.getSchema()); propertyDefinition.setValue(value); propertyDefinition.setName(operationInputDefinition.getName()); 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 073e469c1e..72342e642f 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 @@ -106,13 +106,13 @@ public class PropertyValueConstraintValidationUtil { if (Objects.nonNull(propertyDefinition)) { if (ToscaType.isPrimitiveType(propertyDefinition.getType())) { propertyDefinition.setConstraints( - org.openecomp.sdc.be.dao.utils.CollectionUtils.merge(propertyDefinition.getConstraints(), - dataTypeDefinitionCache.get(propertyDefinition.getType()).getConstraints())); + org.openecomp.sdc.be.dao.utils.CollectionUtils.merge(propertyDefinition.safeGetConstraints(), + dataTypeDefinitionCache.get(propertyDefinition.getType()).safeGetConstraints())); evaluateConstraintsOnProperty(propertyDefinition); } else if (ToscaType.isCollectionType(propertyDefinition.getType())) { propertyDefinition.setConstraints( - org.openecomp.sdc.be.dao.utils.CollectionUtils.merge(propertyDefinition.getConstraints(), - dataTypeDefinitionCache.get(propertyDefinition.getType()).getConstraints())); + org.openecomp.sdc.be.dao.utils.CollectionUtils.merge(propertyDefinition.safeGetConstraints(), + dataTypeDefinitionCache.get(propertyDefinition.getType()).safeGetConstraints())); evaluateConstraintsOnProperty(propertyDefinition); evaluateCollectionTypeProperties(propertyDefinition); } else { |