1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
index eabbacf547..5bdf21b716 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
@@ -25,8 +25,8 @@ import java.io.Serializable;
 
 public class HeatNestedTemplate implements Serializable {
 
-    private int parentTemplateId;
-    private int childTemplateId;
+    private String parentTemplateId;
+    private String childTemplateId;
     private String providerResourceFile;
     public static final long serialVersionUID = -1322322139926390329L;
 
@@ -34,19 +34,19 @@ public class HeatNestedTemplate implements Serializable {
         super ();
     }
 
-    public void setParentTemplateId (int parentTemplateId) {
+    public void setParentTemplateId (String parentTemplateId) {
         this.parentTemplateId = parentTemplateId;
     }
 
-    public int getParentTemplateId () {
+    public String getParentTemplateId () {
         return this.parentTemplateId;
     }
 
-    public void setChildTemplateId (int childTemplateId) {
+    public void setChildTemplateId (String childTemplateId) {
         this.childTemplateId = childTemplateId;
     }
 
-    public int getChildTemplateId () {
+    public String getChildTemplateId () {
         return this.childTemplateId;
     }
 
@@ -91,7 +91,7 @@ public class HeatNestedTemplate implements Serializable {
         // hash code does not have to be a unique result - only that two objects that should be treated as equal
         // return the same value. so this should work.
         int result = 0;
-        result = this.parentTemplateId + this.childTemplateId;
+        result = this.parentTemplateId.hashCode() + this.childTemplateId.hashCode();
         return result;
     }
 }