Recursive Bundle Lookup

validator-http-plugin/src/main/java/io/avaje/validation/http/DefaultValidatorProvider.java → validator-http-plugin/src/main/java/io/avaje/validation/http/HttpValidatorProvider.java

@@ -8,7 +8,7 @@
 import io.avaje.inject.BeanScopeBuilder;
 
 /** Plugin for avaje inject that provides a default Http Validator instance. */
-public final class DefaultValidatorProvider implements io.avaje.inject.spi.Plugin {
+public final class HttpValidatorProvider implements io.avaje.inject.spi.Plugin {
 
   @Override
   public Class<?>[] provides() {

validator-http-plugin/src/main/java/module-info.java

@@ -1,7 +1,9 @@
 module io.avaje.validation.http {
 
+  exports io.avaje.validation.http;
+
   requires transitive io.avaje.validation.plugin;
   requires transitive io.avaje.http.api;
 
-  provides io.avaje.inject.spi.Plugin with io.avaje.validation.http.DefaultValidatorProvider;
+  provides io.avaje.inject.spi.Plugin with io.avaje.validation.http.HttpValidatorProvider;
 }

validator-http-plugin/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin

@@ -1 +1 @@
-io.avaje.validation.http.DefaultValidatorProvider
+io.avaje.validation.http.HttpValidatorProvider

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

@@ -3,6 +3,7 @@
 import io.avaje.lang.Nullable;
 import io.avaje.validation.adapter.*;
 import io.avaje.validation.core.DefaultBootstrap;
+import io.avaje.validation.spi.MessageInterpolator;
 import io.avaje.validation.spi.ValidatorCustomizer;
 
 import java.lang.annotation.Annotation;
@@ -96,6 +97,11 @@ interface Builder {
     /** Define the acceptable margin of error when comparing date/time in temporal constraints. */
     Builder temporalTolerance(Duration temporalTolerance);
 
+    /**
+    * Set the MessageInterpolator that will be used to parse and interpolate error messages
+    */
+    Builder messageInterpolator(MessageInterpolator interpolator);
+
     /**
      * Enable/Disable fail fast mode. When fail fast is enabled the validation will stop on the
      * first constraint violation detected.
@@ -123,6 +129,7 @@ interface Builder {
      * Build and return the Validator instance with all the given adapters and factories registered.
      */
     Validator build();
+
   }
 
   /** Function to build a ValidationAdapter from a Validation Context */

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

@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.ServiceLoader;
 import java.util.Set;
@@ -172,11 +173,12 @@ static final class DBuilder implements Validator.Builder {
     private final List<AnnotationFactory> afactories = new ArrayList<>();
     private final List<String> bundleNames = new ArrayList<>();
     private final List<ResourceBundle> bundles = new ArrayList<>();
-    private final List<Locale> otherLocals = new ArrayList<>();
-    private Locale defaultLocal = Locale.getDefault();
+    private final List<Locale> otherLocales = new ArrayList<>();
+    private Locale defaultLocale = Locale.getDefault();
     private Supplier<Clock> clockSupplier = Clock::systemDefaultZone;
     private Duration temporalTolerance = Duration.ZERO;
     private boolean failfast;
+    private MessageInterpolator userInterpolator;
 
     @Override
     public Builder add(Type type, AdapterBuilder builder) {
@@ -230,13 +232,13 @@ public Builder addResourceBundles(ResourceBundle... bundle) {
 
     @Override
     public Builder setDefaultLocale(Locale defaultLocal) {
-      this.defaultLocal = defaultLocal;
+      this.defaultLocale = defaultLocal;
       return this;
     }
 
     @Override
     public Builder addLocales(Locale... locals) {
-      Collections.addAll(otherLocals, locals);
+      Collections.addAll(otherLocales, locals);
       return this;
     }
 
@@ -258,6 +260,12 @@ public Builder failFast(boolean failfast) {
       return this;
     }
 
+    @Override
+    public Builder messageInterpolator(MessageInterpolator interpolator) {
+      this.userInterpolator = interpolator;
+      return this;
+    }
+
     private void registerComponents() {
       // first register all user defined ValidatorCustomizer
       for (final ValidatorCustomizer next : ServiceLoader.load(ValidatorCustomizer.class)) {
@@ -272,11 +280,12 @@ private void registerComponents() {
     public DValidator build() {
       registerComponents();
 
-      final var localeResolver = new LocaleResolver(defaultLocal, otherLocals);
+      final var localeResolver = new LocaleResolver(defaultLocale, otherLocales);
       final var interpolator =
-          ServiceLoader.load(MessageInterpolator.class)
-              .findFirst()
+          Optional.ofNullable(this.userInterpolator)
+              .or(() -> ServiceLoader.load(MessageInterpolator.class).findFirst())
               .orElseGet(BasicMessageInterpolator::new);
+
       return new DValidator(
           factories,
           afactories,

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

@@ -16,7 +16,7 @@ String lookup(String template, Locale resolvedLocale) {
     final String key = template.substring(1, template.length() - 1);
     final String msg = bundleManager.message(key, resolvedLocale);
     if (msg != null) {
-      return msg;
+      return lookup(msg, resolvedLocale);
     }
     return template;
   }

validator/src/main/java/io/avaje/validation/spi/MessageInterpolator.java

@@ -8,9 +8,9 @@ public interface MessageInterpolator {
   /**
    * Interpolate the given message with the annotation attributes
    *
-   * @param template template
-   * @param attributes
-   * @return the interpolated validation error message
+   * @param template The template loaded from annotation/resourceBundle
+   * @param attributes The Constraint annotation's attributes
+   * @return The interpolated validation error message
    */
   String interpolate(String template, Map<String, Object> attributes);
 }