SORMAS-Foundation#2993 validate not blank

Author: [email protected]

sormas-api/src/main/java/de/symeda/sormas/api/region/CountryDto.java

@@ -1,5 +1,7 @@
 package de.symeda.sormas.api.region;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.EntityDto;
@@ -17,7 +19,8 @@ public class CountryDto extends EntityDto {
 
 	private String defaultName;
 	private String externalId;
-	@Size(min = 3, max = 3)
+	@Size(min = 2, max = 3)
+	@NotBlank
 	private String isoCode;
 	@Size(min = 1, max = 3)
 	private String unoCode;

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CountryImporter.java

@@ -8,6 +8,7 @@
 import java.text.MessageFormat;
 import java.util.function.Consumer;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
 import org.apache.commons.lang3.StringUtils;
@@ -116,7 +117,12 @@ private void insertColumnEntryIntoData(CountryDto newEntityDto, String value, St
 	private void validateFieldLength(String field, String value) throws ImportErrorException, InvalidColumnException {
 		try {
 			Size size = CountryDto.class.getDeclaredField(field).getAnnotation(Size.class);
-			if (StringUtils.isNotEmpty(value) && size != null) {
+			boolean shouldNotBeBlank = CountryDto.class.isAnnotationPresent(NotBlank.class);
+			if (shouldNotBeBlank && StringUtils.isBlank(value)) {
+				String message = "The value {0} is blank.";
+				throw new ImportErrorException(MessageFormat.format(message, value));
+			}
+			if (size != null) {
 				if (value.length() < size.min()) {
 					String message = "The value {0} has length {1} but the minimum length is {2}";
 					throw new ImportErrorException(MessageFormat.format(message, value, value.length(), size.min()));