_Bastler/bstlboard-back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

required fields

Browse Source
This commit is contained in:
_Bastler 2021-10-06 12:36:42 +02:00
parent 45a62b9d54
commit 7e0c292d7c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/bstly/board/controller/validation/EntryValidator.java
View File

@ -20,7 +20,6 @@ public class EntryValidator implements Validator {
private UrlValidator urlValidator = new UrlValidator();
/*
* @see org.springframework.validation.Validator#supports(java.lang.Class)
*/
@ -29,9 +28,9 @@ public class EntryValidator implements Validator {
return clazz.isAssignableFrom(Entry.class);
}
/*
* @see org.springframework.validation.Validator#validate(java.lang.Object, org.springframework.validation.Errors)
* @see org.springframework.validation.Validator#validate(java.lang.Object,
* org.springframework.validation.Errors)
*/
@Override
public void validate(Object target, Errors errors) {
@ -42,10 +41,12 @@ public class EntryValidator implements Validator {
if (entry.getEntryType() == null) {
errors.rejectValue("entrytype", "REQUIRED");
} else if (EntryType.LINK.equals(entry.getEntryType())) {
if (!StringUtils.hasText(entry.getUrl())) {
} else if (EntryType.LINK.equals(entry.getEntryType())
&& !StringUtils.hasText(entry.getUrl())) {
errors.rejectValue("url", "REQUIRED");
}
} else if (!EntryType.LINK.equals(entry.getEntryType())
&& !StringUtils.hasText(entry.getText())) {
errors.rejectValue("text", "REQUIRED");
}
if (StringUtils.hasText(entry.getUrl()) && !urlValidator.isValid(entry.getUrl())) {