diff --git a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootConfigInitializer.java b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootConfigInitializer.java index 0613de04..eb2eafef 100644 --- a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootConfigInitializer.java +++ b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootConfigInitializer.java @@ -48,7 +48,7 @@ public class SpringBootConfigInitializer { return SPRING_PROPERTIES == null || SPRING_PROPERTIES.isEmpty(); } - public static synchronized void initializeConfig(SpringBootPluginConfig springBootConfig) { + public static synchronized void initializeConfig(SpringBootConfigNode springBootConfig) { if (SPRING_PROPERTIES != null) { try { LOG.info("initialize Spring Config Class {}.", springBootConfig.root()); diff --git a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootPluginConfig.java b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootConfigNode.java similarity index 96% rename from hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootPluginConfig.java rename to hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootConfigNode.java index 4fefe2cb..01350ca2 100644 --- a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootPluginConfig.java +++ b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/boot/SpringBootConfigNode.java @@ -24,7 +24,7 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) -public @interface SpringBootPluginConfig { +public @interface SpringBootConfigNode { /** * @return Class as the root to do config initialization. diff --git a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/plugin/loader/AgentClassLoader.java b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/plugin/loader/AgentClassLoader.java index 6b5c87b6..3fec67cc 100644 --- a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/plugin/loader/AgentClassLoader.java +++ b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/plugin/loader/AgentClassLoader.java @@ -20,7 +20,7 @@ package cn.hippo4j.agent.core.plugin.loader; import cn.hippo4j.agent.core.boot.AgentPackageNotFoundException; import cn.hippo4j.agent.core.boot.AgentPackagePath; import cn.hippo4j.agent.core.boot.PluginConfig; -import cn.hippo4j.agent.core.boot.SpringBootPluginConfig; +import cn.hippo4j.agent.core.boot.SpringBootConfigNode; import cn.hippo4j.agent.core.boot.SpringBootConfigInitializer; import cn.hippo4j.agent.core.conf.Config; import cn.hippo4j.agent.core.conf.SnifferConfigInitializer; @@ -171,7 +171,7 @@ public class AgentClassLoader extends ClassLoader { SnifferConfigInitializer.initializeConfig(pluginConfig.root()); } - final SpringBootPluginConfig springBootConfig = loadedClass.getAnnotation(SpringBootPluginConfig.class); + final SpringBootConfigNode springBootConfig = loadedClass.getAnnotation(SpringBootConfigNode.class); if (springBootConfig != null) { // Set up the plugin config when loaded by spring environment is prepared, just scan in here. // Agent class loader just loaded limited classes in the plugin jar(s), so the cost of this diff --git a/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/conf/SpringBootConfig.java b/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/conf/SpringBootConfig.java index 38e62c62..883cddb3 100644 --- a/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/conf/SpringBootConfig.java +++ b/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/conf/SpringBootConfig.java @@ -17,7 +17,7 @@ package cn.hippo4j.agent.plugin.spring.common.conf; -import cn.hippo4j.agent.core.boot.SpringBootPluginConfig; +import cn.hippo4j.agent.core.boot.SpringBootConfigNode; import java.util.Arrays; import java.util.List; @@ -28,10 +28,10 @@ public class SpringBootConfig { public static class Dynamic { - @SpringBootPluginConfig(root = SpringBootConfig.class) + @SpringBootConfigNode(root = SpringBootConfig.class) public static class Thread_Pool { - @SpringBootPluginConfig(root = SpringBootConfig.class) + @SpringBootConfigNode(root = SpringBootConfig.class) public static class Apollo { public static List NAMESPACE = Arrays.asList("application");