X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdb%2Ffn%2FFnTab.java;h=fa4be7f5738b8e0202a27189ae4d331e4332b1ab;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hp=020b3107ab18e53b0c2cc6796bd8558d8fdcd43f;hpb=f71707238ebabd9911277af55673b1d42ac1495f;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java
index 020b3107..fa4be7f5 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java
@@ -40,9 +40,9 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -59,6 +59,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -89,10 +90,11 @@ CREATE TABLE `fn_tab` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 @Getter
 @Setter
 @Entity
-public class FnTab {
+public class FnTab implements Serializable {
        @Id
        @Column(name = "tab_cd", length = 30, nullable = false)
        @Size(max = 30)
@@ -112,36 +114,33 @@ public class FnTab {
        @SafeHtml
        @NotNull
        private String action;
-       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
        @JoinColumn(name = "function_cd", nullable = false)
        @NotNull
        @Valid
        private FnFunction functionCd;
-       @Column(name = "active_yn", length = 1, nullable = false)
-       @Pattern(regexp = "[YNyn]")
-       @Size(max = 1)
+       @Column(name = "active_yn", nullable = false)
        @NotNull
-       @SafeHtml
-       private String activeYn;
+       private Boolean activeYn;
        @Column(name = "sort_order", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
        @NotNull
-       private BigInteger sortDrder;
+       private Long sortDrder;
        @Column(name = "parent_tab_cd", length = 30, columnDefinition = "varchar(30) DEFAULT NULL")
        @Size(max = 30)
        @SafeHtml
        private String parentTabCd;
-       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
        @JoinColumn(name = "tab_set_cd", nullable = false)
        @NotNull
        @Valid
-       private FnLuTabSet fnLuTabSet;
+       private FnLuTabSet tabSetCd;
        @OneToMany(
                targetEntity = FnTabSelected.class,
                mappedBy = "selectedTabCd",
-               cascade = CascadeType.ALL,
+               cascade = CascadeType.MERGE,
                fetch = FetchType.LAZY
        )
-       private List<FnTabSelected> selectedTabCd = new ArrayList<>();
+       private Set<FnTabSelected> selectedTabCd;
 
 }