Composable Constraints

blackbox-test/src/main/java/example/avaje/composable/DigitsContraint.java

@@ -0,0 +1,23 @@
+package example.avaje.composable;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import io.avaje.validation.constraints.Constraint;
+import io.avaje.validation.constraints.Digits;
+import io.avaje.validation.constraints.Negative;
+import io.avaje.validation.constraints.Positive;
+
+@Digits(integer = 2)
+@Constraint
+@Retention(SOURCE)
+@Target(TYPE)
+public @interface DigitsContraint {
+
+  String message() default "";
+
+  Class<?>[] groups() default {};
+}

blackbox-test/src/main/java/example/avaje/composable/PositiveContraint.java

@@ -0,0 +1,22 @@
+package example.avaje.composable;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import io.avaje.validation.constraints.Constraint;
+import io.avaje.validation.constraints.Positive;
+
+@Positive
+@Constraint
+@Target(TYPE)
+@Retention(SOURCE)
+@DigitsContraint
+public @interface PositiveContraint {
+
+  String message() default "";
+
+  Class<?>[] groups() default {};
+}

blackbox-test/src/main/java/example/avaje/composable/Sans.java

@@ -0,0 +1,7 @@
+package example.avaje.composable;
+
+import jakarta.validation.Valid;
+
+@Valid
+public record Sans(
+    @SansPositiveContraint(message = "must have positive double digit amount of puns") int puns) {}

blackbox-test/src/main/java/example/avaje/composable/SansPositiveContraint.java

@@ -0,0 +1,21 @@
+package example.avaje.composable;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import jakarta.validation.Constraint;
+
+@Retention(SOURCE)
+@Target(FIELD)
+@Constraint(validatedBy = {})
+@PositiveContraint(message = "ignored message")
+public @interface SansPositiveContraint {
+
+  String message();
+
+  Class<?>[] groups() default {};
+}

blackbox-test/src/test/java/example/avaje/composable/SansComposableTest.java

@@ -0,0 +1,46 @@
+package example.avaje.composable;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import io.avaje.validation.ConstraintViolation;
+import io.avaje.validation.ConstraintViolationException;
+import io.avaje.validation.Validator;
+
+class SansComposableTest {
+
+  final Validator validator = Validator.builder().build();
+
+  @Test
+  void valid() {
+    final var undertale = new Sans(10);
+    validator.validate(undertale);
+  }
+
+  @Test
+  void invalid() {
+    var violations = violations(new Sans(-10));
+
+    violations.forEach(
+        v -> assertThat(v.message()).isEqualTo("must have positive double digit amount of puns"));
+
+    violations = violations(new Sans(-420));
+
+    violations.forEach(
+        v -> assertThat(v.message()).isEqualTo("must have positive double digit amount of puns"));
+  }
+
+  Set<ConstraintViolation> violations(Object any) {
+    try {
+      validator.validate(any);
+      fail("not expected");
+      return null;
+    } catch (final ConstraintViolationException e) {
+      return e.violations();
+    }
+  }
+}

validator-constraints/pom.xml

@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>io.avaje</groupId>
-        <artifactId>avaje-validator-parent</artifactId>
-        <version>0.1-SNAPSHOT</version>
-    </parent>
-    <artifactId>validator-constraints</artifactId>
-
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>io.avaje</groupId>
+		<artifactId>avaje-validator-parent</artifactId>
+		<version>0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>validator-constraints</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>io.avaje</groupId>
+			<artifactId>avaje-validator</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 </project>

validator-constraints/src/main/java/io/avaje/validation/constraints/AssertFalse.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import java.lang.annotation.Documented;
@@ -11,18 +13,19 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({METHOD, FIELD, TYPE_USE})
+@Constraint
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(AssertFalse.List.class)
 public @interface AssertFalse {
-    String message() default "{avaje.AssertFalse.message}";
+  String message() default "{avaje.AssertFalse.message}";
 
-    Class<?>[] groups() default {};
+  Class<?>[] groups() default {};
 
-    @Target({ElementType.METHOD, ElementType.FIELD})
-    @Retention(RetentionPolicy.RUNTIME)
-    @Documented
-    @interface List {
-        AssertFalse[] value();
-    }
+  @Target({ElementType.METHOD, ElementType.FIELD})
+  @Retention(RetentionPolicy.RUNTIME)
+  @Documented
+  @interface List {
+    AssertFalse[] value();
+  }
 }

validator-constraints/src/main/java/io/avaje/validation/constraints/AssertTrue.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import java.lang.annotation.Documented;
@@ -11,18 +13,19 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({METHOD, FIELD, TYPE_USE})
+@Constraint
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(AssertTrue.List.class)
 public @interface AssertTrue {
-    String message() default "{avaje.AssertTrue.message}";
+  String message() default "{avaje.AssertTrue.message}";
 
-    Class<?>[] groups() default {};
+  Class<?>[] groups() default {};
 
-    @Target({ElementType.METHOD, ElementType.FIELD})
-    @Retention(RetentionPolicy.RUNTIME)
-    @Documented
-    @interface List {
-        AssertTrue[] value();
-    }
+  @Target({ElementType.METHOD, ElementType.FIELD})
+  @Retention(RetentionPolicy.RUNTIME)
+  @Documented
+  @interface List {
+    AssertTrue[] value();
+  }
 }

validator-constraints/src/main/java/io/avaje/validation/constraints/Constraint.java

@@ -0,0 +1,12 @@
+package io.avaje.validation.constraints;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/** Marks an annotation class as a Constraint. */
+@Retention(CLASS)
+@Target({ANNOTATION_TYPE})
+public @interface Constraint {}

validator-constraints/src/main/java/io/avaje/validation/constraints/DecimalMax.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -11,7 +13,8 @@
 
 import io.avaje.validation.constraints.DecimalMax.List;
 
-@Target({METHOD, FIELD, TYPE_USE})
+@Constraint
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RUNTIME)
 @Repeatable(List.class)
 public @interface DecimalMax {

validator-constraints/src/main/java/io/avaje/validation/constraints/DecimalMin.java

@@ -6,8 +6,11 @@
  */
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_USE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Repeatable;
@@ -36,7 +39,8 @@
  *
  * @author Emmanuel Bernard
  */
-@Target({METHOD, FIELD})
+@Constraint
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RUNTIME)
 @Repeatable(List.class)
 public @interface DecimalMin {

validator-constraints/src/main/java/io/avaje/validation/constraints/Digits.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import java.lang.annotation.Documented;
@@ -11,7 +13,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({METHOD, FIELD, TYPE_USE})
+@Constraint
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(Digits.List.class)
 public @interface Digits {

validator-constraints/src/main/java/io/avaje/validation/constraints/Email.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -18,7 +20,8 @@
  *
  * <p>Accepts {@code CharSequence}. {@code null} elements are considered valid.
  */
-@Target({METHOD, FIELD, TYPE_USE})
+@Constraint
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RUNTIME)
 @Repeatable(List.class)
 @Documented

validator-constraints/src/main/java/io/avaje/validation/constraints/Future.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -10,8 +12,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+@Constraint
 @Documented
-@Target({METHOD, FIELD, TYPE_USE})
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RUNTIME)
 @Repeatable(Future.List.class)
 public @interface Future {

validator-constraints/src/main/java/io/avaje/validation/constraints/FutureOrPresent.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -10,8 +12,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+@Constraint
 @Documented
-@Target({METHOD, FIELD, TYPE_USE})
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RUNTIME)
 @Repeatable(FutureOrPresent.List.class)
 public @interface FutureOrPresent {

validator-constraints/src/main/java/io/avaje/validation/constraints/Max.java

@@ -1,7 +1,9 @@
 package io.avaje.validation.constraints;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import java.lang.annotation.Documented;
@@ -11,7 +13,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({METHOD, FIELD, TYPE_USE})
+@Constraint
+@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(Max.List.class)
 public @interface Max {