SDC Tosca Parser getEntity API

Change-Id: Ifc007335ef57904305458f63b422f2db41a3e694
Issue-ID: SDC-1967
Signed-off-by: Manzon, Inna (im453s) <im453s@intl.att.com>

diff --git a/pom.xml b/pom.xml
index 20a4dc3..07e1c9f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
        <groupId>org.onap.sdc.jtosca</groupId>
        <artifactId>jtosca</artifactId>
-       <version>1.4.7-SNAPSHOT</version>
+       <version>1.4.8-SNAPSHOT</version>
        <name>sdc-jtosca</name>
        <properties>
 

diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Policy.java b/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
index aeed368..9eaacfc 100644 (file)
--- a/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
+++ b/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.onap.sdc.toscaparser.api.utils.ThreadLocalsHolder;
 import org.onap.sdc.toscaparser.api.utils.ValidateUtils;
 
@@ -20,8 +21,9 @@ public class Policy extends EntityTemplate {
        private static final String TRIGGERS = "triggers";
        private static final String SECTIONS[] = {
                        TYPE, METADATA, DESCRIPTION, PROPERTIES, TARGETS, TRIGGERS};
-       
-       LinkedHashMap<String,Object> metaData;
+
+//     LinkedHashMap<String,Object> metaData;
+       Metadata metaData;
        ArrayList<Object> targetsList; // *** a list of NodeTemplate OR a list of Group ***
        String targetsType;
        ArrayList<Object> triggers;
@@ -35,10 +37,10 @@ public class Policy extends EntityTemplate {
                                  LinkedHashMap<String,Object> _customDef) {
                super(_name,_policy,"policy_type",_customDef);
 
-        metaData = null;
         if(_policy.get(METADATA) != null) {
-               metaData = (LinkedHashMap<String,Object>)_policy.get(METADATA);
-               ValidateUtils.validateMap(metaData);
+                       LinkedHashMap<String,Object> metadataMap = (LinkedHashMap<String,Object>)_policy.get(METADATA);
+               ValidateUtils.validateMap(metadataMap);
+               metaData = new Metadata(metadataMap);
         }
 
         targetsList = targetObjects;
@@ -67,10 +69,14 @@ public class Policy extends EntityTemplate {
                return targetsType;
        }
  
-       public LinkedHashMap<String, Object> getMetaData() {
+       public Metadata getMetaDataObj() {
                return metaData;
        }
 
+       public LinkedHashMap<String, Object> getMetaData() {
+               return (LinkedHashMap)metaData.getAllProperties();
+       }
+
        //      public ArrayList<NodeTemplate> getTargetsList() {
        public ArrayList<Object> getTargetsList() {
                return targetsList;

diff --git a/version.properties b/version.properties
index 442dce4..7a72c98 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major=1
 minor=4
-patch=7
+patch=8
 
 base_version=${major}.${minor}.${patch}