Merge pull request #39 from avaje/feature/msg-NoBlank-Size

Update for [avaje] NotBlank and Size (default message from annotations)

Author: rbygrave

blackbox-test/src/test/java/example/jakarta/AllSortsBean.java

@@ -0,0 +1,30 @@
+package example.jakarta;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+
+@Valid
+public class AllSortsBean {
+
+  @NotNull
+  public String myNotNull = "valid";
+
+  @NotBlank
+  public String myNotBlank = "valid";
+
+  @NotEmpty
+  public String myNotEmpty = "valid";
+
+  @Email
+  public String myEmail = "[email protected]";
+
+  @AssertTrue
+  public boolean myAssertTrue = true;
+
+  @AssertFalse
+  public boolean myAssertFalse = false;
+
+  @Null
+  public String myNull = null;
+
+}

validator/src/test/java/io/avaje/validation/core/AllSortsDefaultMessageTest.java renamed to blackbox-test/src/test/java/example/jakarta/AllSortsDefaultMessageTest.java

@@ -1,13 +1,29 @@
-package io.avaje.validation.core;
+package example.jakarta;
 
 import io.avaje.validation.ConstraintViolation;
+import io.avaje.validation.ConstraintViolationException;
+import io.avaje.validation.Validator;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
 import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class AllSortsDefaultMessageTest extends BaseAllSortsTest {
+class AllSortsDefaultMessageTest {
+
+  final Validator validator = Validator.builder().build();
+
+  protected ConstraintViolation one(AllSortsBean pojo, Locale locale) {
+    try {
+      validator.validate(pojo, locale);
+      throw new IllegalStateException("don't get here");
+    } catch (ConstraintViolationException e) {
+      var violations = new ArrayList<>(e.violations());
+      assertThat(violations).hasSize(1);
+      return violations.get(0);
+    }
+  }
 
   @Test
   void notNull_EN() {

validator-generator/src/main/java/io/avaje/validation/generator/AnnotationUtil.java

@@ -19,8 +19,22 @@ interface Handler {
     handlers.put("jakarta.validation.constraints.Pattern", pattern);
 
     final var jakartaHandler = new JakartaHandler();
+    handlers.put("io.avaje.validation.constraints.AssertFalse", jakartaHandler);
+    handlers.put("jakarta.validation.constraints.AssertFalse", jakartaHandler);
+    handlers.put("io.avaje.validation.constraints.AssertTrue", jakartaHandler);
+    handlers.put("jakarta.validation.constraints.AssertTrue", jakartaHandler);
+    handlers.put("io.avaje.validation.constraints.Null", jakartaHandler);
+    handlers.put("jakarta.validation.constraints.Null", jakartaHandler);
+    handlers.put("io.avaje.validation.constraints.NotNull", jakartaHandler);
+    handlers.put("jakarta.validation.constraints.NotNull", jakartaHandler);
+    handlers.put("io.avaje.validation.constraints.NotBlank", jakartaHandler);
     handlers.put("jakarta.validation.constraints.NotBlank", jakartaHandler);
+    handlers.put("io.avaje.validation.constraints.NotEmpty", jakartaHandler);
+    handlers.put("jakarta.validation.constraints.NotEmpty", jakartaHandler);
+    handlers.put("io.avaje.validation.constraints.Size", jakartaHandler);
     handlers.put("jakarta.validation.constraints.Size", jakartaHandler);
+    handlers.put("io.avaje.validation.constraints.Email", jakartaHandler);
+    handlers.put("jakarta.validation.constraints.Email", jakartaHandler);
 
     final var jakartaDecimal = new JakartaDecimal();
     handlers.put("io.avaje.validation.constraints.DecimalMax", jakartaDecimal);

validator/src/main/java/io/avaje/validation/core/adapters/BasicAdapters.java

@@ -19,18 +19,18 @@ private BasicAdapters() {}
   public static final ValidationContext.AnnotationFactory FACTORY = (annotationType, context, attributes) ->
     switch (annotationType.getSimpleName()) {
         case "Email" -> new EmailAdapter(context.message("Email", attributes), attributes);
-        case "Null" -> new NullAdapter(context.message2("{avaje.Null.message}", attributes));
-        case "NotNull", "NonNull" -> new NotNullAdapter(context.message2("{avaje.NotNull.message}", attributes));
-        case "AssertTrue" -> new AssertBooleanAdapter(context.message2("{avaje.AssertTrue.message}", attributes), false);
-        case "AssertFalse" -> new AssertBooleanAdapter(context.message2("{avaje.AssertFalse.message}", attributes), true);
-        case "NotBlank" -> new NotBlankAdapter(context.message2("{avaje.NotBlank.message}", attributes));
-        case "NotEmpty" -> new NotEmptyAdapter(context.message2("{avaje.NotEmpty.message}", attributes));
+        case "Null" -> new NullAdapter(context.message2(attributes));
+        case "NotNull", "NonNull" -> new NotNullAdapter(context.message2(attributes));
+        case "AssertTrue" -> new AssertBooleanAdapter(context.message2(attributes), false);
+        case "AssertFalse" -> new AssertBooleanAdapter(context.message2(attributes), true);
+        case "NotBlank" -> new NotBlankAdapter(context.message2(attributes));
+        case "NotEmpty" -> new NotEmptyAdapter(context.message2(attributes));
         case "Past" -> new FuturePastAdapter(context.message("Past", attributes), true, false);
         case "PastOrPresent" -> new FuturePastAdapter(context.message("PastOrPresent", attributes), true, true);
         case "Future" -> new FuturePastAdapter(context.message("Future", attributes), false, false);
         case "FutureOrPresent" -> new FuturePastAdapter(context.message("FutureOrPresent", attributes), false, true);
         case "Pattern" -> new PatternAdapter(context.message2("{avaje.Pattern.message}", attributes), attributes);
-        case "Size" -> new SizeAdapter(context.message2("{avaje.Size.message}", attributes), attributes);
+        case "Size" -> new SizeAdapter(context.message2(attributes), attributes);
         default -> null;
       };
 

validator/src/test/java/io/avaje/validation/core/AllSortsBean.java

@@ -18,7 +18,7 @@ public final class ContactValidationAdapter implements ValidationAdapter<Contact
 
   public ContactValidationAdapter(ValidationContext ctx) {
     this.firstNameAdapter = ctx.adapter(NotBlank.class, Map.of("message", "empty"));
-    this.lastNameAdapter = ctx.<String>adapter(NotNull.class, Collections.emptyMap())
+    this.lastNameAdapter = ctx.<String>adapter(NotNull.class, Map.of("message","{avaje.NotNull.message}"))
       .andThen(ctx.adapter(Size.class, Map.of("max", 5, "min", 0)));
     this.addressValidator = ctx.adapter(Address.class);
   }

validator/src/test/java/io/avaje/validation/core/AllSortsBeanValidationAdapter.java

@@ -30,7 +30,7 @@ public CustomerValidationAdapter(ValidationContext ctx) {
 
     this.nameAdapter =
         ctx
-            .<String>adapter(NotNull.class, Map.of("message", "null"))
+            .<String>adapter(NotNull.class, Map.of("message","{avaje.NotNull.message}"))
             .andThen(ctx.adapter(NotBlank.class, Map.of("message", "empty")));
 
     this.activeDateAdapter =
@@ -44,7 +44,7 @@ public CustomerValidationAdapter(ValidationContext ctx) {
     this.shippingAddressValidator = ctx.adapter(Address.class);
 
     // Option A: billingAddressValidator combines NotNull + addressValidator
-    this.billingAddressValidator = ctx.<Address>adapter(NotNull.class, Collections.emptyMap())
+    this.billingAddressValidator = ctx.<Address>adapter(NotNull.class, Map.of("message","{avaje.NotNull.message}"))
             .andThen(ctx.adapter(Address.class));
 
     // Option B: billingAddressValidator only does NotNull ...