[fit] 修改校验处理默认使用的插值器

Author: Yager-42

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

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

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

@@ -15,6 +15,7 @@
 import modelengine.fitframework.test.domain.mvc.request.MockMvcRequestBuilders;
 import modelengine.fitframework.test.domain.mvc.request.MockRequestBuilder;
 import modelengine.fitframework.validation.data.Company;
+import modelengine.fitframework.validation.data.LocaleValidationController;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;

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

@@ -58,6 +58,7 @@ 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);

…lidation/LocaleValidationController.java …ion/data/LocaleValidationController.javaframework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/LocaleValidationController.java renamed to framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/data/LocaleValidationController.java framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/LocaleValidationController.java renamed to framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/data/LocaleValidationController.java

@@ -4,12 +4,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-package modelengine.fitframework.validation;
+package modelengine.fitframework.validation.data;
 
 import modelengine.fit.http.annotation.PostMapping;
 import modelengine.fit.http.annotation.RequestBody;
 import modelengine.fit.http.annotation.RequestMapping;
 import modelengine.fitframework.annotation.Component;
+import modelengine.fitframework.validation.LocaleContextMessageInterpolator;
+import modelengine.fitframework.validation.Validated;
+import modelengine.fitframework.validation.ValidationHandler;
 import modelengine.fitframework.validation.data.Company;
 
 import jakarta.validation.Valid;

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

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

framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/LocaleValidationControllerTest.java

@@ -15,6 +15,7 @@
 import modelengine.fitframework.test.domain.mvc.request.MockMvcRequestBuilders;
 import modelengine.fitframework.test.domain.mvc.request.MockRequestBuilder;
 import modelengine.fitframework.validation.data.Company;
+import modelengine.fitframework.validation.data.LocaleValidationController;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;

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

@@ -59,10 +59,11 @@ public class ValidationHandlerTest {
 
     @BeforeEach
     void setUp() {
-        handler.setLocale(Locale.CHINA);
-        when(validated.value()).thenReturn(new Class[0]);
-        when(fitRuntime.resolverOfAnnotations()).thenReturn(annotationMetadataResolver);
-        when(beanContainer.runtime()).thenReturn(fitRuntime);
+        this.handler.setMessageInterpolator(new LocaleMessageInterpolator());
+        this.handler.setLocale(Locale.ENGLISH);
+        when(this.validated.value()).thenReturn(new Class[0]);
+        when(this.fitRuntime.resolverOfAnnotations()).thenReturn(annotationMetadataResolver);
+        when(this.beanContainer.runtime()).thenReturn(fitRuntime);
     }
 
     private ConstraintViolationException invokeHandleMethod(Method targetMethod, Object[] args) {

…lidation/LocaleValidationController.java …ion/data/LocaleValidationController.javaframework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/LocaleValidationController.java renamed to framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/data/LocaleValidationController.java framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/LocaleValidationController.java renamed to framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/data/LocaleValidationController.java

@@ -4,11 +4,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-package modelengine.fitframework.validation;
+package modelengine.fitframework.validation.data;
 
 import javax.validation.Valid;
 
 import modelengine.fitframework.annotation.Component;
+import modelengine.fitframework.validation.LocaleContextMessageInterpolator;
+import modelengine.fitframework.validation.Validated;
+import modelengine.fitframework.validation.ValidationHandler;
 import modelengine.fitframework.validation.data.Company;
 import modelengine.fit.http.annotation.PostMapping;
 import modelengine.fit.http.annotation.RequestBody;