Merge pull request #83 from SentryMan/validator

Rename AnnotationValidator

Author: rbygrave

blackbox-test/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.13</version>
+    <version>0.14</version>
   </parent>
 
   <artifactId>validator-blackbox-test</artifactId>

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-validator-parent</artifactId>
-  <version>0.13</version>
+  <version>0.14</version>
 
   <packaging>pom</packaging>
   <name>validator parent</name>

validator-constraints/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.avaje</groupId>
 		<artifactId>avaje-validator-parent</artifactId>
-		<version>0.13</version>
+		<version>0.14</version>
 	</parent>
 	<artifactId>validator-constraints</artifactId>
 </project>

validator-generator/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.13</version>
+    <version>0.14</version>
   </parent>
 
   <artifactId>avaje-validator-generator</artifactId>

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

@@ -89,7 +89,7 @@ Collection<String> allImports() {
       packageImports.add(Util.packageOf(adapterFullName) + ".*");
       packageImports.add(Util.baseTypeOfAdapter(adapterFullName));
 
-      AnnotationValidatorPrism.getInstanceOn(adapter)
+      ConstraintValidatorPrism.getInstanceOn(adapter)
           .value()
           .toString()
           .transform(packageImports::add);

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

@@ -25,7 +25,7 @@ final class ContraintReader implements BeanReader {
     importTypes.add("java.util.List");
     importTypes.add("java.util.Set");
     importTypes.add("java.util.Map");
-    importTypes.add("io.avaje.validation.adapter.AnnotationValidator");
+    importTypes.add("io.avaje.validation.adapter.ConstraintValidator");
     importTypes.add("io.avaje.validation.adapter.ValidationAdapter");
     importTypes.add("io.avaje.validation.adapter.ValidationContext");
     importTypes.add("io.avaje.validation.adapter.ValidationRequest");

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

@@ -89,7 +89,7 @@ private void writeClassEnd() {
   private void writeClassStart() {
     writer.append("@Generated").eol();
     if (isContraint) {
-      writer.append("@AnnotationValidator(%s.class)", beanReader.contraintTarget()).eol();
+      writer.append("@ConstraintValidator(%s.class)", beanReader.contraintTarget()).eol();
     }
 
     writer.append("public final class %sValidationAdapter implements ValidationAdapter<%s> ", adapterShortName, beanReader.shortName());

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

@@ -79,7 +79,7 @@ private void writeRegister() {
               .transform(this::typeShortName);
 
       final var target =
-          AnnotationValidatorPrism.getInstanceOn(adapter)
+          ConstraintValidatorPrism.getInstanceOn(adapter)
               .value()
               .toString()
               .transform(Util::shortType)

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

@@ -31,7 +31,7 @@
   HttpValidPrism.PRISM_TYPE,
   JavaxValidPrism.PRISM_TYPE,
   JakartaValidPrism.PRISM_TYPE,
-  AnnotationValidatorPrism.PRISM_TYPE,
+  ConstraintValidatorPrism.PRISM_TYPE,
   AvajeConstraintPrism.PRISM_TYPE,
   JakartaConstraintPrism.PRISM_TYPE,
   JavaxConstraintPrism.PRISM_TYPE,
@@ -87,7 +87,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         .ifPresent(this::writeContraintAdapters);
 
     registerCustomAdapters(
-        round.getElementsAnnotatedWith(element(AnnotationValidatorPrism.PRISM_TYPE)));
+        round.getElementsAnnotatedWith(element(ConstraintValidatorPrism.PRISM_TYPE)));
 
     Optional.ofNullable(element(AvajeValidPrism.PRISM_TYPE))
         .map(round::getElementsAnnotatedWith)

validator-generator/src/main/java/io/avaje/validation/generator/package-info.java

@@ -3,7 +3,7 @@
     name = "AvajeValidPrism",
     superInterfaces = ValidPrism.class)
 @GeneratePrism(io.avaje.validation.ImportValidPojo.class)
-@GeneratePrism(io.avaje.validation.adapter.AnnotationValidator.class)
+@GeneratePrism(io.avaje.validation.adapter.ConstraintValidator.class)
 @GeneratePrism(
     value = javax.validation.Valid.class,
     name = "JavaxValidPrism",

validator-generator/src/test/java/io/avaje/validation/generator/models/valid/CustomAnnotationAdapter.java

@@ -4,12 +4,12 @@
 import java.util.Set;
 
 import io.avaje.lang.Nullable;
-import io.avaje.validation.adapter.AnnotationValidator;
+import io.avaje.validation.adapter.ConstraintValidator;
 import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidationContext;
 import io.avaje.validation.adapter.ValidationRequest;
 
-@AnnotationValidator(Nullable.class)
+@ConstraintValidator(Nullable.class)
 public final class CustomAnnotationAdapter implements ValidationAdapter<Object> {
 
   public CustomAnnotationAdapter(ValidationContext ctx, Set<Class<?>> groups, Map<String, Object> attributes) {}

validator-http-plugin/pom.xml

@@ -5,15 +5,15 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.13</version>
+    <version>0.14</version>
   </parent>
   <artifactId>avaje-validator-http-plugin</artifactId>
   <name>validator-http-plugin</name>
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-validator</artifactId>
-      <version>0.12</version>
+      <version>0.13</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

validator-inject-plugin/pom.xml

@@ -5,15 +5,15 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.13</version>
+    <version>0.14</version>
   </parent>
   <artifactId>avaje-validator-inject-plugin</artifactId>
   <name>validator-inject-plugin</name>
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-validator</artifactId>
-      <version>0.12</version>
+      <version>0.13</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

validator-inject-plugin/src/main/java/io/avaje/validation/inject/spi/DefaultValidatorProvider.java

@@ -12,7 +12,6 @@
 import io.avaje.inject.spi.GenericType;
 import io.avaje.validation.ValidMethod;
 import io.avaje.validation.Validator;
-import io.avaje.validation.adapter.ValidationContext;
 import io.avaje.validation.inject.aspect.AOPMethodValidator;
 import io.avaje.validation.inject.aspect.MethodAdapterProvider;
 
@@ -86,7 +85,7 @@ private void paramAspect(BeanScopeBuilder builder) {
 
           builder.addPostConstruct(
               b -> {
-                final var ctx = (ValidationContext) b.get(Validator.class);
+                final var ctx = b.get(Validator.class).context();
                 final var map =
                     b.list(MethodAdapterProvider.class).stream()
                         .collect(toMap(MethodAdapterProvider::provide, p -> p));

validator-inject-plugin/src/test/java/io/avaje/validation/inject/aspect/TestMethodValidation.java

@@ -1,7 +1,6 @@
 package io.avaje.validation.inject.aspect;
 
 import static java.util.stream.Collectors.toMap;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 

validator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.13</version>
+    <version>0.14</version>
   </parent>
 
   <artifactId>avaje-validator</artifactId>

validator/src/main/java/io/avaje/validation/adapter/AnnotationValidator.java renamed to validator/src/main/java/io/avaje/validation/adapter/ConstraintValidator.java

@@ -7,14 +7,14 @@
 
 /**
  *
- * Marks a type as a Annotation Validator to be registered automatically.
+ * Marks a type as a Constraint Validator to be registered automatically.
  *
  * <p> A custom adapter registered using this annotation must have a public constructor accepting a ValidationContext instance, and must directly implement the ValidationAdapter Interface.
  *
  * <h3>Example:</h3>
  *
  * <pre>{@code
- * @AnnotationValidator(SomeAnnotation.class)
+ * @ConstraintValidator(SomeAnnotation.class)
  * public final class CustomAnnotationAdapter implements ValidationAdapter<Object> {
  *
  *   private final Message message;
@@ -44,7 +44,7 @@
  * }</pre>
  */
 @Target(TYPE)
-public @interface AnnotationValidator {
+public @interface ConstraintValidator {
 
   /** The Annotation this validator targets */
   Class<? extends Annotation> value();

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

@@ -31,7 +31,7 @@ public interface ValidationContext {
   <T> ValidationAdapter<T> adapter(Type type);
 
   /**
-   * Return the annotation adapter for the given annotation with attributes.
+   * Return the constraint adapter for the given annotation with attributes.
    *
    * @param cls The annotation class
    * @param attributes The attributes associated with the annotation
@@ -41,7 +41,7 @@ public interface ValidationContext {
   <T> ValidationAdapter<T> adapter(Class<? extends Annotation> cls, Map<String, Object> attributes);
 
   /**
-   * Return the adapter for the given annotation with attributes. Used for adapters that combine
+   * Return the constraint adapter for the given annotation with attributes. Used for adapters that combine
    * multiple annotation adapters.
    *
    * @param cls The class representing the annotation type