mirror of
https://github.com/slhaf/Partner.git
synced 2026-05-12 16:53:04 +08:00
refactor(framework): remove legacy running/sub module base classes and module annotations
This commit is contained in:
@@ -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.capability.exception.*;
|
||||||
import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext;
|
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.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 work.slhaf.partner.api.agent.util.AgentUtil;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|||||||
@@ -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.AgentRegisterContext;
|
||||||
import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext;
|
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.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.Field;
|
||||||
import java.lang.reflect.Proxy;
|
import java.lang.reflect.Proxy;
|
||||||
|
|||||||
@@ -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.capability.exception.DuplicateMethodException;
|
||||||
import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext;
|
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.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.Constructor;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
|||||||
@@ -4,11 +4,7 @@ import cn.hutool.core.util.ClassUtil;
|
|||||||
import org.reflections.Reflections;
|
import org.reflections.Reflections;
|
||||||
import work.slhaf.partner.api.agent.factory.AgentBaseFactory;
|
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.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.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.annotation.Init;
|
||||||
import work.slhaf.partner.api.agent.factory.module.exception.ModuleCheckException;
|
import work.slhaf.partner.api.agent.factory.module.exception.ModuleCheckException;
|
||||||
import work.slhaf.partner.api.agent.runtime.config.AgentConfigManager;
|
import work.slhaf.partner.api.agent.runtime.config.AgentConfigManager;
|
||||||
|
|||||||
@@ -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.AgentRegisterContext;
|
||||||
import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext;
|
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.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.annotation.Init;
|
||||||
import work.slhaf.partner.api.agent.factory.module.exception.ModuleInitHookExecuteFailedException;
|
import work.slhaf.partner.api.agent.factory.module.exception.ModuleInitHookExecuteFailedException;
|
||||||
import work.slhaf.partner.api.agent.factory.module.pojo.BaseMetaModule;
|
import work.slhaf.partner.api.agent.factory.module.pojo.BaseMetaModule;
|
||||||
|
|||||||
@@ -5,11 +5,6 @@ import org.reflections.Reflections;
|
|||||||
import work.slhaf.partner.api.agent.factory.AgentBaseFactory;
|
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.AgentRegisterContext;
|
||||||
import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext;
|
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.MetaModule;
|
||||||
import work.slhaf.partner.api.agent.factory.module.pojo.MetaSubModule;
|
import work.slhaf.partner.api.agent.factory.module.pojo.MetaSubModule;
|
||||||
|
|
||||||
|
|||||||
@@ -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<C extends RunningFlowContext> 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";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package work.slhaf.partner.api.agent.factory.module.abstracts;
|
|
||||||
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
public abstract class AbstractAgentSubModule<I, O> extends AbstractAgentModule {
|
|
||||||
|
|
||||||
public abstract O execute(I data);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -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();
|
|
||||||
}
|
|
||||||
@@ -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 {
|
|
||||||
}
|
|
||||||
@@ -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 {
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,6 @@ package work.slhaf.partner.api.agent.factory.module.pojo;
|
|||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule;
|
|
||||||
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@Data
|
@Data
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package work.slhaf.partner.api.agent.factory.module.pojo;
|
|||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule;
|
|
||||||
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@Data
|
@Data
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import net.bytebuddy.ByteBuddy;
|
|||||||
import net.bytebuddy.implementation.MethodDelegation;
|
import net.bytebuddy.implementation.MethodDelegation;
|
||||||
import net.bytebuddy.matcher.ElementMatchers;
|
import net.bytebuddy.matcher.ElementMatchers;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package module;
|
package module;
|
||||||
|
|
||||||
import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule;
|
|
||||||
import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext;
|
import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext;
|
||||||
|
|
||||||
public class MyAbstractAgentRunningAbstractAgentModule extends AbstractAgentRunningModule {
|
public class MyAbstractAgentRunningAbstractAgentModule extends AbstractAgentRunningModule {
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
package work.slhaf.demo.module;
|
package work.slhaf.demo.module;
|
||||||
|
|
||||||
import work.slhaf.partner.api.agent.factory.module.annotation.AgentRunningModule;
|
|
||||||
|
|
||||||
@AgentRunningModule(name = "module_a", order = 0)
|
|
||||||
public class ATestModule {
|
public class ATestModule {
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user