X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdto%2Ftransport%2FOnboardingWidget.java;h=85a155b1e61ef943f023f5b791ed3a4aae3b9782;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hp=e08d03395ba0fbba753c8c887f468f3f8efc6af9;hpb=53e7159c86e9c71b84ab570e1728a99dbfe4910a;p=portal.git diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java index e08d0339..85a155b1 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java @@ -41,7 +41,11 @@ package org.onap.portal.domain.dto.transport; import java.io.Serializable; -import lombok.AllArgsConstructor; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; +import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -49,31 +53,51 @@ import org.hibernate.validator.constraints.SafeHtml; @Getter @Setter +@Builder @NoArgsConstructor -@AllArgsConstructor public class OnboardingWidget implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - private Long id; - @SafeHtml - private String name; - private Long appId; - @SafeHtml - private String appName; - private Integer width; - private Integer height; - @SafeHtml - private String url; + private Long id; + @SafeHtml(message = "name may have unsafe html content") + private String name; + @NotNull(message = "appId can't be null") + @Min(message = "appId value must be higher than 1",value = 2) + private Long appId; + @SafeHtml(message = "appName may have unsafe html content") + @NotBlank(message = "appName can't be blank") + private String appName; + @Positive(message = "width must be positive number") + private Integer width; + @Positive(message = "height must be positive number") + private Integer height; + @SafeHtml(message = "url may have unsafe html content") + @NotBlank(message = "url can't be blank") + private String url; - public void normalize() { - this.name = (this.name == null) ? "" : this.name.trim(); - this.appName = (this.appName == null) ? "" : this.appName.trim(); - if (this.width == null) - this.width = 0; - if (this.height == null) - this.height = 0; - this.url = (this.url == null) ? "" : this.url.trim(); - } + public OnboardingWidget(Long id, String name, Long appId, + String appName, Integer width, Integer height, + String url) { + this.id = id; + this.name = name; + this.appId = appId; + this.appName = appName; + this.width = width; + this.height = height; + this.url = url; + } + + public void normalize() { + this.name = (this.name == null) ? "" : this.name.trim(); + this.appName = (this.appName == null) ? "" : this.appName.trim(); + if (this.width == null) { + this.width = 0; + } + if (this.height == null) { + this.height = 0; + } + this.url = (this.url == null) ? "" : this.url.trim(); + } }