From f016b5bad31c356a019c638e1e636f8f31ca0c4e Mon Sep 17 00:00:00 2001
From: Pavel Aharoni <pa0916@att.com>
Date: Tue, 27 Jun 2017 12:29:46 +0300
Subject: [SDC-39] fixing signature to be String

Change-Id: Icd107925d6e9b2c4f2099a1361405503e017e031
Signed-off-by: Pavel Aharoni <pa0916@att.com>
---
 .../org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java     |  2 +-
 .../org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org/openecomp')

diff --git a/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java b/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java
index 333df0d..35c68d4 100644
--- a/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java
+++ b/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java
@@ -343,7 +343,7 @@ public interface ISdcCsarHelper {
      * @param pattern value to filter with it
      * @return Map <b>full path to a property</b> mapped to <b>property value</b> filtered by type and pattern
      */
-    public Map<String, Object> filterNodeTemplatePropertiesByValue(NodeTemplate nodeTemplate, FilterType filterType, String pattern);
+    public Map<String, String> filterNodeTemplatePropertiesByValue(NodeTemplate nodeTemplate, FilterType filterType, String pattern);
     
 	/**
 	 * Get all node templates by sdcType for parent Node Template.
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 4a3f73e..8095974 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
@@ -577,8 +577,8 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
         return new ArrayList<>();
     }
 
-    public Map<String, Object> filterNodeTemplatePropertiesByValue(NodeTemplate nodeTemplate, FilterType filterType, String pattern) {
-        Map<String, Object> filterMap = new HashMap<>();
+    public Map<String, String> filterNodeTemplatePropertiesByValue(NodeTemplate nodeTemplate, FilterType filterType, String pattern) {
+        Map<String, String> filterMap = new HashMap<>();
 
         if (nodeTemplate == null) {
             log.error("filterNodeTemplatePropertiesByValue nodeTemplate is null");
@@ -610,7 +610,7 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
     }
 
     /************************************* helper functions ***********************************/
-    private Map<String, Object> filterProperties(Object property, String path, FilterType filterType, String pattern, Map<String, Object> filterMap) {
+    private Map<String, String> filterProperties(Object property, String path, FilterType filterType, String pattern, Map<String, String> filterMap) {
 
         if (property instanceof Map) {
             for (Map.Entry<String, Object> item: ((Map<String, Object>) property).entrySet()) {
@@ -628,11 +628,11 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
             }
         } else if (property instanceof Function) {
             if (filterType.isMatch(property.toString(), pattern)) {
-                filterMap.put(path, property);
+                filterMap.put(path, property.toString());
             }
         } else {
             if (filterType.isMatch(property.toString(), pattern)) {
-                filterMap.put(path, property);
+                filterMap.put(path, property.toString());
             }
         }
 
-- 
cgit 1.2.3-korg