Max for Integer, Long, BigDecimal using _type attribute switch

Author: rbygrave

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

@@ -161,5 +161,7 @@ interface AdapterCreateRequest {
     Map<String, Object> attributes();
 
     Message message();
+
+    String targetType();
   }
 }

validator/src/main/java/io/avaje/validation/core/CoreAdapterBuilder.java

@@ -114,6 +114,11 @@ record Request(
 
   ) implements ValidationContext.AdapterCreateRequest {
 
+    @Override
+    public String targetType() {
+      return (String)attributes.get("_type");
+    }
+
     @Override
     public ValidationContext.Message message() {
       return ctx.message(attributes);

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

@@ -0,0 +1,79 @@
+package io.avaje.validation.core.adapters;
+
+import io.avaje.validation.adapter.AbstractConstraintAdapter;
+import io.avaje.validation.adapter.ValidationContext.AdapterCreateRequest;
+
+import java.math.BigDecimal;
+
+class NumMax {
+
+  static abstract class MaxIntegerBase<T> extends AbstractConstraintAdapter<T> {
+
+    protected final long value;
+
+    MaxIntegerBase(AdapterCreateRequest request) {
+      super(request);
+      final var attributes = request.attributes();
+      this.value = (long) attributes.get("value");
+    }
+
+    MaxIntegerBase(AdapterCreateRequest request, long value) {
+      super(request);
+      this.value = value;
+    }
+  }
+
+  static final class IntegerAdapter extends MaxIntegerBase<Integer> {
+
+    IntegerAdapter(AdapterCreateRequest request) {
+      super(request);
+    }
+
+    IntegerAdapter(AdapterCreateRequest request, long value) {
+      super(request, value);
+    }
+
+    @Override
+    public boolean isValid(Integer number) {
+      // null values are valid
+      return number == null || number <= value;
+    }
+  }
+
+  static final class LongAdapter extends MaxIntegerBase<Long> {
+
+    LongAdapter(AdapterCreateRequest request) {
+      super(request);
+    }
+
+    LongAdapter(AdapterCreateRequest request, long value) {
+      super(request, value);
+    }
+
+    @Override
+    public boolean isValid(Long number) {
+      // null values are valid
+      return number == null || number <= value;
+    }
+  }
+
+  static final class BigDecimalAdapter extends MaxIntegerBase<BigDecimal> {
+
+    private final BigDecimal bdMax;
+    BigDecimalAdapter(AdapterCreateRequest request) {
+      super(request);
+      this.bdMax = BigDecimal.valueOf(value);
+    }
+
+    BigDecimalAdapter(AdapterCreateRequest request, long value) {
+      super(request, value);
+      this.bdMax = BigDecimal.valueOf(value);
+    }
+
+    @Override
+    public boolean isValid(BigDecimal number) {
+      // null values are valid
+      return number == null || number.compareTo(bdMax) <= 0;
+    }
+  }
+}

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

@@ -7,27 +7,41 @@
 import java.util.Optional;
 
 import io.avaje.validation.adapter.AbstractConstraintAdapter;
+import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidationContext;
 import io.avaje.validation.adapter.ValidationContext.AdapterCreateRequest;
 
 public final class NumberAdapters {
   private NumberAdapters() {}
 
   public static final ValidationContext.AnnotationFactory FACTORY =
-      request->switch (request.annotationType().getSimpleName()) {
+    request -> switch (request.annotationType().getSimpleName()) {
     case "Digits" -> new DigitsAdapter(request);
     case "Positive" -> new PositiveAdapter(request, false);
     case "PositiveOrZero" -> new PositiveAdapter(request, true);
     case "Negative" -> new NegativeAdapter(request, false);
     case "NegativeOrZero" -> new NegativeAdapter(request, true);
-    case "Max" -> new MaxAdapter(request);
+    case "Max" -> forMax(request);
     case "Min" -> new MinAdapter(request);
     case "DecimalMax" -> new DecimalMaxAdapter(request);
     case "DecimalMin" -> new DecimalMinAdapter(request);
     case "Range" -> new RangeAdapter(request);
     default -> null;
   };
 
+  private static ValidationAdapter<?> forMax(AdapterCreateRequest request) {
+    final String targetType = request.targetType();
+    if (targetType == null) {
+      return new MaxAdapter(request);
+    }
+    return switch (targetType) {
+      case "Integer" -> new NumMax.IntegerAdapter(request);
+      case "Long" -> new NumMax.LongAdapter(request);
+      case "BigDecimal" -> new NumMax.BigDecimalAdapter(request);
+      default -> new MaxAdapter(request);
+    };
+  }
+
   private static final class DecimalMaxAdapter extends AbstractConstraintAdapter<Number> {
 
     private final BigDecimal value;