Correct Catalog DB beans

[so.git] / mso-catalog-db / src / main / java / org / onap / so / db / catalog / beans / ActivitySpecUserParameters.java

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java
index be32da3..d23c782 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ActivitySpecUserParameters.java
@@ -21,7 +21,6 @@
 package org.onap.so.db.catalog.beans;
 
 import java.io.Serializable;
-import java.util.Date;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -29,13 +28,9 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.IdClass;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.PrePersist;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -43,7 +38,6 @@ import com.openpojo.business.annotation.BusinessKey;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
 
 @Entity
-@IdClass(ActivitySpecUserParametersId.class)
 @Table(name = "activity_spec_to_user_parameters")
 public class ActivitySpecUserParameters implements Serializable {
 
@@ -55,12 +49,10 @@ public class ActivitySpecUserParameters implements Serializable {
     private Integer ID;
 
     @BusinessKey
-    @Id
     @Column(name = "ACTIVITY_SPEC_ID")
     private Integer activitySpecId;
 
     @BusinessKey
-    @Id
     @Column(name = "USER_PARAMETERS_ID")
     private Integer userParametersId;
 
@@ -113,6 +105,7 @@ public class ActivitySpecUserParameters implements Serializable {
         this.userParametersId = userParametersId;
     }
 
+    @LinkedResource
     public ActivitySpec getActivitySpec() {
         return activitySpec;
     }
@@ -121,6 +114,7 @@ public class ActivitySpecUserParameters implements Serializable {
         this.activitySpec = activitySpec;
     }
 
+    @LinkedResource
     public UserParameters getUserParameters() {
         return userParameters;
     }