summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-08-09 12:56:16 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-09 12:56:16 +0000
commit14cb77194f07997fa99a0e7e913e9415a73b2b0f (patch)
tree1618563d0e0da0e17dceab1bab566d88bfac6422 /src/main
parentd6ef1681811b4028ee24657dad856b73425ec682 (diff)
parentd6f0e5ba491d94cf71486b86a14a17bb411a2a4b (diff)
Merge "[SDC-182] support nested properties with function"
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java13
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());