X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdb%2Fep%2FEpUserRolesRequestDet.java;h=4d2fcaea16aee8fd808101a05673679195da3d14;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hp=722ffc69d76291ce0c8ed5fc95e32c32da676aea;hpb=8b27c197bd9eb8579e5b634881dc595f5672be2c;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java
index 722ffc69..4d2fcaea 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -50,7 +51,10 @@ import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.validation.Valid;
 import javax.validation.constraints.Digits;
@@ -61,7 +65,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.validator.constraints.SafeHtml;
-import org.onap.portalapp.portal.domain.db.fn.FnRole;
+import org.onap.portal.domain.db.fn.FnRole;
+
 /*
 CREATE TABLE `ep_user_roles_request_det` (
         `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -76,6 +81,13 @@ CREATE TABLE `ep_user_roles_request_det` (
         )
 */
 
+@NamedQueries({
+    @NamedQuery(
+        name = "EpUserRolesRequestDet.appRolesRequestDetailList",
+        query = "FROM EpUserRolesRequestDet where reqId.reqId = :reqId"
+    )
+})
+
 @Table(name = "ep_user_roles_request_det", indexes = {
         @Index(name = "fk_user_roles_req_fn_req_id", columnList = "req_id"),
         @Index(name = "fk_user_roles_req_fn_role_id", columnList = "requested_role_id")
@@ -85,19 +97,20 @@ CREATE TABLE `ep_user_roles_request_det` (
 @Getter
 @Setter
 @Entity
-public class EpUserRolesRequestDet {
+public class EpUserRolesRequestDet implements Serializable {
 
        @Id
-       @GeneratedValue(strategy = GenerationType.AUTO)
+
+  @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
        @Digits(integer = 11, fraction = 0)
        private Long id;
-       @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+       @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
        @JoinColumn(name = "req_id", columnDefinition = "int(11) default null")
        @Valid
        private EpUserRolesRequest reqId;
-       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-       @JoinColumn(name = "requested_role_id", nullable = false)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+       @JoinColumn(name = "requested_role_id", nullable = false, columnDefinition = "bigint")
        @NotNull
        @Valid
        private FnRole requestedRoleId;