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, 20 insertions, 21 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
index cc203ff98d..763c304a0f 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
@@ -20,48 +20,47 @@
 
 package org.openecomp.mso.db.catalog.beans;
 
-
-
-
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.text.DateFormat;
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
 import java.util.Date;
+
 import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
 import org.openecomp.mso.logger.MsoLogger;
 
-public class ServiceRecipe extends MavenLikeVersioning {
+public class ServiceRecipe extends MavenLikeVersioning implements Serializable {
+	
+	private static final long serialVersionUID = 768026109321305392L;
+	
 	private int id;
-	private int serviceId;
+	private String serviceModelUUID;
 	private String action;
 	private String description;
 	private String orchestrationUri;
 	private String serviceParamXSD;
 	private int recipeTimeout;
 	private Integer serviceTimeoutInterim;
-
 	private Timestamp created;
 
-
 	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL);
-
+	
 	// This 'default' CTR is now needed for backward compatibility since a new CTR was added below
 	public ServiceRecipe() {
 		super();
 	}
-
+	
 	// This CTR is needed by the HQL SELECT JOIN between the SERVICE and SERVICE_RECIPE tables
 	// in CatalogDatabase::getServiceRecipe()
-	public ServiceRecipe(int id, int serviceId, String action,
-						 String description, String orchestrationUri,
-						 String serviceParamXSD, int recipeTimeout,
-						 int serviceTimeoutInterim, Date created) {
+	public ServiceRecipe(int id, String serviceModelUUID, String action,
+			String description, String orchestrationUri,
+			String serviceParamXSD, int recipeTimeout,
+			int serviceTimeoutInterim, Date created) {
 		super();
-		LOGGER.debug("ServiceRecipe id=" + id + ", serviceId=" + serviceId + ", action=" + action + ", description=" + description +
+		LOGGER.debug("ServiceRecipe id=" + id + ", serviceModelUUID=" + serviceModelUUID + ", action=" + action + ", description=" + description +
 				", orchestrationUri=" + orchestrationUri + ", serviceParamXSD=" + serviceParamXSD +
 				", recipeTimeout=" + recipeTimeout + ", serviceTimeoutInterim=" + serviceTimeoutInterim + ", created=" + created);
 		this.id = id;
-		this.serviceId = serviceId;
+		this.serviceModelUUID = serviceModelUUID;
 		this.action = action;
 		this.description = description;
 		this.orchestrationUri = orchestrationUri;
@@ -79,11 +78,11 @@ public class ServiceRecipe extends MavenLikeVersioning {
 		this.id = id;
 	}
 
-	public int getServiceId() {
-		return serviceId;
+	public String getServiceModelUUID() {
+		return serviceModelUUID;
 	}
-	public void setServiceId(int serviceId) {
-		this.serviceId = serviceId;
+	public void setServiceModelUUID(String serviceModelUUID) {
+		this.serviceModelUUID = serviceModelUUID;
 	}
 
 	public String getAction() {
@@ -128,7 +127,7 @@ public class ServiceRecipe extends MavenLikeVersioning {
 	public void setServiceTimeoutInterim(Integer serviceTimeoutInterim) {
 		this.serviceTimeoutInterim = serviceTimeoutInterim;
 	}
-
+	
 	public Timestamp getCreated() {
 		return created;
 	}