[fit] 修改校验处理插值器，提供默认地区设置功能

Author: Yager-42

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/main/java/modelengine/fitframework/validation/LocaleContextMessageInterpolator.java

@@ -26,25 +26,62 @@
 public class LocaleContextMessageInterpolator implements MessageInterpolator {
     private final MessageInterpolator targetInterpolator;
 
+    private Locale locale;
+
     /**
      * 构造函数。
      *
      * @param targetInterpolator 表示目标检验消息处理对象的 {@link MessageInterpolator}。
      */
     public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator) {
         this.targetInterpolator = targetInterpolator;
+        this.locale = Locale.getDefault();
     }
 
     /**
      * 构造函数，默认使用 {@link ParameterMessageInterpolator} 作为目标检验消息处理对象。
      */
     public LocaleContextMessageInterpolator() {
         this.targetInterpolator = new ParameterMessageInterpolator();
+        this.locale = Locale.getDefault();
+    }
+
+    /**
+     * 构造函数。
+     *
+     * @param locale 表示当前设置默认的 {@link Locale}。
+     */
+    public LocaleContextMessageInterpolator(Locale locale) {
+        this.targetInterpolator = new ParameterMessageInterpolator();
+        this.locale = locale;
+    }
+
+    /**
+     * 构造函数。
+     *
+     * @param targetInterpolator 表示目标检验消息处理对象的 {@link MessageInterpolator}。
+     * @param locale 表示当前设置默认的 {@link Locale}。
+     */
+    public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator, Locale locale) {
+        this.targetInterpolator = targetInterpolator;
+        this.locale = locale;
+    }
+
+    /**
+     * 设置默认的 {@link Locale}。
+     *
+     * @param locale 默认设置的 {@link Locale}。
+     */
+    public void setLocale(Locale locale) {
+        this.locale = locale;
     }
 
     @Override
     public String interpolate(String messageTemplate, Context context) {
-        return this.targetInterpolator.interpolate(messageTemplate, context, LocaleContextHolder.getLocale());
+        if (LocaleContextHolder.getLocale() != null) {
+            return this.targetInterpolator.interpolate(messageTemplate, context, LocaleContextHolder.getLocale());
+        }
+        return this.targetInterpolator.interpolate(messageTemplate, context, this.locale);
     }
 
     @Override

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/main/java/modelengine/fitframework/validation/LocaleMessageInterpolator.java

@@ -8,7 +8,6 @@
 
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import jakarta.validation.MessageInterpolator;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 import jakarta.validation.ValidatorFactory;
@@ -44,7 +43,7 @@
 public class ValidationHandler implements AutoCloseable {
     private final ValidatorFactory validatorFactory;
     private final Validator validator;
-    private MessageInterpolator messageInterpolator;
+    private LocaleContextMessageInterpolator messageInterpolator;
 
     public ValidationHandler() {
         this.messageInterpolator = new LocaleContextMessageInterpolator();
@@ -62,18 +61,7 @@ public ValidationHandler() {
      * @param locale 表示校验语言的 {@link Locale}。
      */
     public void setLocale(Locale locale) {
-        if (this.messageInterpolator instanceof LocaleMessageInterpolator) {
-            ((LocaleMessageInterpolator) this.messageInterpolator).setLocale(locale);
-        }
-    }
-
-    /**
-     * 设置校验信息消息插值器。
-     *
-     * @param messageInterpolator 表示校验信息消息插值器的 {@link MessageInterpolator}。
-     */
-    public void setMessageInterpolator(MessageInterpolator messageInterpolator) {
-        this.messageInterpolator = messageInterpolator;
+        this.messageInterpolator.setLocale(locale);
     }
 
     /**

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/main/java/modelengine/fitframework/validation/ValidationHandler.java

@@ -58,7 +58,6 @@ public class ValidationHandlerTest {
 
     @BeforeEach
     void setUp() {
-        this.handler.setMessageInterpolator(new LocaleMessageInterpolator());
         this.handler.setLocale(Locale.CHINA);
         when(this.validated.value()).thenReturn(new Class[0]);
         when(this.fitRuntime.resolverOfAnnotations()).thenReturn(this.annotationMetadataResolver);

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/ValidationHandlerTest.java

@@ -26,25 +26,62 @@
 public class LocaleContextMessageInterpolator implements MessageInterpolator {
     private final MessageInterpolator targetInterpolator;
 
+    private Locale locale;
+
     /**
      * 构造函数。
      *
      * @param targetInterpolator 表示目标检验消息处理对象的 {@link MessageInterpolator}。
      */
     public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator) {
         this.targetInterpolator = targetInterpolator;
+        this.locale = Locale.getDefault();
     }
 
     /**
      * 构造函数，默认使用 {@link ParameterMessageInterpolator} 作为目标检验消息处理对象。
      */
     public LocaleContextMessageInterpolator() {
         this.targetInterpolator = new ParameterMessageInterpolator();
+        this.locale = Locale.getDefault();
+    }
+
+    /**
+     * 构造函数。
+     *
+     * @param locale 表示当前设置默认的 {@link Locale}。
+     */
+    public LocaleContextMessageInterpolator(Locale locale) {
+        this.targetInterpolator = new ParameterMessageInterpolator();
+        this.locale = locale;
+    }
+
+    /**
+     * 构造函数。
+     *
+     * @param targetInterpolator 表示目标检验消息处理对象的 {@link MessageInterpolator}。
+     * @param locale 表示当前设置默认的 {@link Locale}。
+     */
+    public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator, Locale locale) {
+        this.targetInterpolator = targetInterpolator;
+        this.locale = locale;
+    }
+
+    /**
+     * 设置默认的 {@link Locale}。
+     *
+     * @param locale 默认设置的 {@link Locale}。
+     */
+    public void setLocale(Locale locale) {
+        this.locale = locale;
     }
 
     @Override
     public String interpolate(String messageTemplate, Context context) {
-        return this.targetInterpolator.interpolate(messageTemplate, context, LocaleContextHolder.getLocale());
+        if (LocaleContextHolder.getLocale() != null) {
+            return this.targetInterpolator.interpolate(messageTemplate, context, LocaleContextHolder.getLocale());
+        }
+        return this.targetInterpolator.interpolate(messageTemplate, context, this.locale);
     }
 
     @Override

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/main/java/modelengine/fitframework/validation/LocaleContextMessageInterpolator.java

@@ -45,7 +45,7 @@
 public class ValidationHandler implements AutoCloseable {
     private final ValidatorFactory validatorFactory;
     private final Validator validator;
-    private MessageInterpolator messageInterpolator;
+    private LocaleContextMessageInterpolator messageInterpolator;
 
     public ValidationHandler() {
         this.messageInterpolator = new LocaleContextMessageInterpolator();
@@ -63,18 +63,7 @@ public ValidationHandler() {
      * @param locale 表示校验语言的 {@link Locale}。
      */
     public void setLocale(Locale locale) {
-        if (this.messageInterpolator instanceof LocaleMessageInterpolator) {
-            ((LocaleMessageInterpolator) this.messageInterpolator).setLocale(locale);
-        }
-    }
-
-    /**
-     * 设置校验信息消息插值器。
-     *
-     * @param messageInterpolator 表示校验信息消息插值器的 {@link MessageInterpolator}。
-     */
-    public void setMessageInterpolator(MessageInterpolator messageInterpolator) {
-        this.messageInterpolator = messageInterpolator;
+        this.messageInterpolator.setLocale(locale);
     }
 
     /**

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/main/java/modelengine/fitframework/validation/LocaleMessageInterpolator.java

@@ -59,8 +59,7 @@ public class ValidationHandlerTest {
 
     @BeforeEach
     void setUp() {
-        this.handler.setMessageInterpolator(new LocaleMessageInterpolator());
-        this.handler.setLocale(Locale.ENGLISH);
+        this.handler.setLocale(Locale.CHINA);
         when(this.validated.value()).thenReturn(new Class[0]);
         when(this.fitRuntime.resolverOfAnnotations()).thenReturn(annotationMetadataResolver);
         when(this.beanContainer.runtime()).thenReturn(fitRuntime);

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/main/java/modelengine/fitframework/validation/ValidationHandler.java

@@ -42,7 +42,7 @@ public static LocaleContext getLocaleContext() {
      */
     public static Locale getLocale() {
         LocaleContext context = getLocaleContext();
-        return context != null ? context.getLocale() : Locale.getDefault();
+        return context != null ? context.getLocale() : null;
     }
 
     /**