删除localecontext

Author: Yager-42

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

@@ -8,7 +8,6 @@
 
 import modelengine.fit.http.server.*;
 import modelengine.fitframework.annotation.Scope;
-import modelengine.fitframework.util.i18n.LocaleContext;
 import modelengine.fitframework.util.i18n.LocaleContextHolder;
 
 import java.util.List;
@@ -74,12 +73,12 @@ public void doFilter(HttpClassicServerRequest request, HttpClassicServerResponse
             Locale responseLocale = null;
             if (paramLocale != null && !paramLocale.trim().isEmpty()) {
                 responseLocale = Locale.forLanguageTag(paramLocale);
-                LocaleContextHolder.setLocaleContext(new LocaleContext(responseLocale));
+                LocaleContextHolder.setLocale(responseLocale);
             }
             // 如果参数中不包含地区，则解析请求所带的地区参数。
             else {
                 Locale locale = this.localeResolver.resolveLocale(request);
-                LocaleContextHolder.setLocaleContext(new LocaleContext(locale));
+                LocaleContextHolder.setLocale(locale);
             }
 
             // 继续执行后续过滤器。

framework/fit/java/fit-util/src/main/java/modelengine/fitframework/util/i18n/LocaleContext.java

@@ -9,42 +9,32 @@
 import java.util.Locale;
 
 /**
- * 表示存储地区上下文的线程上下文。
+ * 表示存储地区的线程上下文。
  *
  * @author 阮睿
  * @since 2025-08-01
  */
 public class LocaleContextHolder {
-    private static final ThreadLocal<LocaleContext> LOCALE_CONTEXT_HOLDER = new ThreadLocal<>();
+    private static final ThreadLocal<Locale> LOCALE_CONTEXT_HOLDER = new ThreadLocal<>();
 
     /**
      * 设置当前线程的地区上下文。
      *
-     * @param localeContext 表示将要存储在当前线程地区上下文的 {@link LocaleContext}。
+     * @param locale 表示将要存储在当前线程地区上下文的 {@link Locale}。
      */
-    public static void setLocaleContext(LocaleContext localeContext) {
-        if (localeContext != null) {
-            LOCALE_CONTEXT_HOLDER.set(localeContext);
+    public static void setLocale(Locale locale) {
+        if (locale != null) {
+            LOCALE_CONTEXT_HOLDER.set(locale);
         }
     }
 
-    /**
-     * 获取当前线程的地区上下文。
-     *
-     * @return 表示当前线程地区上下文的 {@link LocaleContext}。
-     */
-    public static LocaleContext getLocaleContext() {
-        return LOCALE_CONTEXT_HOLDER.get();
-    }
-
     /**
      * 获取当前线程的地区。
      *
      * @return 表示当前线程上下文存储地区信息的 {@link Locale}。
      */
     public static Locale getLocale() {
-        LocaleContext context = getLocaleContext();
-        return context != null ? context.getLocale() : null;
+        return LOCALE_CONTEXT_HOLDER.get();
     }
 
     /**

framework/fit/java/fit-util/src/main/java/modelengine/fitframework/util/i18n/LocaleContextHolder.java

@@ -29,55 +29,28 @@ void tearDown() {
     }
 
     @Nested
-    @DisplayName("Test method: setLocaleContext and getLocaleContext")
+    @DisplayName("Test method: setLocale and getLocale")
     class TestSetAndGetLocaleContext {
         @Test
-        @DisplayName("Given locale context with zh_CN then return the same locale context")
+        @DisplayName("Given locale with zh_CN then return the same locale")
         void givenLocaleContextWithZhCNThenReturnSameLocaleContext() {
-            LocaleContext localeContext = new LocaleContext(Locale.SIMPLIFIED_CHINESE);
-            LocaleContextHolder.setLocaleContext(localeContext);
-            assertThat(LocaleContextHolder.getLocaleContext()).isEqualTo(localeContext);
+            Locale locale = Locale.SIMPLIFIED_CHINESE;
+            LocaleContextHolder.setLocale(locale);
+            assertThat(LocaleContextHolder.getLocale()).isEqualTo(locale);
         }
 
         @Test
-        @DisplayName("Given locale context with en_US then return the same locale context")
+        @DisplayName("Given locale with en_US then return the same locale")
         void givenLocaleContextWithEnUSThenReturnSameLocaleContext() {
-            LocaleContext localeContext = new LocaleContext(Locale.US);
-            LocaleContextHolder.setLocaleContext(localeContext);
-            assertThat(LocaleContextHolder.getLocaleContext()).isEqualTo(localeContext);
+            Locale locale = Locale.US;
+            LocaleContextHolder.setLocale(locale);
+            assertThat(LocaleContextHolder.getLocale()).isEqualTo(locale);
         }
 
         @Test
-        @DisplayName("Given null locale context then not set and return null")
+        @DisplayName("Given null locale then not set and return null")
         void givenNullLocaleContextThenReturnNull() {
-            LocaleContextHolder.setLocaleContext(null);
-            assertThat(LocaleContextHolder.getLocaleContext()).isNull();
-        }
-    }
-
-    @Nested
-    @DisplayName("Test method: getLocale")
-    class TestGetLocale {
-        @Test
-        @DisplayName("Given locale context with zh_CN then return zh_CN locale")
-        void givenLocaleContextWithZhCNThenReturnZhCNLocale() {
-            LocaleContext localeContext = new LocaleContext(Locale.SIMPLIFIED_CHINESE);
-            LocaleContextHolder.setLocaleContext(localeContext);
-            assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.SIMPLIFIED_CHINESE);
-        }
-
-        @Test
-        @DisplayName("Given locale context with en_US then return en_US locale")
-        void givenLocaleContextWithEnUSThenReturnEnUSLocale() {
-            LocaleContext localeContext = new LocaleContext(Locale.US);
-            LocaleContextHolder.setLocaleContext(localeContext);
-            assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.US);
-        }
-
-        @Test
-        @DisplayName("Given no locale context then return null")
-        void givenNoLocaleContextThenReturnNull() {
-            LocaleContextHolder.clear();
+            LocaleContextHolder.setLocale(null);
             assertThat(LocaleContextHolder.getLocale()).isNull();
         }
     }
@@ -86,14 +59,14 @@ void givenNoLocaleContextThenReturnNull() {
     @DisplayName("Test method: clear")
     class TestClear {
         @Test
-        @DisplayName("Given existing locale context then clear it")
+        @DisplayName("Given existing locale then clear it")
         void givenExistingLocaleContextThenClearIt() {
-            LocaleContext localeContext = new LocaleContext(Locale.SIMPLIFIED_CHINESE);
-            LocaleContextHolder.setLocaleContext(localeContext);
-            assertThat(LocaleContextHolder.getLocaleContext()).isNotNull();
+            Locale locale = Locale.SIMPLIFIED_CHINESE;
+            LocaleContextHolder.setLocale(locale);
+            assertThat(LocaleContextHolder.getLocale()).isNotNull();
 
             LocaleContextHolder.clear();
-            assertThat(LocaleContextHolder.getLocaleContext()).isNull();
+            assertThat(LocaleContextHolder.getLocale()).isNull();
         }
     }
 }