Support Jakarta DecimalMin

Author: rbygrave

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

@@ -0,0 +1,32 @@
+package example.jakarta;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+
+import java.math.BigDecimal;
+
+@Valid
+public class JMyMinNumbers {
+
+  @DecimalMin("10.50")
+  final BigDecimal price;
+
+  @DecimalMin(value = "9.30", inclusive = false)
+  final BigDecimal priceInc;
+
+  public JMyMinNumbers(BigDecimal price, BigDecimal priceInc) {
+    this.price = price;
+    this.priceInc = priceInc;
+  }
+
+  public BigDecimal price() {
+    return price;
+  }
+
+  public BigDecimal priceInc() {
+    return priceInc;
+  }
+
+}

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

@@ -0,0 +1,67 @@
+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.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Locale;
+
+import static java.math.BigDecimal.ONE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+class JMyMinNumbersTest {
+
+  final Validator validator = Validator.builder().build();
+
+  final BigDecimal valid = new BigDecimal("20");
+
+  @Test
+  void valid() {
+    var bean = new JMyMinNumbers(valid, valid);
+    validator.validate(bean);
+  }
+
+  @Test
+  void decimalMin() {
+    var violation = one(new JMyMinNumbers(ONE, valid));
+    assertThat(violation.message()).isEqualTo("must be greater than or equal to 10.50");
+  }
+
+  @Test
+  void decimalMinDE() {
+    var violation = one(new JMyMinNumbers(ONE, valid), Locale.GERMAN);
+    assertThat(violation.message()).isEqualTo("muss größer oder gleich 10.50 sein");
+  }
+
+  @Test
+  void decimalMinExclusive() {
+    var violation = one(new JMyMinNumbers(valid, ONE));
+    assertThat(violation.message()).isEqualTo("must be greater than 9.30");
+  }
+
+  @Test
+  void decimalMaxExclusiveDE() {
+    var violation = one(new JMyMinNumbers(valid, ONE), Locale.GERMAN);
+    assertThat(violation.message()).isEqualTo("muss größer 9.30 sein");
+  }
+
+  ConstraintViolation one(Object any) {
+    return one(any, Locale.ENGLISH);
+  }
+
+  ConstraintViolation one(Object any, Locale locale) {
+    try {
+      validator.validate(any, locale);
+      fail("not expected");
+      return null;
+    } catch (ConstraintViolationException e) {
+      var violations = new ArrayList<>(e.violations());
+      assertThat(violations).hasSize(1);
+      return violations.get(0);
+    }
+  }
+}

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

@@ -24,6 +24,7 @@ interface Handler {
 
     final var jakartaDecimal = new JakartaDecimal();
     handlers.put("jakarta.validation.constraints.DecimalMax", jakartaDecimal);
+    handlers.put("jakarta.validation.constraints.DecimalMin", jakartaDecimal);
   }
 
   private AnnotationUtil() {}
@@ -209,7 +210,7 @@ String messageKey(AnnotationValue defaultValue) {
       final boolean inclusive = (inclusiveValue == null || "true".equals(inclusiveValue.toString()));
       String messageKey = super.messageKey(defaultValue);
       if (!inclusive) {
-        messageKey = messageKey.replace("DecimalMax.message", "DecimalMax.exclusive.message");
+        messageKey = messageKey.replace(".message", ".exclusive.message");
       }
       return messageKey;
     }

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

@@ -29,7 +29,7 @@ private NumberAdapters() {}
             case "DecimalMax" -> new DecimalMaxAdapter(
                 context.message2(attributes), attributes);
             case "DecimalMin" -> new DecimalMinAdapter(
-                context.message("DecimalMin", attributes), attributes);
+                context.message2(attributes), attributes);
 
             default -> null;
           };
@@ -67,11 +67,11 @@ public boolean validate(Number number, ValidationRequest req, String propertyNam
 
   private static final class DecimalMinAdapter implements ValidationAdapter<Number> {
 
-    private final String message;
+    private final ValidationContext.Message message;
     private final BigDecimal value;
     private final boolean inclusive;
 
-    public DecimalMinAdapter(String message, Map<String, Object> attributes) {
+    public DecimalMinAdapter(ValidationContext.Message message, Map<String, Object> attributes) {
       this.message = message;
       this.value = new BigDecimal((String) attributes.get("value"));
       this.inclusive = Optional.ofNullable((Boolean) attributes.get("inclusive")).orElse(true);
@@ -87,7 +87,7 @@ public boolean validate(Number number, ValidationRequest req, String propertyNam
 
       final int comparisonResult = NumberComparatorHelper.compareDecimal(number, value, LESS_THAN);
 
-      if (inclusive ? comparisonResult >= 0 : comparisonResult > 0) {
+      if (inclusive ? comparisonResult < 0 : comparisonResult <= 0) {
         req.addViolation(message, propertyName);
         return false;
       }