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, 12 insertions, 37 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
index b0b00759f0..fa26d78dc0 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
@@ -26,58 +26,33 @@ import java.io.Serializable;
 
 public class VfModuleToHeatFiles implements Serializable {
 	
-    private int vfModuleId;
-    private int heatFilesId;
+    private String vfModuleModelUuid;
+    private String heatFilesArtifactUuid;
     public static final long serialVersionUID = -1322322139926390329L;
 
 	public VfModuleToHeatFiles() {
 		super();
 	}
 	
-	public int getVfModuleId() {
-		return this.vfModuleId;
+	public String getVfModuleModelUuid() {
+		return this.vfModuleModelUuid;
 	}
-	public void setVfModuleId(int vfModuleId) {
-		this.vfModuleId = vfModuleId;
+	public void setVfModuleModelUuid(String vfModuleModelUuid) {
+		this.vfModuleModelUuid = vfModuleModelUuid;
 	}
-	
-	public int getHeatFilesId() {
-		return this.heatFilesId;
+	public String getHeatFilesArtifactUuid() {
+		return this.heatFilesArtifactUuid;
 	}
-	public void setHeatFilesId(int heatFilesId) {
-		this.heatFilesId = heatFilesId;
+	public void setHeatFilesArtifactUuid(String heatFilesArtifactUuid) {
+		this.heatFilesArtifactUuid = heatFilesArtifactUuid;
 	}
 	
     @Override
     public String toString () {
         StringBuilder sb = new StringBuilder ();
-        sb.append ("VF_MODULE_ID=" + this.vfModuleId);
-        sb.append (", HEAT_FILES_ID=" + this.heatFilesId);
+        sb.append ("vfModuleModelUuid=" + this.vfModuleModelUuid);
+        sb.append (", heatFilesArtifactUuid=" + this.heatFilesArtifactUuid);
         return sb.toString ();
     }
 
-    @Override
-    public boolean equals (Object o) {
-        if (!(o instanceof VfModuleToHeatFiles)) {
-            return false;
-        }
-        if (this == o) {
-            return true;
-        }
-        VfModuleToHeatFiles vmthf = (VfModuleToHeatFiles) o;
-        if (vmthf.getVfModuleId() == this.getVfModuleId() && vmthf.getVfModuleId() == this.getVfModuleId()) {
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode () {
-        // 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.vfModuleId + this.heatFilesId;
-        return result;
-    }
-
 }