diff options
| author |   MichaelMorris <michael.morris@est.tech> | 2022-05-05 23:18:00 +0100 |
|---|---|---|
| committer |   Vasyl Razinkov <vasyl.razinkov@est.tech> | 2022-05-09 12:19:59 +0000 |
| commit | 9f25403b73e8c66d0c0d9f3e8b05d8b5069bb783 (patch) | |
| tree | 3a86c0263cc11933ce7dc139a4cc0b8004f543b5 /catalog-model | |
| parent | 6140bdb1768134828d68d02c392c0cade6739d3b (diff) | |
Fix property validation for data type in model
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3990
Change-Id: I702960519cd9ef6ff7a905d837de7ca5b8f29599
Diffstat (limited to 'catalog-model')
2 files changed, 8 insertions, 1 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java index bf8d6aed15..931d5993ea 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java @@ -835,6 +835,13 @@ public class PropertyOperation extends AbstractOperation implements IPropertyOpe } return true; } + + public boolean isPropertyTypeValid(final IComplexDefaultValue property, final Map<String, DataTypeDefinition> dataTypes) { + if (property == null) { + return false; + } + return ToscaPropertyType.isValidType(property.getType()) != null || dataTypes.containsKey(property.getType()); + } @Override public ImmutablePair<String, Boolean> isPropertyInnerTypeValid(IComplexDefaultValue property, Map<String, DataTypeDefinition> dataTypes) { diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java index a3c9bca4e5..ff41d5dd02 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperationTest.java @@ -795,7 +795,7 @@ public class PropertyOperationTest extends ModelTestBase { // test 1 testSubject = createTestSubject(); property = null; - result = testSubject.isPropertyTypeValid(property, null); + result = testSubject.isPropertyTypeValid(property, (String)null); Assert.assertEquals(false, result); } |