resource 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/DResourceBundleManager.java

@@ -16,6 +16,7 @@ final class DResourceBundleManager {
   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";
+  private final Map<String, String> messageCache = new HashMap<>();
 
   DResourceBundleManager(
       List<String> names, List<ResourceBundle> providedBundles, LocaleResolver localeResolver) {
@@ -61,13 +62,16 @@ private void addBundle(final String name, final Locale locale) {
   @Nullable
   public String message(String template, Locale resolvedLocale) {
 
-    for (final var bundle : map.getOrDefault(resolvedLocale, EMPTY)) {
+    return messageCache.computeIfAbsent(
+        template + resolvedLocale,
+        k -> {
+          for (final var bundle : map.getOrDefault(resolvedLocale, EMPTY)) {
 
-      if (bundle.containsKey(template)) {
-        return bundle.getString(template);
-      }
-    }
-
-    return null;
+            if (bundle.containsKey(template)) {
+              return bundle.getString(template);
+            }
+          }
+          return null;
+        });
   }
 }