xAdd application/component.

Change-Id: Ib60ef8f3e64aa03dfa49b7c542ac7bae1e25175f
Issue-ID: DCAEGEN2-879
Signed-off-by: Shadi Haidar <sh1986@att.com>
Signed-off-by: Haidar, Shadi (sh1986) <sh1986@att.com>

2 files changed, 20 insertions, 0 deletions

diff --git a/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java
index bda4423..a7e2249 100644
--- a/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java
+++ b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java
@@ -43,6 +43,8 @@ public class DCAEServiceTypeObjectMapper implements ResultSetMapper<DCAEServiceT
         object.setTypeName(resultSet.getString("type_name"));
         object.setTypeVersion(resultSet.getInt("type_version"));
         object.setOwner(resultSet.getString("owner"));
+        object.setApplication(resultSet.getString("application"));
+        object.setComponent(resultSet.getString("component"));
         String[] vnfTypes = (String[]) resultSet.getArray("vnf_types").getArray();
         object.setVnfTypes(Arrays.asList(vnfTypes));
 
diff --git a/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java
index f264c99..3c86138 100644
--- a/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java
+++ b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java
@@ -36,6 +36,8 @@ public class DCAEServiceTypeObject {
     private Integer typeVersion = null;
     private String blueprintTemplate = null;
     private String owner = null;
+    private String application = null;
+    private String component = null;
     private List<String> vnfTypes = null;
     private List<String> serviceIds = null;
     private List<String> serviceLocations = null;
@@ -83,6 +85,22 @@ public class DCAEServiceTypeObject {
     public void setOwner(String owner) {
         this.owner = owner;
     }
+    
+    public String getApplication() {
+        return application;
+    }
+
+    public void setApplication(String application) {
+        this.application = application;
+    }
+    
+    public String getComponent() {
+        return component;
+    }
+
+    public void setComponent(String component) {
+        this.component = component;
+    }
 
     public List<String> getVnfTypes() {
         return vnfTypes;