X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdb%2Ffn%2FFnRoleComposite.java;h=a729e76c6fbbf75c4fe55edc07c7f22868527808;hp=42a24b22603cc6759351db14981fe740e8aa3617;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hpb=39fb119cdaea6bd8d801b22d195db39f6d8faaca

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleComposite.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleComposite.java
index 42a24b22..a729e76c 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleComposite.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleComposite.java
@@ -52,11 +52,12 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.validation.Valid;
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.onap.portal.domain.db.fn.FnRoleComposite.FnRoleCompositeId;
+import org.onap.portal.domain.db.fn.compositePK.FnRoleCompositeId;
+import org.onap.portal.domain.dto.transport.Role;
 
 @Table(name = "fn_role_composite", indexes = {
     @Index(name = "fk_fn_role_composite_child", columnList = "child_role_id")
@@ -64,6 +65,7 @@ import org.onap.portal.domain.db.fn.FnRoleComposite.FnRoleCompositeId;
 @Getter
 @Setter
 @Entity
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @IdClass(FnRoleCompositeId.class)
@@ -71,25 +73,13 @@ public class FnRoleComposite implements Serializable{
 
   @Id
   @Valid
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-  @JoinColumn(name = "parent_role_id")
-  private FnRole parentRoles;
+  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+  @JoinColumn(name = "parent_role_id", nullable = false, columnDefinition = "bigint")
+  private Role parentRoles;
   @Id
   @Valid
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-  @JoinColumn(name = "child_role_id")
-  private FnRole childRoles;
+  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+  @JoinColumn(name = "child_role_id", nullable = false, columnDefinition = "bigint")
+  private Role childRoles;
 
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @EqualsAndHashCode
-  @AllArgsConstructor
-  public class FnRoleCompositeId implements Serializable {
-
-    @Valid
-    private FnRole parentRoles;
-    @Valid
-    private FnRole childRoles;
-  }
 }