From c30ec35f85fad8e7749499b78fbc427531a9d820 Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Thu, 19 Feb 2026 21:39:59 +0800 Subject: [PATCH] refactor(framework): rename `@AgentModule` to `@AgentRunningModule` --- .idea/misc.xml | 3 ++- .../action/dispatcher/ActionDispatcher.java | 4 ++-- .../action/interventor/ActionInterventor.java | 4 ++-- .../modules/action/planner/ActionPlanner.java | 4 ++-- .../memory/selector/MemorySelector.java | 4 ++-- .../modules/memory/updater/MemoryUpdater.java | 4 ++-- .../perceive/selector/PerceiveSelector.java | 4 ++-- .../perceive/updater/PerceiveUpdater.java | 4 ++-- .../modules/process/PostprocessExecutor.java | 4 ++-- .../modules/process/PreprocessExecutor.java | 4 ++-- .../capability/CapabilityCheckFactory.java | 4 ++-- .../capability/CapabilityInjectFactory.java | 4 ++-- .../capability/CapabilityRegisterFactory.java | 4 ++-- .../factory/module/ModuleCheckFactory.java | 10 +++++----- .../factory/module/ModuleRegisterFactory.java | 18 +++++++++--------- .../abstracts/AbstractAgentRunningModule.java | 8 ++++---- .../module/annotation/AfterExecute.java | 2 +- ...gentModule.java => AgentRunningModule.java} | 2 +- .../module/annotation/BeforeExecute.java | 2 +- .../factory/module/annotation/CoreModule.java | 2 +- ...> AbstractAgentRunningModuleProxyTest.java} | 4 ++-- .../work/slhaf/demo/module/ATestModule.java | 4 ++-- 22 files changed, 52 insertions(+), 51 deletions(-) rename Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/{AgentModule.java => AgentRunningModule.java} (92%) rename Partner-Framework/src/test/java/module/{AbstractAgentModuleProxyTest.java => AbstractAgentRunningModuleProxyTest.java} (88%) diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a7b2ead..f21997b5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + @@ -9,7 +10,7 @@ - + diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java index 880c1072..1a7dc806 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.modules.action.dispatcher; import lombok.val; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.core.action.ActionCapability; @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.ExecutorService; -@AgentModule(name = "action_dispatcher", order = 7) +@AgentRunningModule(name = "action_dispatcher", order = 7) public class ActionDispatcher extends PostRunningAbstractAgentModuleAbstract { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java index 44a9e0e8..b1da744a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson2.JSONObject; import lombok.val; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; @@ -34,7 +34,7 @@ import java.util.stream.Stream; /** * 负责识别潜在的行动干预信息，作用于正在进行或已存在的行动池中内容 */ -@AgentModule(name = "action_identifier", order = 2) +@AgentRunningModule(name = "action_identifier", order = 2) public class ActionInterventor extends PreRunningAbstractAgentModuleAbstract implements ActivateModel { @InjectModule diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java index 4bf421a4..8cdd18c4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java @@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.jetbrains.annotations.NotNull; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.api.chat.pojo.Message; @@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * 负责针对本次输入生成基础的行动计划，在主模型传达意愿后，执行行动或者放入计划池 */ @Slf4j -@AgentModule(name = "action_planner", order = 2) +@AgentRunningModule(name = "action_planner", order = 2) public class ActionPlanner extends PreRunningAbstractAgentModuleAbstract { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java index f48e8846..0c591294 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.memory.MemoryCapability; @@ -28,7 +28,7 @@ import java.util.*; @EqualsAndHashCode(callSuper = true) @Data @Slf4j -@AgentModule(name = "memory_selector", order = 2) +@AgentRunningModule(name = "memory_selector", order = 2) public class MemorySelector extends PreRunningAbstractAgentModuleAbstract { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java index 03f4c769..5a7d9aa9 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.api.chat.constant.ChatConstant; @@ -33,7 +33,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractUserId; @EqualsAndHashCode(callSuper = true) @Data @Slf4j -@AgentModule(name = "memory_updater", order = 7) +@AgentRunningModule(name = "memory_updater", order = 7) public class MemoryUpdater extends PostRunningAbstractAgentModuleAbstract { private static final long SCHEDULED_UPDATE_INTERVAL = 10 * 1000; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java index 683bfe4b..fc8eed54 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java @@ -3,7 +3,7 @@ package work.slhaf.partner.module.modules.perceive.selector; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.core.perceive.PerceiveCapability; import work.slhaf.partner.core.perceive.pojo.User; import work.slhaf.partner.module.common.module.PreRunningAbstractAgentModuleAbstract; @@ -14,7 +14,7 @@ import java.util.Map; @Slf4j @Setter -@AgentModule(name = "perceive_selector",order = 2) +@AgentRunningModule(name = "perceive_selector", order = 2) public class PerceiveSelector extends PreRunningAbstractAgentModuleAbstract { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java index 09c3ce71..ac73646f 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; @@ -29,7 +29,7 @@ import java.util.concurrent.locks.ReentrantLock; @EqualsAndHashCode(callSuper = true) @Slf4j @Data -@AgentModule(name = "perceive_updater", order = 7) +@AgentRunningModule(name = "perceive_updater", order = 7) public class PerceiveUpdater extends PostRunningAbstractAgentModuleAbstract { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java index b0bfd5c6..3ca934dc 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java @@ -5,14 +5,14 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; @EqualsAndHashCode(callSuper = true) @Slf4j @Data -@AgentModule(name = "postprocess_executor", order = 6) +@AgentRunningModule(name = "postprocess_executor", order = 6) public class PostprocessExecutor extends AbstractAgentRunningModule { private static final int POST_PROCESS_TRIGGER_ROLL_LIMIT = 36; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java index f4733643..3b4c51b2 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.perceive.PerceiveCapability; import work.slhaf.partner.core.perceive.pojo.User; @@ -20,7 +20,7 @@ import java.util.Map; @EqualsAndHashCode(callSuper = true) @Data @Slf4j -@AgentModule(name = "preprocess_executor", order = 1) +@AgentRunningModule(name = "preprocess_executor", order = 1) public class PreprocessExecutor extends PreRunningAbstractAgentModuleAbstract { @InjectCapability diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java index 91d3ec74..dd3eefa8 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java @@ -7,7 +7,7 @@ import work.slhaf.partner.api.agent.factory.capability.annotation.*; import work.slhaf.partner.api.agent.factory.capability.exception.*; import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.util.AgentUtil; @@ -42,7 +42,7 @@ import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; * *
  • *

    {@link CapabilityCheckFactory#checkInjectCapability()}

    - * 检查 {@link InjectCapability} 注解是否只用在 {@link CapabilityHolder} 所标识类的字段上。{@link AgentModule} 与 {@link AgentSubModule} 已经被 {@link CapabilityHolder} 标注 + * 检查 {@link InjectCapability} 注解是否只用在 {@link CapabilityHolder} 所标识类的字段上。{@link AgentRunningModule} 与 {@link AgentSubModule} 已经被 {@link CapabilityHolder} 标注 *
    • * * diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java index b7970fc7..91749a48 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java @@ -9,7 +9,7 @@ import work.slhaf.partner.api.agent.factory.capability.exception.CapabilityProxy import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; import work.slhaf.partner.api.agent.factory.module.ModuleInitHookExecuteFactory; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import java.lang.reflect.Field; @@ -27,7 +27,7 @@ import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; * *

    实现方式：

    *
      - *
    1. 通过动态代理，为 {@link AgentModule} 与 {@link AgentSubModule} 中待注入的 + *
    2. 通过动态代理，为 {@link AgentRunningModule} 与 {@link AgentSubModule} 中待注入的 * 能力接口 类型（即 {@link Capability} 标注的接口类）生成代理对象。 *
      3. *
    3. 在代理对象内部，根据调用方法的签名确定路由，将调用转发至对应的具体函数。 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java index 09937369..d289689a 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java @@ -9,7 +9,7 @@ import work.slhaf.partner.api.agent.factory.capability.exception.CapabilityFacto import work.slhaf.partner.api.agent.factory.capability.exception.DuplicateMethodException; import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import java.lang.reflect.Constructor; @@ -52,7 +52,7 @@ import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; * *
      4. *
    4. - * 函数路由表生成完毕、core实例创建完毕之后，将交由下一工厂完成能力(Capability)注入操作，注入到 {@link AgentModule} 与 {@link AgentSubModule} 对应的实例中 + * 函数路由表生成完毕、core实例创建完毕之后，将交由下一工厂完成能力(Capability)注入操作，注入到 {@link AgentRunningModule} 与 {@link AgentSubModule} 对应的实例中 *
      5. *
    * diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java index 407c7299..5468fbc4 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java @@ -8,7 +8,7 @@ import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunnin import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; import work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute; import work.slhaf.partner.api.agent.factory.module.exception.ModuleCheckException; @@ -31,11 +31,11 @@ import static work.slhaf.partner.api.agent.util.AgentUtil.getMethodAnnotationTyp *
      *
    1. *

      {@link ModuleCheckFactory#annotationAbstractCheck(Set, Class)}

      - * 所有添加了 {@link AgentModule} 注解的类都将作为Agent的执行模块，为规范模块入口，都必须实现抽象类: {@link AbstractAgentRunningModule}; {@link AgentSubModule} 注解所在类则必须实现 {@link AbstractAgentSubModule} + * 所有添加了 {@link AgentRunningModule} 注解的类都将作为Agent的执行模块，为规范模块入口，都必须实现抽象类: {@link AbstractAgentRunningModule}; {@link AgentSubModule} 注解所在类则必须实现 {@link AbstractAgentSubModule} *
      2. *
    2. *

      {@link ModuleCheckFactory#moduleConstructorsCheck(Set)}

      - * 所有 {@link AgentModule} 与 {@link AgentSubModule} 注解所在类都必须具备空参构造方法，初始化逻辑可放在 @Init 注解所处方法中，将在 Capability 与 subModules 注入后才会执行 + * 所有 {@link AgentRunningModule} 与 {@link AgentSubModule} 注解所在类都必须具备空参构造方法，初始化逻辑可放在 @Init 注解所处方法中，将在 Capability 与 subModules 注入后才会执行 *
      3. *
    3. *

      {@link ModuleCheckFactory#activateModelImplCheck()}

      @@ -84,7 +84,7 @@ public class ModuleCheckFactory extends AgentBaseFactory { } private AnnotatedModules getAnnotatedModules() { - Set> moduleTypes = reflections.getTypesAnnotatedWith(AgentModule.class) + Set> moduleTypes = reflections.getTypesAnnotatedWith(AgentRunningModule.class) .stream() .filter(ClassUtil::isNormalClass) .collect(Collectors.toSet()); @@ -133,7 +133,7 @@ public class ModuleCheckFactory extends AgentBaseFactory { } private void initHookLocationCheck() { - Set> types = getMethodAnnotationTypeSet(AgentModule.class, reflections); + Set> types = getMethodAnnotationTypeSet(AgentRunningModule.class, reflections); checkLocation(types); } diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java index 2bf791b3..16af7f60 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java @@ -7,7 +7,7 @@ import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext; import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.CoreModule; import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; @@ -21,13 +21,13 @@ import java.util.Set; *

      Agent启动流程 2

      * *

      - * 负责收集 {@link AgentModule} 与 {@link AgentSubModule} 注解所在类的信息，供后续工厂完成动态代理、模块与能力注入 + * 负责收集 {@link AgentRunningModule} 与 {@link AgentSubModule} 注解所在类的信息，供后续工厂完成动态代理、模块与能力注入 *

      * *

        *
      1. *

        {@link ModuleRegisterFactory#setModuleList()}

        - * 扫描 {@link AgentModule} 注解，获取执行模块信息: 类型、模块名称({@link AgentModule#name()})，执行顺序。并按照注解的 {@link AgentModule#order()} 字段进行排序 + * 扫描 {@link AgentRunningModule} 注解，获取执行模块信息: 类型、模块名称({@link AgentRunningModule#name()})，执行顺序。并按照注解的 {@link AgentRunningModule#order()} 字段进行排序 *
        2. *
      2. *

        {@link ModuleRegisterFactory#setSubModuleList()}

        @@ -62,14 +62,14 @@ public class ModuleRegisterFactory extends AgentBaseFactory { private static MetaModule getMetaModule(Class clazz) { MetaModule metaModule = new MetaModule(); - AgentModule agentModule; + AgentRunningModule agentRunningModule; if (clazz.isAnnotationPresent(CoreModule.class)){ - agentModule = CoreModule.class.getAnnotation(AgentModule.class); + agentRunningModule = CoreModule.class.getAnnotation(AgentRunningModule.class); }else{ - agentModule = clazz.getAnnotation(AgentModule.class); + agentRunningModule = clazz.getAnnotation(AgentRunningModule.class); } - metaModule.setName(agentModule.name()); - metaModule.setOrder(agentModule.order()); + metaModule.setName(agentRunningModule.name()); + metaModule.setOrder(agentRunningModule.order()); metaModule.setClazz(clazz); return metaModule; } @@ -89,7 +89,7 @@ public class ModuleRegisterFactory extends AgentBaseFactory { private void setModuleList() { //反射扫描获取@AgentModule所在类, 该部分为Agent流程执行模块 - Set> modules = reflections.getTypesAnnotatedWith(AgentModule.class); + Set> modules = reflections.getTypesAnnotatedWith(AgentRunningModule.class); for (Class module : modules) { if (!ClassUtil.isNormalClass(module)) { continue; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java index 36eac3fc..2c84eb41 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java @@ -2,7 +2,7 @@ package work.slhaf.partner.api.agent.factory.module.abstracts; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute; import work.slhaf.partner.api.agent.factory.module.annotation.CoreModule; import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext; @@ -25,10 +25,10 @@ public abstract class AbstractAgentRunningModule e } private String getModuleName(){ - if (this.getClass().isAnnotationPresent(AgentModule.class)) { - return this.getClass().getAnnotation(AgentModule.class).name(); + if (this.getClass().isAnnotationPresent(AgentRunningModule.class)) { + return this.getClass().getAnnotation(AgentRunningModule.class).name(); } else if (this.getClass().isAnnotationPresent(CoreModule.class)) { - return CoreModule.class.getAnnotation(AgentModule.class).name(); + return CoreModule.class.getAnnotation(AgentRunningModule.class).name(); }else { return "Unknown AbstractAgentModule"; } diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java index bcc497e2..96744262 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 仅适用于以下类中的方法: - * 1. @AgentModule注解所在类 + * 1. @AgentRunningModule注解所在类 * 2. ActivateModel子类 * 3. AbstractAgentRunningModule或者AbstractAgentSubModule子类 */ diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentRunningModule.java similarity index 92% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentModule.java rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentRunningModule.java index a0ae8b59..6afaa039 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentRunningModule.java @@ -12,7 +12,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @CapabilityHolder @Inherited -public @interface AgentModule { +public @interface AgentRunningModule { /** * 模块名称 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java index 00a2bc56..f60e14fd 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java @@ -7,7 +7,7 @@ import java.lang.annotation.Target; /** * 仅适用于以下类中的方法: - * 1. @AgentModule注解所在类 + * 1. @AgentRunningModule注解所在类 * 2. ActivateModel子类 * 3. AbstractAgentRunningModule或者AbstractAgentSubModule子类 */ diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java index d5f35d14..50c3dd66 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java @@ -4,6 +4,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) -@AgentModule(name = "core",order = 5) +@AgentRunningModule(name = "core", order = 5) public @interface CoreModule { } diff --git a/Partner-Framework/src/test/java/module/AbstractAgentModuleProxyTest.java b/Partner-Framework/src/test/java/module/AbstractAgentRunningModuleProxyTest.java similarity index 88% rename from Partner-Framework/src/test/java/module/AbstractAgentModuleProxyTest.java rename to Partner-Framework/src/test/java/module/AbstractAgentRunningModuleProxyTest.java index c1840739..de4c5da6 100644 --- a/Partner-Framework/src/test/java/module/AbstractAgentModuleProxyTest.java +++ b/Partner-Framework/src/test/java/module/AbstractAgentRunningModuleProxyTest.java @@ -9,7 +9,7 @@ import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunnin import java.io.IOException; import java.lang.reflect.InvocationTargetException; -public class AbstractAgentModuleProxyTest { +public class AbstractAgentRunningModuleProxyTest { @Test public void test() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException, IOException, ClassNotFoundException { Class clazz = new ByteBuddy().subclass(MyAbstractAgentRunningAbstractAgentModule.class) @@ -18,7 +18,7 @@ public class AbstractAgentModuleProxyTest { new MyModuleProxyInterceptor() )) .make() - .load(AbstractAgentModuleProxyTest.class.getClassLoader()) + .load(AbstractAgentRunningModuleProxyTest.class.getClassLoader()) .getLoaded(); clazz.getConstructor().newInstance().execute(null); } diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/module/ATestModule.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/module/ATestModule.java index 4516310c..8c9da8c0 100644 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/module/ATestModule.java +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/module/ATestModule.java @@ -1,7 +1,7 @@ package work.slhaf.demo.module; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; -@AgentModule(name = "module_a",order = 0) +@AgentRunningModule(name = "module_a", order = 0) public class ATestModule { }