Merge pull request #5 from scrum-for-developers/feature/wb-117

validate isbn 13

Author: LisaLabi

worblehat-web/src/main/java/de/codecentric/psd/worblehat/web/validation/ISBNConstraintValidator.java

@@ -12,7 +12,8 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
     // Don't validate null, empty and blank strings, since these are validated by @NotNull,
     // @NotEmpty and @NotBlank
     if (StringUtils.isNotBlank(value)) {
-      return ISBNValidator.getInstance().isValidISBN10(value);
+      return ISBNValidator.getInstance().isValidISBN10(value)
+          || ISBNValidator.getInstance().isValidISBN13(value);
     }
     return true;
   }

worblehat-web/src/main/resources/ValidationMessages.properties

@@ -5,21 +5,21 @@ empty.bookDataFormData.edition=Edition is mandatory
 empty.bookDataFormData.author=Author is mandatory
 empty.bookDataFormData.isbn=ISBN is mandatory
 notvalid.bookDataFormData.edition=Please enter a numeric value.
-notvalid.bookDataFormData.isbn=Please enter a valid 10 characters ISBN.
+notvalid.bookDataFormData.isbn=Please enter a valid 10 or 13 characters ISBN.
 notvalid.bookDataFormData.yearOfPublication=Please enter a four-digit year.
 invalid.length.bookDataFormData.yearOfPublication=Please enter a four-digit year.
 
 # Borrow book form
-notvalid.borrowCmd.isbn=Please enter a valid 10 characters ISBN.
+notvalid.borrowCmd.isbn=Please enter a valid 10 or 13 characters ISBN.
 empty.borrowCmd.isbn=ISBN is mandatory
 notvalid.borrowCmd.email=Please enter a valid Email.
 empty.borrowCmd.email=Email is mandatory
 
 # Return all books form
 empty.returnAllBookFormData.emailAddress=Email is mandatory
 notvalid.returnAllBookFormData.emailAddress=Please enter a valid Email.
-notvalid.returnAllBookFormData.isbn=Please enter a valid 10 characters ISBN.
+notvalid.returnAllBookFormData.isbn=Please enter a valid 10 or 13 characters ISBN.
 
 # Default messages for custom validators
-de.codecentric.psd.worblehat.web.validation.ISBN=Please enter a valid 10 characters ISBN.
+de.codecentric.psd.worblehat.web.validation.ISBN=Please enter a valid 10 or 13 characters ISBN.
 de.codecentric.psd.worblehat.web.validation.Numeric=Value has to be numeric