Merge pull request #48 from SentryMan/fuse

Fuse Null/NotNull Adapters

Author: rbygrave

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

@@ -28,7 +28,7 @@ interface Handler {
     final String[] keys = {"AssertFalse", "AssertTrue", "Null", "NotNull", "NotBlank", "NotEmpty",
       "Size", "Email", "Past", "PastOrPresent", "Future", "FutureOrPresent",
       "Digits", "Positive", "PositiveOrZero", "Negative", "NegativeOrZero", "Max", "Min"};
-    for (String key : keys) {
+    for (final String key : keys) {
       handlers.put("io.avaje.validation.constraints." + key, commonHandler);
       handlers.put("jakarta.validation.constraints." + key, commonHandler);
     }
@@ -170,7 +170,6 @@ static class CommonHandler extends StandardHandler {
 
     /** Prototype factory only */
     CommonHandler() {
-      super();
     }
 
     CommonHandler(AnnotationMirror annotationMirror, Element element) {
@@ -189,7 +188,7 @@ void writeAttribute(Name simpleName, AnnotationValue value, AnnotationValue defa
         if ("message".equals(name)) {
           writeAttributeKey("message");
           sb.append(messageKey(defaultValue));
-        } else if (!name.equals("payload") && !name.equals("groups")) {
+        } else if (!"payload".equals(name) && !"groups".equals(name)) {
           super.writeAttribute(simpleName, null, defaultValue);
         }
       } else {
@@ -206,7 +205,6 @@ static class DecimalHandler extends CommonHandler {
 
     /** Prototype factory only */
     DecimalHandler() {
-      super();
     }
 
     @Override
@@ -218,6 +216,7 @@ public String attributes(AnnotationMirror annotationMirror, Element element) {
       super(annotationMirror, element);
     }
 
+    @Override
     String messageKey(AnnotationValue defaultValue) {
       final AnnotationValue inclusiveValue = memberValue("inclusive");
       final boolean inclusive = (inclusiveValue == null || "true".equals(inclusiveValue.toString()));

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

@@ -18,10 +18,10 @@ private BasicAdapters() {}
   public static final ValidationContext.AnnotationFactory FACTORY = (annotationType, context, attributes) ->
     switch (annotationType.getSimpleName()) {
         case "Email" -> new EmailAdapter(context.message(attributes), attributes);
-        case "Null" -> new NullAdapter(context.message(attributes));
-        case "NotNull", "NonNull" -> new NotNullAdapter(context.message(attributes));
-        case "AssertTrue" -> new AssertBooleanAdapter(context.message(attributes), false);
-        case "AssertFalse" -> new AssertBooleanAdapter(context.message(attributes), true);
+        case "Null" -> new NullableAdapter(context.message(attributes), true);
+        case "NotNull", "NonNull" -> new NullableAdapter(context.message(attributes), false);
+        case "AssertTrue" -> new AssertBooleanAdapter(context.message(attributes), Boolean.FALSE);
+        case "AssertFalse" -> new AssertBooleanAdapter(context.message(attributes), Boolean.TRUE);
         case "NotBlank" -> new NotBlankAdapter(context.message(attributes));
         case "NotEmpty" -> new NotEmptyAdapter(context.message(attributes));
         case "Past" -> new FuturePastAdapter(context.message(attributes), true, false);
@@ -43,7 +43,7 @@ private static final class PatternAdapter implements ValidationAdapter<CharSeque
       this.message = message;
       int flags = 0;
 
-      List<RegexFlag> flags1 = (List<RegexFlag>) attributes.get("flags");
+      final List<RegexFlag> flags1 = (List<RegexFlag>) attributes.get("flags");
       if (flags1 != null) {
         for (final var flag : flags1) {
           flags |= flag.getValue();
@@ -86,25 +86,19 @@ public boolean validate(Object value, ValidationRequest req, String propertyName
           req.addViolation(message, propertyName);
           return false;
         }
-      }
-
-      if (value instanceof final Collection<?> col) {
+      } else if (value instanceof final Collection<?> col) {
         final var len = col.size();
         if (len > max || len < min) {
           req.addViolation(message, propertyName);
           return len > 0;
         }
-      }
-
-      if (value instanceof final Map<?, ?> map) {
+      } else if (value instanceof final Map<?, ?> map) {
         final var len = map.size();
         if (len > max || len < min) {
           req.addViolation(message, propertyName);
           return len > 0;
         }
-      }
-
-      if (value.getClass().isArray()) {
+      } else if (value.getClass().isArray()) {
 
         final var len = Array.getLength(value);
         if (len > max || len < min) {
@@ -158,14 +152,21 @@ private static final class NotEmptyAdapter implements ValidationAdapter<Object>
 
     @Override
     public boolean validate(Object value, ValidationRequest req, String propertyName) {
-      if (value == null
-          || value instanceof final Collection<?> col && col.isEmpty()
-          || value instanceof final Map<?, ?> map && map.isEmpty()) {
+      if (value == null) {
         req.addViolation(message, propertyName);
         return false;
+      } else if (value instanceof final Collection<?> col) {
+        if (col.isEmpty()) {
+          req.addViolation(message, propertyName);
+          return false;
+        }
+      } else if (value instanceof final Map<?, ?> map) {
+        if (map.isEmpty()) {
+          req.addViolation(message, propertyName);
+          return false;
+        }
       } else if (value instanceof final CharSequence sequence) {
-        final var len = sequence.length();
-        if (len == 0) {
+        if (sequence.length() == 0) {
           req.addViolation(message, propertyName);
           return false;
         }
@@ -201,35 +202,19 @@ public boolean validate(Boolean type, ValidationRequest req, String propertyName
     }
   }
 
-  private static final class NotNullAdapter implements ValidationAdapter<Object> {
-
-    private final ValidationContext.Message message;
-
-    NotNullAdapter(ValidationContext.Message message) {
-      this.message = message;
-    }
-
-    @Override
-    public boolean validate(Object value, ValidationRequest req, String propertyName) {
-      if (value == null) {
-        req.addViolation(message, propertyName);
-        return false;
-      }
-      return true;
-    }
-  }
-
-  private static final class NullAdapter implements ValidationAdapter<Object> {
+  private static final class NullableAdapter implements ValidationAdapter<Object> {
 
     private final ValidationContext.Message message;
+    private final boolean shouldBeNull;
 
-    NullAdapter(ValidationContext.Message message) {
+    NullableAdapter(ValidationContext.Message message, boolean shouldBeNull) {
       this.message = message;
+      this.shouldBeNull = shouldBeNull;
     }
 
     @Override
     public boolean validate(Object value, ValidationRequest req, String propertyName) {
-      if (value != null) {
+      if ((value == null) != shouldBeNull) {
         req.addViolation(message, propertyName);
         return false;
       }