Skip to content

Commit

Permalink
SLVUU-90: Add not blank constraints to name, group, and user in BaseM…
Browse files Browse the repository at this point in the history
…etadata
  • Loading branch information
cfisher-scottlogic committed Nov 21, 2023
1 parent 9d060cf commit 11eb0b6
Show file tree
Hide file tree
Showing 4 changed files with 315 additions and 174 deletions.
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
package org.finos.vuu.layoutserver.dto.request;

import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.Data;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import lombok.Data;

@Data
public class LayoutRequestDto {

/**
* The definition of the layout as an arbitrary JSON structure, describing all required components
* The definition of the layout as an arbitrary JSON structure, describing all required
* components
*/
@NotNull(message = "Definition must not be null")
private ObjectNode definition;

@NotNull(message = "Metadata must not be null")
@Valid
private MetadataRequestDto metadata;
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package org.finos.vuu.layoutserver.dto.request;

import com.fasterxml.jackson.annotation.JsonUnwrapped;
import javax.validation.Valid;
import lombok.Data;
import org.finos.vuu.layoutserver.model.BaseMetadata;

@Data
public class MetadataRequestDto {

@JsonUnwrapped
@Valid
BaseMetadata baseMetadata;
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
package org.finos.vuu.layoutserver.model;

import lombok.Data;

import javax.persistence.Embeddable;
import javax.persistence.Lob;
import javax.validation.constraints.NotBlank;
import lombok.Data;

@Data
@Embeddable
public class BaseMetadata {

@NotBlank(message = "Name is required")
private String name;

@NotBlank(message = "Group is required")
private String group;

@Lob
private String screenshot;

@NotBlank(message = "User is required")
private String user;
}
Loading

0 comments on commit 11eb0b6

Please sign in to comment.