diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt index ea798e15..8d8e0262 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt @@ -12,8 +12,8 @@ import work.slhaf.partner.framework.agent.factory.capability.exception.UnMatched import work.slhaf.partner.framework.agent.factory.capability.exception.UnMatchedCapabilityMethodException import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.framework.agent.util.AgentUtil.isAssignableFromAnnotation -import work.slhaf.partner.framework.agent.util.AgentUtil.methodSignature +import work.slhaf.partner.framework.agent.factory.util.ReflectUtil.isAssignableFromAnnotation +import work.slhaf.partner.framework.agent.factory.util.ReflectUtil.methodSignature /** * 校验 Capability 体系注解关系,并将扫描结果写入 `CapabilityFactoryContext`。 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityRegisterFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityRegisterFactory.kt index c12595df..d11cd51c 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityRegisterFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityRegisterFactory.kt @@ -8,7 +8,7 @@ import work.slhaf.partner.framework.agent.factory.capability.exception.Capabilit import work.slhaf.partner.framework.agent.factory.capability.exception.CapabilityFactoryExecuteFailedException import work.slhaf.partner.framework.agent.factory.capability.exception.DuplicateMethodException import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.framework.agent.util.AgentUtil.methodSignature +import work.slhaf.partner.framework.agent.factory.util.ReflectUtil.methodSignature import java.lang.reflect.Method import java.lang.reflect.Proxy import java.util.function.Function diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentAnnotationValidatorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentAnnotationValidatorFactory.kt index c78c63f8..4b6d80c5 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentAnnotationValidatorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentAnnotationValidatorFactory.kt @@ -7,7 +7,7 @@ import work.slhaf.partner.framework.agent.factory.component.annotation.Init import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule import work.slhaf.partner.framework.agent.factory.component.exception.ModuleCheckException import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.framework.agent.util.AgentUtil +import work.slhaf.partner.framework.agent.factory.util.ReflectUtil /** * 校验 Component 层面的注解约束,并缓存 Init 方法扫描结果。 @@ -26,7 +26,7 @@ class ComponentAnnotationValidatorFactory : AgentBaseFactory() { reflections.getMethodsAnnotatedWith(Init::class.java) .forEach { method -> val declaringClass = method.declaringClass - if (!AgentUtil.isAssignableFromAnnotation(declaringClass, AgentComponent::class.java)) { + if (!ReflectUtil.isAssignableFromAnnotation(declaringClass, AgentComponent::class.java)) { throw ModuleCheckException( "@Init 只能用于 AgentComponent 中: " + "${declaringClass.name}#${method.name}" @@ -47,7 +47,7 @@ class ComponentAnnotationValidatorFactory : AgentBaseFactory() { reflections.getFieldsAnnotatedWith(InjectModule::class.java) .forEach { field -> val declaringClass = field.declaringClass - if (!AgentUtil.isAssignableFromAnnotation(declaringClass, AgentComponent::class.java)) { + if (!ReflectUtil.isAssignableFromAnnotation(declaringClass, AgentComponent::class.java)) { throw ModuleCheckException( "@InjectModule 只能用于 AgentComponent 中: " + "${declaringClass.name}#${field.name}" diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInitHookExecutorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInitHookExecutorFactory.kt index 879a9558..cb4d8800 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInitHookExecutorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInitHookExecutorFactory.kt @@ -5,7 +5,7 @@ import work.slhaf.partner.framework.agent.factory.component.annotation.Init import work.slhaf.partner.framework.agent.factory.component.exception.ModuleInitHookExecuteFailedException import work.slhaf.partner.framework.agent.factory.context.AgentContext import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.framework.agent.util.AgentUtil.methodSignature +import work.slhaf.partner.framework.agent.factory.util.ReflectUtil.methodSignature import java.lang.reflect.Method /** diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/ShutdownHookCollectorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/ShutdownHookCollectorFactory.kt index 65659bd9..55895de5 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/ShutdownHookCollectorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/ShutdownHookCollectorFactory.kt @@ -4,7 +4,7 @@ import work.slhaf.partner.framework.agent.factory.AgentBaseFactory import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent import work.slhaf.partner.framework.agent.factory.component.exception.ModuleCheckException -import work.slhaf.partner.framework.agent.util.AgentUtil +import work.slhaf.partner.framework.agent.factory.util.ReflectUtil /** * 校验并收集 `@Shutdown` 方法。 @@ -24,9 +24,9 @@ class ShutdownHookCollectorFactory : AgentBaseFactory() { .forEach { method -> val declaringClass = method.declaringClass val isAgentComponentRelated = - AgentUtil.isAssignableFromAnnotation(declaringClass, AgentComponent::class.java) + ReflectUtil.isAssignableFromAnnotation(declaringClass, AgentComponent::class.java) val isCapabilityCoreRelated = - AgentUtil.isAssignableFromAnnotation(declaringClass, CapabilityCore::class.java) + ReflectUtil.isAssignableFromAnnotation(declaringClass, CapabilityCore::class.java) if (!isAgentComponentRelated && !isCapabilityCoreRelated) { throw ModuleCheckException( diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/util/AgentUtil.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/util/ReflectUtil.java similarity index 96% rename from Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/util/AgentUtil.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/util/ReflectUtil.java index fc63019c..84dc0866 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/util/AgentUtil.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/util/ReflectUtil.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.framework.agent.util; +package work.slhaf.partner.framework.agent.factory.util; import org.reflections.Reflections; @@ -8,7 +8,7 @@ import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; -public final class AgentUtil { +public final class ReflectUtil { public static boolean isAssignableFromAnnotation(Class clazz, Class targetAnnotation) { Set> visited = new HashSet<>();