diff options
Diffstat (limited to 'src/main')
3 files changed, 12 insertions, 10 deletions
diff --git a/src/main/java/com/stileeducation/markr/dto/MCQTestResultDTO.java b/src/main/java/com/stileeducation/markr/dto/MCQTestResultDTO.java index da6a0e1..7e477cd 100644 --- a/src/main/java/com/stileeducation/markr/dto/MCQTestResultDTO.java +++ b/src/main/java/com/stileeducation/markr/dto/MCQTestResultDTO.java @@ -12,23 +12,23 @@ import java.util.Objects; @XmlRootElement(name = "mcq-test-result") public class MCQTestResultDTO { - @NotBlank + @NotBlank(message = "scanned-on is mandatory") private String scannedOn; - @NotBlank(message = "First name is mandatory") + @NotBlank(message = "first-name is mandatory") private String firstName; - @NotBlank(message = "Last name is mandatory") + @NotBlank(message = "last-name is mandatory") private String lastName; - @NotBlank(message = "Last name is mandatory") + @NotBlank(message = "student-number is mandatory") private String studentNumber; - @NotBlank(message = "Test id is mandatory") + @NotBlank(message = "test-id is mandatory") private String testId; @Valid - @NotNull + @NotNull(message = "summary-marks is mandatory") private SummaryMarksDTO summaryMarks; @XmlAttribute(name = "scanned-on") diff --git a/src/main/java/com/stileeducation/markr/dto/MCQTestResultsDTO.java b/src/main/java/com/stileeducation/markr/dto/MCQTestResultsDTO.java index fb77125..d9cf77d 100644 --- a/src/main/java/com/stileeducation/markr/dto/MCQTestResultsDTO.java +++ b/src/main/java/com/stileeducation/markr/dto/MCQTestResultsDTO.java @@ -1,6 +1,7 @@ package com.stileeducation.markr.dto; import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; @@ -11,6 +12,7 @@ import java.util.Objects; public class MCQTestResultsDTO { @Valid + @NotNull(message = "mcq-test-result is mandatory") private List<MCQTestResultDTO> mcqTestResults; @XmlElement(name = "mcq-test-result") diff --git a/src/main/java/com/stileeducation/markr/dto/SummaryMarksDTO.java b/src/main/java/com/stileeducation/markr/dto/SummaryMarksDTO.java index a65c1e1..5c0c2b4 100644 --- a/src/main/java/com/stileeducation/markr/dto/SummaryMarksDTO.java +++ b/src/main/java/com/stileeducation/markr/dto/SummaryMarksDTO.java @@ -10,12 +10,12 @@ import java.util.Objects; @XmlRootElement(name = "summary-marks") public class SummaryMarksDTO { - @NotNull(message = "Available marks must not be null") - @Min(value = 0, message = "Available marks must be non-negative") + @NotNull(message = "summary-marks available must not be null") + @Min(value = 0, message = "summary-marks available must be non-negative") private Integer available; - @NotNull(message = "Obtained marks must not be null") - @Min(value = 0, message = "Obtained marks must be non-negative") + @NotNull(message = "summary-marks obtained must not be null") + @Min(value = 0, message = "summary-marks obtained must be non-negative") private Integer obtained; @XmlAttribute(name = "available") |