message cache

Author: SentryMan

validator/src/main/java/io/avaje/validation/core/CoreAdapterBuilder.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/DValidator.java

@@ -9,6 +9,7 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -31,6 +32,8 @@ final class DValidator implements Validator, ValidationContext {
   private final MessageInterpolator interpolator;
   private final LocaleResolver localeResolver;
   private final DTemplateLookup templateLookup;
+  private final Map<String, String> messageCache = new HashMap<>();
+
 
   DValidator(
       List<AdapterFactory> factories,
@@ -118,12 +121,16 @@ ValidationRequest request(@Nullable Locale locale) {
 
   String interpolate(Message msg, Locale requestLocale) {
 
-    // resolve the locale to use to produce the message
-    final Locale locale = localeResolver.resolve(requestLocale);
-    // lookup in resource bundles using resolved locale and template
-    final String template = templateLookup.lookup(msg.template(), locale);
+    return messageCache.computeIfAbsent(
+        requestLocale.toString() + msg.template(),
+        k -> {
+          // resolve the locale to use to produce the message
+          final Locale locale = localeResolver.resolve(requestLocale);
+          // lookup in resource bundles using resolved locale and template
+          final String template = templateLookup.lookup(msg.template(), locale);
 
-    return interpolator.interpolate(template, msg.attributes());
+          return interpolator.interpolate(template, msg.attributes());
+        });
   }
 
   /** Implementation of Validator.Builder. */