From d866f6eda8d4a4cd14cbc6a9484adc9f37fa5a90 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Wed, 24 May 2023 20:01:41 -0400
Subject: [PATCH] use interpolation interface

---
 .../validation/core/CoreAdapterBuilder.java     |  2 +-
 .../io/avaje/validation/core/DValidator.java    | 17 ++++-------------
 .../validation/core/MessageInterpolator.java    |  4 +++-
 .../core/NoopMessageInterpolator.java           | 17 ++++++++++++++---
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/validator/src/main/java/io/avaje/validation/core/CoreAdapterBuilder.java b/validator/src/main/java/io/avaje/validation/core/CoreAdapterBuilder.java
index e0b05108..965b7d7a 100644
--- a/validator/src/main/java/io/avaje/validation/core/CoreAdapterBuilder.java
+++ b/validator/src/main/java/io/avaje/validation/core/CoreAdapterBuilder.java
@@ -75,7 +75,7 @@ <T> ValidationAdapter<T> buildAnnotation(Class<? extends Annotation> cls, Map<St
         return result;
       }
     }
-    // unknown annotation have noop
+    // unknown annotations have noop
     return NoopAnnotationValidator.INSTANCE;
   }
 }
diff --git a/validator/src/main/java/io/avaje/validation/core/DValidator.java b/validator/src/main/java/io/avaje/validation/core/DValidator.java
index 9439fec6..1b515200 100644
--- a/validator/src/main/java/io/avaje/validation/core/DValidator.java
+++ b/validator/src/main/java/io/avaje/validation/core/DValidator.java
@@ -12,7 +12,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.ServiceLoader;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import io.avaje.lang.Nullable;
@@ -108,22 +107,14 @@ ValidationRequest request(@Nullable Locale locale) {
     return new DRequest(this, 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);
-    // translate the template using msg attributes
-    final Map<String, Object> attributes = msg.attributes();
-    final Set<Map.Entry<String, Object>> entries = attributes.entrySet();
-    String result = template;
-    for (final Map.Entry<String, Object> entry : entries) {
-      // needs work here to improve functionality, support local specific value formatting eg Duration Max
-      result = result.replace('{' + entry.getKey() + '}', String.valueOf(entry.getValue()));
-    }
-    // return the message
-    return result;
+
+    return interpolator.interpolate(template, msg.attributes());
   }
 
   /** Implementation of Validator.Builder. */
@@ -184,7 +175,7 @@ public DValidator build() {
       final var interpolator =
           ServiceLoader.load(MessageInterpolator.class)
               .findFirst()
-              .orElseGet(NoopMessageInterpolator::new);
+              .orElseGet(BasicMessageInterpolator::new);
       return new DValidator(factories, afactories, interpolator, localeResolver);
     }
 
diff --git a/validator/src/main/java/io/avaje/validation/core/MessageInterpolator.java b/validator/src/main/java/io/avaje/validation/core/MessageInterpolator.java
index fe5669c5..6a514f59 100644
--- a/validator/src/main/java/io/avaje/validation/core/MessageInterpolator.java
+++ b/validator/src/main/java/io/avaje/validation/core/MessageInterpolator.java
@@ -1,6 +1,8 @@
 package io.avaje.validation.core;
 
+import java.util.Map;
+
 public interface MessageInterpolator {
 
-  String interpolate(String string);
+  String interpolate(String template, Map<String, Object> attributes);
 }
diff --git a/validator/src/main/java/io/avaje/validation/core/NoopMessageInterpolator.java b/validator/src/main/java/io/avaje/validation/core/NoopMessageInterpolator.java
index 61ef00f0..146c444d 100644
--- a/validator/src/main/java/io/avaje/validation/core/NoopMessageInterpolator.java
+++ b/validator/src/main/java/io/avaje/validation/core/NoopMessageInterpolator.java
@@ -1,9 +1,20 @@
 package io.avaje.validation.core;
 
-final class NoopMessageInterpolator implements MessageInterpolator {
+import java.util.Map;
+
+final class BasicMessageInterpolator implements MessageInterpolator {
 
   @Override
-  public String interpolate(String string) {
-    return string;
+  public String interpolate(String template, Map<String, Object> attributes) {
+
+    String result = template;
+
+    for (final Map.Entry<String, Object> entry : attributes.entrySet()) {
+      // needs work here to improve functionality, support local specific value formatting eg
+      // Duration Max
+      result = result.replace('{' + entry.getKey() + '}', String.valueOf(entry.getValue()));
+    }
+    // return the message
+    return result;
   }
 }