Merge pull request #50 from SentryMan/bundling

Configurable Local/ResourceBundles

Author: rob-bygrave

.gitignore

@@ -9,3 +9,4 @@ build/
 *.class
 .DS_Store
 *.factorypath
+validator-generator/.factorypath

blackbox-test/src/test/java/example/avaje/ACustomerMessageTest.java

@@ -13,7 +13,7 @@
 
 class ACustomerMessageTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

blackbox-test/src/test/java/example/avaje/AMyEmailTest.java

@@ -13,7 +13,7 @@
 
 class AMyEmailTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

blackbox-test/src/test/java/example/avaje/AMyMinNumbersTest.java

@@ -15,7 +15,7 @@
 
 class AMyMinNumbersTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   final BigDecimal valid = new BigDecimal("20");
 

blackbox-test/src/test/java/example/avaje/AMyNumbersTest.java

@@ -15,7 +15,7 @@
 
 class AMyNumbersTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

blackbox-test/src/test/java/example/avaje/AMyPatternTest.java

@@ -13,7 +13,7 @@
 
 class AMyPatternTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

blackbox-test/src/test/java/example/avaje/ANumsTest.java

@@ -14,7 +14,7 @@
 
 class ANumsTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

blackbox-test/src/test/java/example/avaje/APastFutureTest.java

@@ -15,7 +15,7 @@
 
 class APastFutureTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

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

@@ -12,7 +12,7 @@
 
 class AllSortsBeanTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   protected ConstraintViolation one(AllSortsBean pojo, Locale locale) {
     try {

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

@@ -13,7 +13,7 @@
 
 class JCustomerMessageTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

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

@@ -13,7 +13,7 @@
 
 class JMyEmailTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

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

@@ -15,7 +15,7 @@
 
 class JMyMinNumbersTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   final BigDecimal valid = new BigDecimal("20");
 

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

@@ -15,7 +15,7 @@
 
 class JMyNumbersTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

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

@@ -13,7 +13,7 @@
 
 class JMyPatternTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

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

@@ -15,7 +15,7 @@
 
 class JNumsTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

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

@@ -14,7 +14,7 @@
 
 class JPastFutureTest {
 
-  final Validator validator = Validator.builder().build();
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
 
   @Test
   void valid() {

validator-generator/.factorypath

@@ -85,13 +85,10 @@
 
   <build>
     <plugins>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
           <annotationProcessorPaths>
             <path>
               <groupId>io.avaje</groupId>

validator-generator/pom.xml

@@ -22,7 +22,6 @@
 import javax.tools.ToolProvider;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 class ValidatorProcessorTest {
@@ -39,10 +38,9 @@ void deleteGeneratedFiles() throws IOException {
     }
   }
 
-  @Disabled
   @Test
   void testGeneration() throws Exception {
-    final String source = Paths.get("src").toAbsolutePath().toString();
+    final String source = Paths.get("src/test/java/io/avaje/validation/generator/models/valid").toAbsolutePath().toString();
 
     final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
     final StandardJavaFileManager manager = compiler.getStandardFileManager(null, null, null);

validator-generator/src/test/java/io/avaje/validation/generator/ValidatorProcessorTest.java

@@ -8,23 +8,20 @@
 import java.lang.reflect.Type;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.ResourceBundle;
 import java.util.ServiceLoader;
 
 public interface Validator {
 
-  /**
-   * Validate the object using the default locale.
-   */
+  /** Validate the object using the default locale. */
   void validate(Object any) throws ConstraintViolationException;
 
   /**
    * Validate the object with a given locale.
    *
-   * <p>If the locale is not one of the supported locales then the
-   * default locale will be used.
+   * <p>If the locale is not one of the supported locales then the default locale will be used.
    *
-   * <p>This is expected to be used when the Validator is configured
-   * to support multiple locales.
+   * <p>This is expected to be used when the Validator is configured to support multiple locales.
    */
   void validate(Object any, Locale locale) throws ConstraintViolationException;
 
@@ -45,6 +42,26 @@ interface Builder {
     /** Add a AnnotationValidationAdapter to use for the given type. */
     <T> Builder add(Class<Annotation> type, ValidationAdapter<T> adapter);
 
+    /**
+     * Lookup ResourceBundles with the given name and for error message interpolation
+     *
+     * @param bundleName the name of the bundleFiles
+     */
+    Builder addResourceBundles(String... bundleName);
+
+    /**
+     * Add ResourceBundle for error message interpolation
+     *
+     * @param bundleName the name of the bundleFiles
+     */
+    Builder addResourceBundles(ResourceBundle... bundle);
+
+    /** Set Default Locale for this validator, if not set, will use Locale.getDefault() */
+    Builder setDefaultLocale(Locale defaultLocale);
+
+    /** Adds an additional Locales for this validator */
+    Builder addLocales(Locale... locales);
+
     /** Add a AdapterBuilder which provides a ValidationAdapter to use for the given type. */
     Builder add(Type type, AdapterBuilder builder);
 

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

@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+@FunctionalInterface
 public interface ValidationAdapter<T> {
 
   /** Return true if validation should recurse */

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

@@ -36,6 +36,7 @@ interface Message {
   /**
    * Factory for creating a ValidationAdapter for a given type.
    */
+  @FunctionalInterface
   interface AdapterFactory {
 
     /**
@@ -49,6 +50,7 @@ interface AdapterFactory {
   /**
    * Factory for creating a ValidationAdapter for a given annotation.
    */
+  @FunctionalInterface
   interface AnnotationFactory {
 
     /**

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

@@ -14,12 +14,11 @@
 
 /** Builds and caches the ValidationAdapter adapters for DValidator. */
 final class CoreAdapterBuilder {
-
+  public static final ValidationAdapter NOOP = (type, req, propertyName) -> true;
   private final DValidator context;
   private final List<ValidationContext.AdapterFactory> factories = new ArrayList<>();
   private final List<ValidationContext.AnnotationFactory> annotationFactories = new ArrayList<>();
   private final Map<Object, ValidationAdapter<?>> adapterCache = new ConcurrentHashMap<>();
-  private final MessageInterpolator interpolator;
 
   CoreAdapterBuilder(
       DValidator context,
@@ -30,7 +29,6 @@ final class CoreAdapterBuilder {
     this.annotationFactories.addAll(userAnnotationFactories);
     this.annotationFactories.add(BasicAdapters.FACTORY);
     this.annotationFactories.add(NumberAdapters.FACTORY);
-    interpolator = context.interpolator();
   }
 
   /** Return the adapter from cache if exists else return null. */
@@ -76,6 +74,6 @@ <T> ValidationAdapter<T> buildAnnotation(Class<? extends Annotation> cls, Map<St
       }
     }
     // unknown annotations have noop
-    return NoopAnnotationValidator.INSTANCE;
+    return NOOP;
   }
 }

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

@@ -1,20 +1,20 @@
 package io.avaje.validation.core;
 
-import io.avaje.lang.Nullable;
-
-import java.util.Collections;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
+import io.avaje.lang.Nullable;
+
 final class DLocaleResolver implements LocaleResolver {
 
   private final Locale defaultLocale;
   private final Set<Locale> otherLocales = new HashSet<>();
 
-  DLocaleResolver(Locale defaultLocale, Locale... others) {
+  DLocaleResolver(Locale defaultLocale, Collection<Locale> others) {
     this.defaultLocale = defaultLocale;
-    Collections.addAll(otherLocales, others);
+    otherLocales.addAll(others);
   }
 
   @Override

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

@@ -1,28 +1,72 @@
 package io.avaje.validation.core;
 
-import io.avaje.lang.Nullable;
+import static java.util.ResourceBundle.getBundle;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
 
-import java.util.*;
+import io.avaje.lang.Nullable;
 
 final class DResourceBundleManager {
 
-  private final Map<Locale, ResourceBundle> map = new HashMap<>();
+  private final Map<Locale, List<ResourceBundle>> map = new HashMap<>();
+  private static final List<ResourceBundle> EMPTY = List.of();
+  private static final String DEFAULT_BUNDLE = "io.avaje.validation.Messages";
+
+  DResourceBundleManager(
+      List<String> names, List<ResourceBundle> providedBundles, LocaleResolver localeResolver) {
 
-  DResourceBundleManager(String name, LocaleResolver localeResolver) {
-    map.put(localeResolver.defaultLocale(), bundle(name, localeResolver.defaultLocale()));
-    for (Locale locale : localeResolver.otherLocales()) {
-      map.put(locale, bundle(name, locale));
+    for (final var name : names) {
+
+      addBundle(name, localeResolver.defaultLocale());
+
+      for (final Locale locale : localeResolver.otherLocales()) {
+
+        addBundle(name, locale);
+      }
+    }
+
+    for (final var bundle : providedBundles) {
+      map.compute(
+          bundle.getLocale(),
+          (local, list) -> {
+            if (list == null) list = new ArrayList<>();
+
+            list.add(bundle);
+            return list;
+          });
+    }
+    // since default is added last, it will be the last place messages will be resolved
+    addBundle(DEFAULT_BUNDLE, localeResolver.defaultLocale());
+
+    for (final Locale locale : localeResolver.otherLocales()) {
+      addBundle(DEFAULT_BUNDLE, locale);
     }
   }
 
-  private static ResourceBundle bundle(String name, Locale locale) {
-    return ResourceBundle.getBundle(name, locale);
+  private void addBundle(final String name, final Locale locale) {
+    map.compute(
+        locale,
+        (local, list) -> {
+          if (list == null) list = new ArrayList<>();
+          list.add(getBundle(name, local));
+          return list;
+        });
   }
 
   @Nullable
   public String message(String template, Locale resolvedLocale) {
-    ResourceBundle bundle = map.get(resolvedLocale);
-    boolean exists = bundle.containsKey(template);
-    return !exists ? null : bundle.getString(template);
+
+    for (final var bundle : map.getOrDefault(resolvedLocale, EMPTY)) {
+
+      if (bundle.containsKey(template)) {
+        return bundle.getString(template);
+      }
+    }
+    return null;
   }
 }