lookup message cache

Author: SentryMan

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

@@ -16,7 +16,6 @@ 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) {
@@ -62,16 +61,12 @@ private void addBundle(final String name, final Locale locale) {
   @Nullable
   public String message(String template, Locale resolvedLocale) {
 
-    return messageCache.computeIfAbsent(
-        template + resolvedLocale,
-        k -> {
-          for (final var bundle : map.getOrDefault(resolvedLocale, EMPTY)) {
+    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;
   }
 }

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

@@ -1,9 +1,12 @@
 package io.avaje.validation.core;
 
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 final class DTemplateLookup {
   private final DResourceBundleManager bundleManager;
+  private final Map<String, String> messageCache = new HashMap<>();
 
   DTemplateLookup(DResourceBundleManager defaultBundle) {
     this.bundleManager = defaultBundle;
@@ -15,7 +18,9 @@ String lookup(String template, Locale resolvedLocale) {
     }
     final String key = template.substring(1, template.length() - 1);
 
-    final String msg = bundleManager.message(key, resolvedLocale);
+    final String msg =
+        messageCache.computeIfAbsent(
+            key + resolvedLocale, k -> bundleManager.message(key, resolvedLocale));
     if (msg != null) {
       return msg;
     }