修复错误

Author: Yager-42

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

@@ -6,6 +6,7 @@
 
 package modelengine.fitframework.validation;
 
+import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.i18n.LocaleContextHolder;
 
 import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
@@ -25,7 +26,6 @@
  */
 public class LocaleContextMessageInterpolator implements MessageInterpolator {
     private final MessageInterpolator targetInterpolator;
-
     private Locale locale;
 
     /**
@@ -53,7 +53,7 @@ public LocaleContextMessageInterpolator() {
      */
     public LocaleContextMessageInterpolator(Locale locale) {
         this.targetInterpolator = new ParameterMessageInterpolator();
-        this.locale = locale;
+        this.locale = ObjectUtils.getIfNull(locale, Locale::getDefault);
     }
 
     /**
@@ -64,7 +64,7 @@ public LocaleContextMessageInterpolator(Locale locale) {
      */
     public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator, Locale locale) {
         this.targetInterpolator = targetInterpolator;
-        this.locale = locale;
+        this.locale = ObjectUtils.getIfNull(locale, Locale::getDefault);
     }
 
     /**
@@ -73,7 +73,7 @@ public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator,
      * @param locale 默认设置的 {@link Locale}。
      */
     public void setLocale(Locale locale) {
-        this.locale = locale;
+        this.locale = ObjectUtils.getIfNull(locale, Locale::getDefault);
     }
 
     @Override
@@ -88,4 +88,4 @@ public String interpolate(String messageTemplate, Context context) {
     public String interpolate(String messageTemplate, Context context, Locale locale) {
         return this.targetInterpolator.interpolate(messageTemplate, context, locale);
     }
-}
+}

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

@@ -43,7 +43,7 @@
 public class ValidationHandler implements AutoCloseable {
     private final ValidatorFactory validatorFactory;
     private final Validator validator;
-    private LocaleContextMessageInterpolator messageInterpolator;
+    private final LocaleContextMessageInterpolator messageInterpolator;
 
     public ValidationHandler() {
         this.messageInterpolator = new LocaleContextMessageInterpolator();
@@ -163,4 +163,4 @@ private boolean isJakartaConstraintAnnotation(Annotation annotation) {
             return "jakarta.validation".equals(packageName) && "Constraint".equals(className);
         });
     }
-}
+}

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

@@ -755,4 +755,4 @@ void testRangeBigDecimalValidation() {
         ConstraintViolationException exception = invokeHandleMethod(method, new Object[] {new BigDecimal("5.5")});
         assertThat(exception.getMessage()).contains("需要在10和100之间");
     }
-}
+}

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

@@ -6,6 +6,7 @@
 
 package modelengine.fitframework.validation;
 
+import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.i18n.LocaleContextHolder;
 
 import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
@@ -25,7 +26,6 @@
  */
 public class LocaleContextMessageInterpolator implements MessageInterpolator {
     private final MessageInterpolator targetInterpolator;
-
     private Locale locale;
 
     /**
@@ -53,7 +53,7 @@ public LocaleContextMessageInterpolator() {
      */
     public LocaleContextMessageInterpolator(Locale locale) {
         this.targetInterpolator = new ParameterMessageInterpolator();
-        this.locale = locale;
+        this.locale = ObjectUtils.getIfNull(locale, Locale::getDefault);
     }
 
     /**
@@ -64,7 +64,7 @@ public LocaleContextMessageInterpolator(Locale locale) {
      */
     public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator, Locale locale) {
         this.targetInterpolator = targetInterpolator;
-        this.locale = locale;
+        this.locale = ObjectUtils.getIfNull(locale, Locale::getDefault);
     }
 
     /**
@@ -73,7 +73,7 @@ public LocaleContextMessageInterpolator(MessageInterpolator targetInterpolator,
      * @param locale 默认设置的 {@link Locale}。
      */
     public void setLocale(Locale locale) {
-        this.locale = locale;
+        this.locale = ObjectUtils.getIfNull(locale, Locale::getDefault);
     }
 
     @Override
@@ -88,4 +88,4 @@ public String interpolate(String messageTemplate, Context context) {
     public String interpolate(String messageTemplate, Context context, Locale locale) {
         return this.targetInterpolator.interpolate(messageTemplate, context, locale);
     }
-}
+}

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

@@ -45,7 +45,7 @@
 public class ValidationHandler implements AutoCloseable {
     private final ValidatorFactory validatorFactory;
     private final Validator validator;
-    private LocaleContextMessageInterpolator messageInterpolator;
+    private final LocaleContextMessageInterpolator messageInterpolator;
 
     public ValidationHandler() {
         this.messageInterpolator = new LocaleContextMessageInterpolator();
@@ -165,4 +165,4 @@ private boolean isJavaxConstraintAnnotation(Annotation annotation) {
             return "javax.validation".equals(packageName) && "Constraint".equals(className);
         });
     }
-}
+}

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/util/i18n/DefualtLocaleResolver.java

@@ -34,16 +34,8 @@ public Locale resolveLocale(HttpClassicServerRequest request) {
         if (StringUtils.isNotBlank(newLocale.trim())) {
             return Locale.forLanguageTag(newLocale);
         }
-        String acceptLanguage = null;
-        List<String> acceptLanguages = request.headers().all("Accept-Language");
-
-        for (String language : acceptLanguages) {
-            if (StringUtils.isNotBlank(language.trim())) {
-                acceptLanguage = language;
-                break;
-            }
-        }
 
+        String acceptLanguage = request.headers().first("Accept-Language").orElse(null);
         if (StringUtils.isNotBlank(acceptLanguage.trim())) {
             return Locale.forLanguageTag(acceptLanguage);
         }

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/util/i18n/LocaleResolveFilter.java

@@ -8,11 +8,13 @@
 
 import modelengine.fit.http.server.*;
 import modelengine.fitframework.annotation.Scope;
+import modelengine.fitframework.inspection.Validation;
 import modelengine.fitframework.util.StringUtils;
 import modelengine.fitframework.util.i18n.LocaleContextHolder;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 
 /**
  * 地区解析过滤器，使用 {@link LocaleResolver} 进行地区解析。
@@ -32,7 +34,7 @@ public class LocaleResolveFilter implements HttpServerFilter {
      * @param localeResolver 表示地区解析器的 {@link LocaleResolver}。
      */
     public LocaleResolveFilter(LocaleResolver localeResolver) {
-        this.localeResolver = localeResolver;
+        this.localeResolver = Validation.notNull(localeResolver, "The locale resolver cannot be null.");
     }
 
     /**
@@ -66,14 +68,7 @@ public List<String> mismatchPatterns() {
     public void doFilter(HttpClassicServerRequest request, HttpClassicServerResponse response,
             HttpServerFilterChain chain) throws DoHttpServerFilterException {
         try {
-            List<String> paramLocales = request.queries().all("locale");
-            Locale responseLocale = null;
-            for (String paramLocale : paramLocales) {
-                if (StringUtils.isNotBlank(paramLocale.trim())) {
-                    responseLocale = Locale.forLanguageTag(paramLocale);
-                    break;
-                }
-            }
+            Locale responseLocale = Locale.forLanguageTag(this.resolveLocaleFromParam(request));
             // 如果参数中带有地区，说明用户想使用新地区执行后续的操作，直接设置地区。
             if (responseLocale != null) {
                 LocaleContextHolder.setLocale(responseLocale);
@@ -99,4 +94,9 @@ public void doFilter(HttpClassicServerRequest request, HttpClassicServerResponse
     public Scope scope() {
         return this.scope;
     }
+
+    private String resolveLocaleFromParam(HttpClassicServerRequest request) {
+        Optional<String> paramLocale = request.queries().first("locale");
+        return paramLocale.orElse(null);
+    }
 }