diff options
| author |   talio <tali.orenbach@amdocs.com> | 2019-06-05 16:11:11 +0300 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2019-06-06 08:43:50 +0000 |
| commit | a4c1c763eeb890ff8187eb28ab2bc00f2901f7ee (patch) | |
| tree | 92b38f6aae6a90bd11a24e6b293f7b88296af254 /catalog-be/src/main/java/org | |
| parent | 70cd3ef0d7d6b88a5de45ef0cf252d06e9e7b5c2 (diff) | |
Fix static list value issue
Change-Id: I976404e172aae756248cb4e3fe367e1c00c72168
Issue-ID: SDC-2355
Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'catalog-be/src/main/java/org')
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 { |