重构fel-starter

relat-ivity · relat-ivity · commit a182df869d39 · 2026-02-04T11:22:41.000+08:00
diff --git a/examples/fel-spring-example/01-model/src/main/java/modelengine/example/ai/chat/model/ChatModelExampleController.java b/examples/fel-spring-example/01-model/src/main/java/modelengine/example/ai/chat/model/ChatModelExampleController.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/01-model/src/main/java/modelengine/example/ai/chat/model/DemoApplication.java b/examples/fel-spring-example/01-model/src/main/java/modelengine/example/ai/chat/model/DemoApplication.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/02-template/src/main/java/modelengine/example/ai/chat/template/ChatTemplateExampleController.java b/examples/fel-spring-example/02-template/src/main/java/modelengine/example/ai/chat/template/ChatTemplateExampleController.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/02-template/src/main/java/modelengine/example/ai/chat/template/DemoApplication.java b/examples/fel-spring-example/02-template/src/main/java/modelengine/example/ai/chat/template/DemoApplication.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/03-memory/src/main/java/modelengine/example/ai/chat/memory/ChatMemoryExampleController.java b/examples/fel-spring-example/03-memory/src/main/java/modelengine/example/ai/chat/memory/ChatMemoryExampleController.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/03-memory/src/main/java/modelengine/example/ai/chat/memory/DemoApplication.java b/examples/fel-spring-example/03-memory/src/main/java/modelengine/example/ai/chat/memory/DemoApplication.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/04-output-parser/src/main/java/modelengine/example/ai/chat/parser/DemoApplication.java b/examples/fel-spring-example/04-output-parser/src/main/java/modelengine/example/ai/chat/parser/DemoApplication.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/04-output-parser/src/main/java/modelengine/example/ai/chat/parser/OutputParserExampleController.java b/examples/fel-spring-example/04-output-parser/src/main/java/modelengine/example/ai/chat/parser/OutputParserExampleController.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/05-retrieval/src/main/java/modelengine/example/ai/chat/retrieval/DemoApplication.java b/examples/fel-spring-example/05-retrieval/src/main/java/modelengine/example/ai/chat/retrieval/DemoApplication.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/05-retrieval/src/main/java/modelengine/example/ai/chat/retrieval/RetrievalExampleController.java b/examples/fel-spring-example/05-retrieval/src/main/java/modelengine/example/ai/chat/retrieval/RetrievalExampleController.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/AgentExampleController.java b/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/AgentExampleController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  * This file is a part of the ModelEngine Project.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
diff --git a/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/DemoApplication.java b/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/DemoApplication.java
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
+ *  Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  *  This file is a part of the ModelEngine Project.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/tool/WeatherService.java b/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/tool/WeatherService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  * This file is a part of the ModelEngine Project.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
diff --git a/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/tool/WeatherServiceImpl.java b/examples/fel-spring-example/06-agent/src/main/java/modelengine/example/ai/chat/agent/tool/WeatherServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2026 Huawei Technologies Co., Ltd. All rights reserved.
  * This file is a part of the ModelEngine Project.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
diff --git a/framework/fel/java/fel-starters/fel-spring-boot-starter/src/main/java/modelengine/fel/starter/spring/FelSpringBootAutoConfiguration.java b/framework/fel/java/fel-starters/fel-spring-boot-starter/src/main/java/modelengine/fel/starter/spring/FelSpringBootAutoConfiguration.java
@@ -36,7 +36,7 @@
  */
 @Configuration
 public class FelSpringBootAutoConfiguration {
-    private static final Logger LOG = LoggerFactory.getLogger(FelSpringBootAutoConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(FelSpringBootAutoConfiguration.class);
 
     /**
      * Spring 层需要注入的 FEL Bean 类型名称白名单（使用字符串避免类加载失败）。
@@ -64,13 +64,11 @@ public static BeanDefinitionRegistryPostProcessor felBeanAutoRegistrar() {
      */
     private static class FelBeanAutoRegistrar implements BeanDefinitionRegistryPostProcessor {
         @Override
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
-            // 不需要在这里处理
-        }
+        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
 
         @Override
         public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-            LOG.info("Installing FEL Bean auto-registration processor");
+            log.info("Installing FEL Bean auto-registration processor...");
             beanFactory.addBeanPostProcessor(new FitRuntimeDetectorBeanPostProcessor(beanFactory));
         }
     }
@@ -89,82 +87,97 @@ private static class FitRuntimeDetectorBeanPostProcessor
 
         @Override
         public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-            if (!registered && bean instanceof FitRuntime) {
-                registered = true;
-                registerFelBeansToSpring((FitRuntime) bean);
+            if (!this.registered && bean instanceof FitRuntime) {
+                this.registered = true;
+                this.registerFelBeansToSpring((FitRuntime) bean);
             }
             return bean;
         }
 
         /**
-         * 将 FIT 容器中符合白名单的 FEL Bean 注册到 Spring 容器。
+         * 将 FIT 容器中符合 {@link FelSpringBootAutoConfiguration#REQUIRED_BEAN_TYPE_NAMES} 的 FEL Bean 注册到 Spring 容器。
          *
-         * @param fitRuntime FIT 运行时实例
+         * @param fitRuntime 表示 FIT 运行时实例的 {@link FitRuntime}。
          */
         private void registerFelBeansToSpring(FitRuntime fitRuntime) {
-            LOG.info("Auto-registering FEL beans to Spring container (whitelist mode)");
+            log.info("Auto-registering FEL beans to Spring container...");
             try {
                 BeanContainer container = fitRuntime.root().container();
                 List<BeanFactory> allFactories = container.all();
-                LOG.debug("Found {} beans in FIT container", allFactories.size());
-
+                log.debug("Found {} beans in FIT container", allFactories.size());
                 int registeredCount = 0;
-                int skippedCount = 0;
-                int filteredCount = 0;
 
                 for (BeanFactory factory : allFactories) {
                     BeanMetadata metadata = factory.metadata();
                     String beanName = metadata.name();
-                    Type beanType = metadata.type();
-                    String typeName = beanType.getTypeName();
-
-                    // 检查是否在白名单中（使用字符串匹配，支持子类）
-                    boolean isRequired = REQUIRED_BEAN_TYPE_NAMES.stream().anyMatch(requiredTypeName -> {
-                        try {
-                            Class<?> actualType = Class.forName(typeName);
-                            Class<?> requiredType = Class.forName(requiredTypeName);
-                            return requiredType.isAssignableFrom(actualType);
-                        } catch (ClassNotFoundException e) {
-                            // 某些可选依赖的类可能不在 classpath 中，忽略
-                            return false;
-                        }
-                    });
-
-                    if (!isRequired) {
-                        LOG.trace("Filtered out FIT bean '{}' - not in whitelist", beanName);
-                        filteredCount++;
+                    String typeName = metadata.type().getTypeName();
+                    if (!this.isRequiredBeanType(typeName) || this.isBeanAlreadyRegisteredInSpring(beanName)) {
                         continue;
                     }
 
-                    // 避免重复注册
-                    if (beanFactory.containsSingleton(beanName) || beanFactory.containsBeanDefinition(beanName)) {
-                        LOG.debug("Skipping bean '{}' - already exists in Spring container", beanName);
-                        skippedCount++;
-                        continue;
+                    // 注册单例 Bean
+                    if (this.registerSingletonBean(factory, metadata, beanName, typeName)) {
+                        registeredCount++;
                     }
+                }
 
-                    try {
-                        if (metadata.singleton()) {
-                            Object instance = factory.get();
-                            beanFactory.registerSingleton(beanName, instance);
-                            registeredCount++;
-                            LOG.info("Registered FEL bean '{}' (type: {}) to Spring container", beanName, typeName);
-                        }
-                    } catch (Exception e) {
-                        LOG.warn("Failed to register FEL bean '{}' of type {}: {}",
-                                beanName,
-                                typeName,
-                                e.getMessage());
-                    }
+                log.info("FEL Bean auto-registration completed: {} registered", registeredCount);
+            } catch (Exception e) {
+                log.error("Failed to auto-register FEL beans", e);
+            }
+        }
+
+        /**
+         * 检查指定类型是否在白名单中（支持子类匹配）。
+         *
+         * @param typeName 表示类型全限定名的 {@link String}。
+         * @return 如果类型在白名单中则返回 {@code true}，否则返回 {@code false}。
+         */
+        private boolean isRequiredBeanType(String typeName) {
+            return REQUIRED_BEAN_TYPE_NAMES.stream().anyMatch(requiredTypeName -> {
+                try {
+                    Class<?> actualType = Class.forName(typeName);
+                    Class<?> requiredType = Class.forName(requiredTypeName);
+                    return requiredType.isAssignableFrom(actualType);
+                } catch (ClassNotFoundException e) {
+                    // 某些可选依赖的类可能不在 classpath 中，忽略
+                    return false;
                 }
+            });
+        }
+
+        /**
+         * 检查指定名称的 Bean 是否已在 Spring 容器中注册。
+         *
+         * @param beanName 表示 Bean 名称的 {@link String}。
+         * @return 如果 Bean 已注册则返回 {@code true}，否则返回 {@code false}。
+         */
+        private boolean isBeanAlreadyRegisteredInSpring(String beanName) {
+            return this.beanFactory.containsSingleton(beanName) || this.beanFactory.containsBeanDefinition(beanName);
+        }
 
-                LOG.info("FEL Bean auto-registration completed: {} registered, {} skipped, {} filtered",
-                        registeredCount,
-                        skippedCount,
-                        filteredCount);
+        /**
+         * 注册单例 Bean 到 Spring 容器。
+         *
+         * @param factory 表示 Bean 工厂的 {@link BeanFactory}。
+         * @param metadata 表示 Bean 元数据的 {@link BeanMetadata}。
+         * @param beanName 表示 Bean 名称的 {@link String}。
+         * @param typeName 表示类型全限定名的 {@link String}。
+         * @return 如果注册成功则返回 {@code true}，否则返回 {@code false}。
+         */
+        private boolean registerSingletonBean(BeanFactory factory, BeanMetadata metadata, String beanName,
+                String typeName) {
+            try {
+                if (metadata.singleton()) {
+                    Object instance = factory.get();
+                    this.beanFactory.registerSingleton(beanName, instance);
+                    log.info("Registered FEL bean '{}' (type: {}) to Spring container", beanName, typeName);
+                    return true;
+                }
             } catch (Exception e) {
-                LOG.error("Failed to auto-register FEL beans", e);
+                log.warn("Failed to register FEL bean '{}' of type {}: {}", beanName, typeName, e.getMessage());
             }
+            return false;
         }
     }
 }
diff --git a/framework/fit/java/fit-reactor/src/main/java/modelengine/fitframework/flowable/choir/AbstractChoir.java b/framework/fit/java/fit-reactor/src/main/java/modelengine/fitframework/flowable/choir/AbstractChoir.java
@@ -130,9 +130,7 @@ public void subscribe(Subscriber<T> subscriber) {
 
     @Override
     public void subscribe(java.util.concurrent.Flow.Subscriber<? super T> subscriber) {
-        if (subscriber == null) {
-            Validation.notNull(subscriber, "Subscriber cannot be null.");
-        }
+        Validation.notNull(subscriber, "Subscriber cannot be null.");
         // 使用现有的 Lambda subscribe 方法，适配 Flow Subscriber
         this.subscribe(
                 // onSubscribedAction: 将内部 Subscription 适配为 Flow Subscription
diff --git a/framework/fit/java/fit-reactor/src/main/java/modelengine/fitframework/flowable/solo/AbstractSolo.java b/framework/fit/java/fit-reactor/src/main/java/modelengine/fitframework/flowable/solo/AbstractSolo.java
@@ -83,9 +83,7 @@ public void subscribe(Subscriber<T> subscriber) {
 
     @Override
     public void subscribe(java.util.concurrent.Flow.Subscriber<? super T> subscriber) {
-        if (subscriber == null) {
-            Validation.notNull(subscriber, "Subscriber cannot be null.");
-        }
+        Validation.notNull(subscriber, "Subscriber cannot be null.");
         // 使用现有的 Lambda subscribe 方法，适配 Flow Subscriber
         this.subscribe(
                 // onSubscribedAction: 将内部 Subscription 适配为 Flow Subscription
diff --git a/framework/fit/java/fit-reactor/src/test/java/modelengine/fitframework/flowable/ChoirTest.java b/framework/fit/java/fit-reactor/src/test/java/modelengine/fitframework/flowable/ChoirTest.java
@@ -566,10 +566,10 @@ public void onComplete() {
         }
 
         @Test
-        @DisplayName("使用 null Flow.Subscriber 订阅，应抛出 NullPointerException")
-        void shouldThrowNullPointerExceptionWhenSubscriberIsNull() {
-            assertThatExceptionOfType(NullPointerException.class).isThrownBy(() -> Choir.just(1, 2, 3)
-                    .subscribe((Flow.Subscriber<Integer>) null)).withMessage("Subscriber cannot be null");
+        @DisplayName("使用 null Flow.Subscriber 订阅，应抛出 IllegalArgumentException")
+        void shouldThrowIllegalArgumentExceptionWhenSubscriberIsNull() {
+            assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> Choir.just(1, 2, 3)
+                    .subscribe((Flow.Subscriber<Integer>) null)).withMessage("Subscriber cannot be null.");
         }
     }
 }
diff --git a/framework/fit/java/fit-reactor/src/test/java/modelengine/fitframework/flowable/SoloTest.java b/framework/fit/java/fit-reactor/src/test/java/modelengine/fitframework/flowable/SoloTest.java
@@ -246,10 +246,10 @@ public void onComplete() {
         }
 
         @Test
-        @DisplayName("使用 null Flow.Subscriber 订阅，应抛出 NullPointerException")
-        void shouldThrowNullPointerExceptionWhenSubscriberIsNull() {
-            assertThatExceptionOfType(NullPointerException.class).isThrownBy(() -> Solo.just(1)
-                    .subscribe((Flow.Subscriber<Integer>) null)).withMessage("Subscriber cannot be null");
+        @DisplayName("使用 null Flow.Subscriber 订阅，应抛出 IllegalArgumentException")
+        void shouldThrowIllegalArgumentExceptionWhenSubscriberIsNull() {
+            assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> Solo.just(1)
+                    .subscribe((Flow.Subscriber<Integer>) null)).withMessage("Subscriber cannot be null.");
         }
     }
 }
