Domain model change

[portal.git] / portal-BE / src / main / java / org / onap / portal / domain / db / fn / FnRestrictedUrl.java

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java
index 35b619c..4323818 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java
@@ -53,6 +53,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -75,21 +76,19 @@ CREATE TABLE `fn_restricted_url` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-
+@Builder
 @Getter
 @Setter
 @Entity
 @IdClass(FnRestrictedUrlId.class)
-public class FnRestrictedUrl {
+public class FnRestrictedUrl implements Serializable{
        @Column(name = "restricted_url", length = 250, nullable = false)
        @Size(max = 250)
        @SafeHtml
        @Id
-       private String restricted_url;
+       private String restrictedUrl;
        @ManyToOne()
-       @JoinColumn(name = "function_cd", nullable = false)
-       @Valid
-       @NotNull
+       @JoinColumn(name = "function_cd")
        @Id
        private FnFunction functionCd;
 
@@ -101,8 +100,7 @@ public class FnRestrictedUrl {
        public static class FnRestrictedUrlId implements Serializable {
               @Size(max = 250)
               @SafeHtml
-              private String restricted_url;
-              @Valid
+              private String restrictedUrl;
               @NotNull
               private FnFunction functionCd;
        }