rearrange

Author: SentryMan

validator/src/main/java/io/avaje/validation/Validator.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.ServiceLoader;
 
+import io.avaje.validation.adapter.AnnotationValidationAdapter;
 import io.avaje.validation.adapter.CoreValidation;
 import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidatorComponent;

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

@@ -1,9 +1,9 @@
-package io.avaje.validation;
+package io.avaje.validation.adapter;
 
 import java.lang.reflect.Type;
 import java.util.Map;
 
-import io.avaje.validation.adapter.ValidationAdapter;
+import io.avaje.validation.Validator;
 import io.avaje.validation.core.MessageInterpolator;
 
 public interface AnnotationValidationAdapter<T> extends ValidationAdapter<T> {

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

@@ -15,7 +15,6 @@
  */
 package io.avaje.validation.adapter;
 
-import io.avaje.validation.AnnotationValidationAdapter;
 import io.avaje.validation.Validator;
 
 import java.lang.reflect.Type;

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

@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import io.avaje.validation.AnnotationValidationAdapter;
+import io.avaje.validation.adapter.AnnotationValidationAdapter;
 import io.avaje.validation.adapter.ValidationAdapter;
 
 /** Builds and caches the ValidationAdapter adapters for DValidator. */

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

@@ -1,7 +1,6 @@
 package io.avaje.validation.core;
 
 import io.avaje.validation.adapter.ValidationAdapter;
-import io.avaje.validation.ValidationType;
 import io.avaje.validation.adapter.ValidationRequest;
 
 import java.lang.reflect.Type;

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

@@ -13,13 +13,12 @@
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 
-import io.avaje.validation.AnnotationValidationAdapter;
-import io.avaje.validation.AnnotationValidationAdapter.Factory;
-import io.avaje.validation.ValidationType;
 import io.avaje.validation.Validator;
+import io.avaje.validation.adapter.AnnotationValidationAdapter;
 import io.avaje.validation.adapter.CoreValidation;
 import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidatorComponent;
+import io.avaje.validation.adapter.AnnotationValidationAdapter.Factory;
 
 /** Default implementation of Validator. */
 final class DValidator implements Validator {

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

@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import io.avaje.validation.AnnotationValidationAdapter;
+import io.avaje.validation.adapter.AnnotationValidationAdapter;
 import io.avaje.validation.adapter.ValidationRequest;
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.NotBlank;

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

@@ -1,6 +1,6 @@
 package io.avaje.validation.core;
 
-import io.avaje.validation.AnnotationValidationAdapter;
+import io.avaje.validation.adapter.AnnotationValidationAdapter;
 import io.avaje.validation.adapter.ValidationRequest;
 
 public class NoopAnnotationValidator<T> implements AnnotationValidationAdapter<T> {

validator/src/main/java/io/avaje/validation/ValidationType.java renamed to validator/src/main/java/io/avaje/validation/core/ValidationType.java

@@ -1,4 +1,6 @@
-package io.avaje.validation;
+package io.avaje.validation.core;
+
+import io.avaje.validation.ConstraintViolationException;
 
 public interface ValidationType<T> {
 

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

@@ -2,8 +2,8 @@
 
 import java.util.Map;
 
-import io.avaje.validation.AnnotationValidationAdapter;
 import io.avaje.validation.Validator;
+import io.avaje.validation.adapter.AnnotationValidationAdapter;
 import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidationRequest;
 import jakarta.validation.constraints.NotBlank;

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

@@ -2,8 +2,8 @@
 
 import java.util.Map;
 
-import io.avaje.validation.AnnotationValidationAdapter;
 import io.avaje.validation.Validator;
+import io.avaje.validation.adapter.AnnotationValidationAdapter;
 import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidationRequest;
 import jakarta.validation.constraints.NotBlank;