X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdb%2Ffn%2FFnOrg.java;h=0fd61b72025dac0b79c3149c0979add93ee72ea3;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hp=310c3619a9036221e03e27b33638dae715980695;hpb=0dd6f1189815079526c3f5211f01650bbe5e665b;p=portal.git diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java index 310c3619..0fd61b72 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java @@ -51,6 +51,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Index; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.validation.constraints.Digits; import javax.validation.constraints.NotNull; @@ -76,13 +77,13 @@ CREATE TABLE `fn_org` ( }) @NoArgsConstructor @AllArgsConstructor - @Getter @Setter @Entity public class FnOrg implements Serializable { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + + @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "org_id", nullable = false, length = 11) @Digits(integer = 11, fraction = 0) private Long orgId; @@ -91,7 +92,7 @@ public class FnOrg implements Serializable { @SafeHtml @NotNull private String orgName; - @Column(name = "access_cd", length = 10, columnDefinition = "varchar(10) DEFAULT NULL") + @Column(name = "access_cd", length = 10) @Size(max = 10) @SafeHtml private String accessCd; @@ -99,7 +100,7 @@ public class FnOrg implements Serializable { @OneToMany( targetEntity = FnUser.class, mappedBy = "orgId", - cascade = CascadeType.ALL, + cascade = CascadeType.MERGE, fetch = FetchType.LAZY ) private Set fnUsers;