From a8dc9814f491649e59bcfa17039615cd71477db1 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Mon, 7 Mar 2022 12:44:23 +0000 Subject: Support property of type List> Signed-off-by: MichaelMorris Issue-ID: SDC-3898 Change-Id: Ifc9ea422e0eafcf84b5b7e47a9108f62925e2ea0 --- .../org/openecomp/sdc/be/model/tosca/validators/ListValidator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'catalog-model') diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/ListValidator.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/ListValidator.java index a069e25f91..20d927f483 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/ListValidator.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/ListValidator.java @@ -69,6 +69,9 @@ public class ListValidator implements PropertyTypeValidator { case JSON: innerValidator = ToscaPropertyType.JSON.getValidator(); break; + case MAP: + innerValidator = ToscaPropertyType.MAP.getValidator(); + break; default: log.debug("inner Tosca Type is unknown. {}", innerToscaType); return false; @@ -88,7 +91,7 @@ public class ListValidator implements PropertyTypeValidator { for (int i = 0; i < size; i++) { JsonElement currentValue = jo.get(i); String element = JsonUtils.toString(currentValue); - if (!innerValidator.isValid(element, null, allDataTypes)) { + if (!innerValidator.isValid(element, innerToscaType.equals(ToscaPropertyType.MAP)? ToscaPropertyType.STRING.getType(): null, allDataTypes)) { log.debug("validation of element : {} failed", element); return false; } -- cgit 1.2.3-korg