Add message for invalid URI constraint

Author: aabashkin

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidURI.java

@@ -22,7 +22,7 @@
 @Documented
 public @interface ValidURI {
 
-    String message() default "";
+    String message() default "Invalid URI";
 
     Class<?>[] groups() default {};
 

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidURIValidator.java

@@ -27,11 +27,14 @@ public boolean isValid(String input, ConstraintValidatorContext constraintValida
         //ValidationErrorList errorList = new ValidationErrorList();
         boolean valid = ESAPI.validator().isValidURI(context, input, allowNull);
 
-        /*
-        if(!valid){
-            ValidationUtil.addViolatons(errorList, constraintValidatorContext);
+        if (!valid) {
+            constraintValidatorContext.disableDefaultConstraintViolation();
+            String message = constraintValidatorContext.getDefaultConstraintMessageTemplate();
+            if (message == null || message.isEmpty()) {
+                message = "Invalid URI";
+            }
+            constraintValidatorContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
         }
-        */
 
         return valid;
     }