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 dd3eefa8..9b205b4a 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,8 +7,6 @@ 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.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.util.AgentUtil; import java.lang.reflect.Method; 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 d72a9f57..b7603f95 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,8 +9,6 @@ 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.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import java.lang.reflect.Field; import java.lang.reflect.Proxy; 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 d289689a..fd674f03 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,8 +9,6 @@ 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.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import java.lang.reflect.Constructor; import java.lang.reflect.Field; 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 19d4b6b2..4121eb74 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 @@ -4,11 +4,7 @@ import cn.hutool.core.util.ClassUtil; import org.reflections.Reflections; import work.slhaf.partner.api.agent.factory.AgentBaseFactory; import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; -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.abstracts.ActivateModel; -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.Init; import work.slhaf.partner.api.agent.factory.module.exception.ModuleCheckException; import work.slhaf.partner.api.agent.runtime.config.AgentConfigManager; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java index 3e43b73f..0ca5f46e 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java @@ -5,8 +5,6 @@ import work.slhaf.partner.api.agent.factory.AgentRegisterFactory; 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.AbstractAgentModule; -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.Init; import work.slhaf.partner.api.agent.factory.module.exception.ModuleInitHookExecuteFailedException; import work.slhaf.partner.api.agent.factory.module.pojo.BaseMetaModule; 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 b8a28f1f..5f998633 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 @@ -5,11 +5,6 @@ import org.reflections.Reflections; import work.slhaf.partner.api.agent.factory.AgentBaseFactory; 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.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; import work.slhaf.partner.api.agent.factory.module.pojo.MetaSubModule; 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 deleted file mode 100644 index f330bf72..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java +++ /dev/null @@ -1,33 +0,0 @@ -package work.slhaf.partner.api.agent.factory.module.abstracts; - -import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.annotation.CoreModule; -import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext; - -/** - * 流程执行模块基类 - */ -@Slf4j -public abstract class AbstractAgentRunningModule extends AbstractAgentModule { - public abstract void execute(C context); - - // TODO 重构注解扫描体系 - private void beforeLog() { - log.debug("[{}] 模块执行开始...", getModuleName()); - } - - private void afterLog() { - log.debug("[{}] 模块执行结束...", getModuleName()); - } - - private String getModuleName() { - if (this.getClass().isAnnotationPresent(AgentRunningModule.class)) { - return this.getClass().getAnnotation(AgentRunningModule.class).name(); - } else if (this.getClass().isAnnotationPresent(CoreModule.class)) { - 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/abstracts/AbstractAgentSubModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentSubModule.java deleted file mode 100644 index e042809c..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentSubModule.java +++ /dev/null @@ -1,11 +0,0 @@ -package work.slhaf.partner.api.agent.factory.module.abstracts; - - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public abstract class AbstractAgentSubModule extends AbstractAgentModule { - - public abstract O execute(I data); - -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentRunningModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentRunningModule.java deleted file mode 100644 index 6afaa039..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentRunningModule.java +++ /dev/null @@ -1,26 +0,0 @@ -package work.slhaf.partner.api.agent.factory.module.annotation; - - -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityHolder; - -import java.lang.annotation.*; - -/** - * 用于注解执行模块 - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@CapabilityHolder -@Inherited -public @interface AgentRunningModule { - - /** - * 模块名称 - */ - String name(); - - /** - * 模块执行顺序,数字越小执行越靠前 - */ - int order(); -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentSubModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentSubModule.java deleted file mode 100644 index b0ac2489..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentSubModule.java +++ /dev/null @@ -1,14 +0,0 @@ -package work.slhaf.partner.api.agent.factory.module.annotation; - -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityHolder; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@CapabilityHolder -public @interface AgentSubModule { -} 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 deleted file mode 100644 index 50c3dd66..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java +++ /dev/null @@ -1,9 +0,0 @@ -package work.slhaf.partner.api.agent.factory.module.annotation; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -@AgentRunningModule(name = "core", order = 5) -public @interface CoreModule { -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java index f879b21d..e879214f 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java @@ -2,7 +2,6 @@ package work.slhaf.partner.api.agent.factory.module.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; @EqualsAndHashCode(callSuper = true) @Data diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java index 9a2f7046..0768f39a 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java @@ -2,7 +2,6 @@ package work.slhaf.partner.api.agent.factory.module.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; @EqualsAndHashCode(callSuper = true) @Data diff --git a/Partner-Framework/src/test/java/module/AbstractAgentRunningProxyTest.java b/Partner-Framework/src/test/java/module/AbstractAgentRunningProxyTest.java index 54ad7610..159b8936 100644 --- a/Partner-Framework/src/test/java/module/AbstractAgentRunningProxyTest.java +++ b/Partner-Framework/src/test/java/module/AbstractAgentRunningProxyTest.java @@ -4,7 +4,6 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.matcher.ElementMatchers; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/Partner-Framework/src/test/java/module/MyAbstractAgentRunningAbstractAgentModule.java b/Partner-Framework/src/test/java/module/MyAbstractAgentRunningAbstractAgentModule.java index edbc6e3e..102e8cf3 100644 --- a/Partner-Framework/src/test/java/module/MyAbstractAgentRunningAbstractAgentModule.java +++ b/Partner-Framework/src/test/java/module/MyAbstractAgentRunningAbstractAgentModule.java @@ -1,6 +1,5 @@ package module; -import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext; public class MyAbstractAgentRunningAbstractAgentModule extends AbstractAgentRunningModule { 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 8c9da8c0..2ba4720e 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,4 @@ package work.slhaf.demo.module; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule; - -@AgentRunningModule(name = "module_a", order = 0) public class ATestModule { }