From d6f0e5ba491d94cf71486b86a14a17bb411a2a4b Mon Sep 17 00:00:00 2001 From: Ester Rotstein Date: Sun, 6 Aug 2017 10:04:42 +0300 Subject: [SDC-182] support nested properties with function Change-Id: I7c7dda4940010bd018880f76eb61eeb2de6d4fcc Signed-off-by: Ester Rotstein --- .../openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java index 9b40416..bafdee2 100644 --- a/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java +++ b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java @@ -736,22 +736,13 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper { if (property instanceof Map) { for (Map.Entry item: ((Map) property).entrySet()) { - if (item.getKey().equals("get_input")) { - String itemToStr = item.getKey() + ":" + item.getValue().toString(); - filterProperties(itemToStr, path, filterType, pattern, filterMap); - } else { - path += PATH_DELIMITER + item.getKey(); - filterProperties(item.getValue(), path, filterType, pattern, filterMap); - } + String itemPath = path + PATH_DELIMITER + item.getKey(); + filterProperties(item.getValue(), itemPath, filterType, pattern, filterMap); } } else if (property instanceof List) { for (Object item: (List)property) { filterProperties(item, path, filterType, pattern, filterMap); } - } else if (property instanceof Function) { - if (filterType.isMatch(property.toString(), pattern)) { - filterMap.put(path, property.toString()); - } } else { if (filterType.isMatch(property.toString(), pattern)) { filterMap.put(path, property.toString()); -- cgit 1.2.3-korg