Merge "[SDC-182] support nested properties with function"

1 files changed, 2 insertions, 11 deletions

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 3b87986..bfbbeee 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
@@ -739,22 +739,13 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
 
         if (property instanceof Map) {
             for (Map.Entry<String, Object> item: ((Map<String, Object>) 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<Object>)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());