summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorEster Rotstein <er767y@att.com>2017-08-06 10:04:42 +0300
committerEster Rotstein <er767y@att.com>2017-08-06 10:04:42 +0300
commitd6f0e5ba491d94cf71486b86a14a17bb411a2a4b (patch)
treeca0d8caa50d4374ccedc8c4cb5234ee77b556521 /src/main
parentfc5eb8622019f06498a05b8dadef7f0a7bb3ab4b (diff)
[SDC-182] support nested properties with function
Change-Id: I7c7dda4940010bd018880f76eb61eeb2de6d4fcc Signed-off-by: Ester Rotstein <er767y@att.com>
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 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<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());