move null check into AbstractConstraintAdapter (#272)

Author: SentryMan

validator/src/main/java/io/avaje/validation/adapter/AbstractConstraintAdapter.java

@@ -5,6 +5,8 @@
 
 import java.util.Set;
 
+import org.jspecify.annotations.NonNull;
+
 /** Abstract Adapter that validates objects based on Constraint Annotations. */
 public abstract class AbstractConstraintAdapter<T> implements ValidationAdapter<T> {
 
@@ -23,11 +25,11 @@ protected AbstractConstraintAdapter(AdapterCreateRequest request) {
    * @param value the object to validate
    * @return false if a violation error should be added
    */
-  protected abstract boolean isValid(T value);
+  protected abstract boolean isValid(@NonNull T value);
 
   @Override
   public final boolean validate(T value, ValidationRequest req, String propertyName) {
-    if (!checkGroups(groups, req)) {
+    if (value == null || !checkGroups(groups, req)) {
       return true;
     }
     if (!isValid(value)) {

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

@@ -63,7 +63,7 @@ static sealed class PatternAdapter extends AbstractConstraintAdapter<CharSequenc
 
     @Override
     public boolean isValid(CharSequence value) {
-      return value == null || !pattern.test(value.toString());
+      return !pattern.test(value.toString());
     }
   }
 
@@ -239,7 +239,7 @@ private static final class AssertBooleanAdapter extends PrimitiveAdapter<Boolean
 
     @Override
     public boolean isValid(Boolean value) {
-      return value == null || assertBool == value;
+      return assertBool == value;
     }
 
     @Override

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

@@ -52,9 +52,6 @@ private TemporalAmount nowTolerance(boolean negateTolerance) {
 
   @Override
   protected boolean isValid(Object value) {
-    if (value == null) {
-      return true;
-    }
     return switch (_type) {
       case "Temporal.Instant" -> compare((Instant) value);
       case "Temporal.LocalDate" -> compare((LocalDate) value);

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

@@ -42,7 +42,7 @@ final class EmailAdapter extends PatternAdapter {
 
   @Override
   public boolean isValid(CharSequence value) {
-    if (value == null || value.length() == 0) {
+    if (value.length() == 0) {
       return true;
     }
 

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

@@ -28,9 +28,7 @@ final class FuturePastAdapter extends AbstractConstraintAdapter<Object> {
 
   @Override
   public boolean isValid(Object obj) {
-    if (obj == null) {
-      return true;
-    }
+
     return switch (_type) {
       case "Temporal.Date" -> compare(((Date) obj).getTime(), Clock::millis);
       case "Temporal.Instant" -> compare((Instant) obj, Instant::now);

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

@@ -76,10 +76,6 @@ private static final class DecimalMaxAdapter extends AbstractConstraintAdapter<O
 
     @Override
     public boolean isValid(Object number) {
-      // null values are valid
-      if (number == null) {
-        return true;
-      }
       final int comparisonResult =
           NumberComparatorHelper.compareDecimal(targetType, number, value, LESS_THAN);
       return !(inclusive ? comparisonResult > 0 : comparisonResult >= 0);
@@ -102,10 +98,6 @@ private static final class DecimalMinAdapter extends AbstractConstraintAdapter<O
 
     @Override
     public boolean isValid(Object number) {
-      // null values are valid
-      if (number == null) {
-        return true;
-      }
       final int comparisonResult =
           NumberComparatorHelper.compareDecimal(targetType, number, value, LESS_THAN);
       return !(inclusive ? comparisonResult < 0 : comparisonResult <= 0);
@@ -130,10 +122,6 @@ private static final class MaxAdapter extends PrimitiveAdapter<Number>
 
     @Override
     public boolean isValid(Number number) {
-      // null values are valid
-      if (number == null) {
-        return true;
-      }
       return switch (targetType) {
         case "Integer", "Long", "Short", "Byte" -> number.longValue() <= max;
         case "Double", "Number" -> compareDouble(number.doubleValue(), max, GREATER_THAN) <= 0;
@@ -185,7 +173,7 @@ static final class MaxBigDecimal extends AbstractConstraintAdapter<BigDecimal>
 
     @Override
     public boolean isValid(BigDecimal number) {
-      return number == null || number.compareTo(max) <= 0;
+      return number.compareTo(max) <= 0;
     }
   }
 
@@ -201,7 +189,7 @@ static final class MaxBigInteger extends AbstractConstraintAdapter<BigInteger>
 
     @Override
     public boolean isValid(BigInteger number) {
-      return number == null || number.compareTo(max) <= 0;
+      return number.compareTo(max) <= 0;
     }
   }
 
@@ -219,9 +207,6 @@ private static final class MinAdapter extends PrimitiveAdapter<Number>
 
     @Override
     public boolean isValid(Number number) {
-      if (number == null) {
-        return true;
-      }
       return switch (targetType) {
         case "Integer", "Long", "Short", "Byte" -> number.longValue() >= min;
         case "Double" -> compareDouble(number.doubleValue(), min, LESS_THAN) >= 0;
@@ -273,7 +258,7 @@ static final class MinBigDecimal extends AbstractConstraintAdapter<BigDecimal>
 
     @Override
     public boolean isValid(BigDecimal number) {
-      return number == null || number.compareTo(min) >= 0;
+      return number.compareTo(min) >= 0;
     }
   }
 
@@ -289,7 +274,7 @@ static final class MinBigInteger extends AbstractConstraintAdapter<BigInteger>
 
     @Override
     public boolean isValid(BigInteger number) {
-      return number == null || number.compareTo(min) >= 0;
+      return number.compareTo(min) >= 0;
     }
   }
 
@@ -306,10 +291,6 @@ private static final class DigitsAdapter extends AbstractConstraintAdapter<Objec
 
     @Override
     public boolean isValid(Object value) {
-      // null values are valid
-      if (value == null) {
-        return true;
-      }
 
       BigDecimal bigNum;
       if (value instanceof final BigDecimal bd) {
@@ -337,10 +318,6 @@ private static final class PositiveAdapter extends PrimitiveAdapter<Object> {
 
     @Override
     public boolean isValid(Object value) {
-      // null values are valid
-      if (value == null) {
-        return true;
-      }
       final int sign = NumberSignHelper.signum(targetType, value, LESS_THAN);
       return !(inclusive ? sign < 0 : sign <= 0);
     }
@@ -389,10 +366,6 @@ private static final class NegativeAdapter extends PrimitiveAdapter<Object> {
 
     @Override
     public boolean isValid(Object value) {
-      // null values are valid
-      if (value == null) {
-        return true;
-      }
       final int sign = NumberSignHelper.signum(targetType, value, GREATER_THAN);
       return !(inclusive ? sign > 0 : sign >= 0);
     }
@@ -446,9 +419,6 @@ private static final class RangeAdapter extends PrimitiveAdapter<Number> {
 
     @Override
     public boolean isValid(Number value) {
-      if (value == null) {
-        return true;
-      }
       return minAdapter.isValid(value) && maxAdapter.isValid(value);
     }
 
@@ -496,9 +466,6 @@ private static final class RangeStringAdapter extends AbstractConstraintAdapter<
 
     @Override
     public boolean isValid(Object value) {
-      if (value == null) {
-        return true;
-      }
       final var decimal = new BigDecimal(value.toString());
       return min.compareTo(decimal) <= 0 && max.compareTo(decimal) >= 0;
     }

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

@@ -30,9 +30,6 @@ final class UriAdapter extends AbstractConstraintAdapter<Object> {
 
   @Override
   protected boolean isValid(Object value) {
-    if (value == null) {
-      return true;
-    }
     try {
       final var stringValue = String.valueOf(value);
       final var uri = URI.create(stringValue);

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

@@ -13,9 +13,6 @@ final class UuidAdapter extends AbstractConstraintAdapter<Object> {
 
   @Override
   protected boolean isValid(Object value) {
-    if (value == null) {
-      return true;
-    }
     try {
       UUID.fromString(String.valueOf(value));
       return true;

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

@@ -21,6 +21,9 @@ public AddressValidationAdapter(ValidationContext ctx) {
 
   @Override
   public boolean validate(Address pojo, ValidationRequest request, String propertyName) {
+
+    if (pojo == null) return false;
+
     if (propertyName != null) {
       request.pushPath(propertyName);
     }

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

@@ -27,6 +27,9 @@ public ContactValidationAdapter(ValidationContext ctx) {
 
   @Override
   public boolean validate(Contact pojo, ValidationRequest request, String propertyName) {
+
+    if (pojo == null) return false;
+
     if (propertyName != null) {
       request.pushPath(propertyName);
     }