This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b93021af5aa Refactor agent core packages (#23413)
b93021af5aa is described below
commit b93021af5aaa81c557314e2fc52420a1592dcd2f
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 9 00:02:36 2023 +0800
Refactor agent core packages (#23413)
---
.../shardingsphere/agent/core/ShardingSphereAgent.java | 6 +++---
.../advisor => advisor/config}/AdvisorConfiguration.java | 2 +-
.../config}/AdvisorConfigurationRegistry.java | 2 +-
.../config}/AdvisorConfigurationRegistryFactory.java | 2 +-
.../config}/MethodAdvisorConfiguration.java | 2 +-
.../core/{plugin => advisor}/executor/AdviceExecutor.java | 2 +-
.../executor/AdviceExecutorFactory.java | 10 +++++-----
.../core/{plugin => advisor}/executor/AdviceFactory.java | 2 +-
.../executor/type/ConstructorAdviceExecutor.java | 4 ++--
.../executor/type/InstanceMethodAdviceExecutor.java | 4 ++--
.../executor/type/StaticMethodAdviceExecutor.java | 4 ++--
.../loader/AdvisorConfigurationLoader.java | 9 +++++----
.../yaml}/entity/YamlAdvisorConfiguration.java | 2 +-
.../yaml}/entity/YamlAdvisorsConfiguration.java | 2 +-
.../yaml}/entity/YamlPointcutConfiguration.java | 2 +-
.../yaml}/entity/YamlPointcutParameterConfiguration.java | 2 +-
.../yaml}/loader/YamlAdvisorsConfigurationLoader.java | 4 ++--
.../yaml}/swapper/YamlAdvisorConfigurationSwapper.java | 12 ++++++------
.../yaml}/swapper/YamlAdvisorsConfigurationSwapper.java | 8 ++++----
.../yaml}/swapper/YamlPointcutConfigurationSwapper.java | 6 +++---
.../agent/core/builder/AgentBuilderFactory.java | 2 +-
.../shardingsphere/agent/core/builder/AgentJunction.java | 2 +-
.../agent/core/builder/AgentTransformer.java | 2 +-
.../interceptor/impl/MethodAdvisorBuilderInterceptor.java | 6 +++---
.../yaml/{plugin => }/entity/YamlAgentConfiguration.java | 2 +-
.../entity/YamlPluginCategoryConfiguration.java | 2 +-
.../yaml/{plugin => }/entity/YamlPluginConfiguration.java | 2 +-
.../{plugin => }/loader/PluginConfigurationLoader.java | 6 +++---
.../swapper/YamlPluginsConfigurationSwapper.java | 8 ++++----
.../config}/AdvisorConfigurationRegistryFactoryTest.java | 2 +-
.../config}/AdvisorConfigurationRegistryTest.java | 2 +-
.../yaml}/fixture/YamlAdviceFixture.java | 2 +-
.../yaml}/fixture/YamlTargetObjectFixture.java | 2 +-
.../yaml}/loader/YamlAdvisorsConfigurationLoaderTest.java | 14 +++++++-------
.../swapper/YamlAdvisorsConfigurationSwapperTest.java | 12 ++++++------
.../agent/core/builder/AgentBuilderFactoryTest.java | 4 ++--
.../{plugin => }/loader/PluginConfigurationLoaderTest.java | 2 +-
agent/core/src/test/resources/META-INF/conf/advisors.yaml | 4 ++--
38 files changed, 82 insertions(+), 81 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
index 053e188e5fb..2bbe462cc04 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.agent.api.PluginConfiguration;
import org.apache.shardingsphere.agent.core.builder.AgentBuilderFactory;
import org.apache.shardingsphere.agent.core.path.AgentPath;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.loader.AdvisorConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.loader.AdvisorConfigurationLoader;
import org.apache.shardingsphere.agent.core.plugin.loader.AgentPluginLoader;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.plugin.loader.PluginConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.plugin.yaml.loader.PluginConfigurationLoader;
import java.io.File;
import java.io.IOException;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfiguration.java
similarity index 95%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfiguration.java
index e953818b68e..cfe3734b8cc 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advisor;
+package org.apache.shardingsphere.agent.core.advisor.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistry.java
similarity index 95%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistry.java
index 455404c7b22..765d4fafc93 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advisor;
+package org.apache.shardingsphere.agent.core.advisor.config;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryFactory.java
similarity index 96%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryFactory.java
index adc305540bb..92bab3958cd 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advisor;
+package org.apache.shardingsphere.agent.core.advisor.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/MethodAdvisorConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/MethodAdvisorConfiguration.java
similarity index 95%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/MethodAdvisorConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/MethodAdvisorConfiguration.java
index 9507b6ac299..6138aaa9299 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/MethodAdvisorConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/MethodAdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advisor;
+package org.apache.shardingsphere.agent.core.advisor.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceExecutor.java
similarity index 95%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceExecutor.java
index 4e8701c28bb..2d08abfa44f 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.executor;
+package org.apache.shardingsphere.agent.core.advisor.executor;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.dynamic.DynamicType.Builder;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutorFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceExecutorFactory.java
similarity index 89%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutorFactory.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceExecutorFactory.java
index 99f54c92b90..10f247e59e4 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutorFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceExecutorFactory.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.executor;
+package org.apache.shardingsphere.agent.core.advisor.executor;
import net.bytebuddy.description.method.MethodDescription.InDefinedShape;
import org.apache.shardingsphere.agent.api.advice.AgentAdvice;
import org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.api.advice.type.StaticMethodAdvice;
+import
org.apache.shardingsphere.agent.core.advisor.executor.type.ConstructorAdviceExecutor;
+import
org.apache.shardingsphere.agent.core.advisor.executor.type.StaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.classloader.ClassLoaderContext;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.executor.type.ConstructorAdviceExecutor;
-import
org.apache.shardingsphere.agent.core.plugin.executor.type.InstanceMethodAdviceExecutor;
-import
org.apache.shardingsphere.agent.core.plugin.executor.type.StaticMethodAdviceExecutor;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.executor.type.InstanceMethodAdviceExecutor;
import java.util.Collection;
import java.util.Optional;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceFactory.java
similarity index 97%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceFactory.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceFactory.java
index 8fa45db844f..a7826433ec9 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/AdviceFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.executor;
+package org.apache.shardingsphere.agent.core.advisor.executor;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/ConstructorAdviceExecutor.java
similarity index 95%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/ConstructorAdviceExecutor.java
index bf7bed75d0b..5265a9cb042 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/ConstructorAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.executor.type;
+package org.apache.shardingsphere.agent.core.advisor.executor.type;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.method.MethodDescription;
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
import org.apache.shardingsphere.agent.core.log.LoggerFactory;
import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
-import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
import java.util.Collection;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/InstanceMethodAdviceExecutor.java
similarity index 97%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/InstanceMethodAdviceExecutor.java
index 2f58231f9be..b0e354b0373 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/InstanceMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.executor.type;
+package org.apache.shardingsphere.agent.core.advisor.executor.type;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -30,7 +30,7 @@ import net.bytebuddy.implementation.bind.annotation.This;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
-import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
import org.apache.shardingsphere.agent.core.log.LoggerFactory;
import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/StaticMethodAdviceExecutor.java
similarity index 97%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/StaticMethodAdviceExecutor.java
index d84085f79ab..11a6a40b49a 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/StaticMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.executor.type;
+package org.apache.shardingsphere.agent.core.advisor.executor.type;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.agent.api.advice.type.StaticMethodAdvice;
import org.apache.shardingsphere.agent.core.log.LoggerFactory;
import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
-import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
import java.lang.reflect.Method;
import java.util.Collection;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/loader/AdvisorConfigurationLoader.java
similarity index 91%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/loader/AdvisorConfigurationLoader.java
index 01cca670f27..324f669a313 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/loader/AdvisorConfigurationLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.loader;
+package org.apache.shardingsphere.agent.core.advisor.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -23,9 +23,10 @@ import
org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
import org.apache.shardingsphere.agent.core.log.LoggerFactory;
import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.loader.YamlAdvisorsConfigurationLoader;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.swapper.YamlAdvisorsConfigurationSwapper;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.loader.AgentPluginLoader;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.loader.YamlAdvisorsConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.swapper.YamlAdvisorsConfigurationSwapper;
import java.io.InputStream;
import java.util.Collection;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlAdvisorConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorConfiguration.java
similarity index 94%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlAdvisorConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorConfiguration.java
index d0facdb9cc4..5a9db785a53 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlAdvisorConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity;
+package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlAdvisorsConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorsConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlAdvisorsConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorsConfiguration.java
index 428dc5084be..afc29078c03 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlAdvisorsConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorsConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity;
+package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlPointcutConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutConfiguration.java
similarity index 94%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlPointcutConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutConfiguration.java
index 7fb3a01bd7f..a1798919063 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlPointcutConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity;
+package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlPointcutParameterConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutParameterConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlPointcutParameterConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutParameterConfiguration.java
index fa295a51021..c55063aa0b1 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/entity/YamlPointcutParameterConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutParameterConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity;
+package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/loader/YamlAdvisorsConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoader.java
similarity index 89%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/loader/YamlAdvisorsConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoader.java
index 4560c284f7b..febb11d4807 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/loader/YamlAdvisorsConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.loader;
+package org.apache.shardingsphere.agent.core.advisor.yaml.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlAdvisorsConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorsConfiguration;
import org.yaml.snakeyaml.Yaml;
import java.io.InputStream;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorConfigurationSwapper.java
similarity index 80%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorConfigurationSwapper.java
index e429c64d3ba..bd1c0d22950 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorConfigurationSwapper.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.swapper;
+package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlPointcutConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.MethodAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfigurationRegistryFactory;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlPointcutConfiguration;
/**
* YAML advisor configuration swapper.
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorsConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
similarity index 84%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorsConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
index eda713b9e2c..05af5275949 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorsConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.swapper;
+package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlAdvisorsConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorsConfiguration;
import java.util.Collection;
import java.util.LinkedList;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlPointcutConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlPointcutConfigurationSwapper.java
similarity index 89%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlPointcutConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlPointcutConfigurationSwapper.java
index e000761fe73..aa2dac0020e 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlPointcutConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlPointcutConfigurationSwapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.swapper;
+package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -23,8 +23,8 @@ import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatcher.Junction;
import net.bytebuddy.matcher.ElementMatchers;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlPointcutConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlPointcutParameterConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlPointcutConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlPointcutParameterConfiguration;
import java.util.Optional;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
index 4a0474c273c..6ee871f3b43 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
@@ -25,7 +25,7 @@ import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
import java.util.Collection;
import java.util.Map;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentJunction.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentJunction.java
index 3a604d6aa85..47220df19cb 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentJunction.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentJunction.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatcher.Junction;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
import java.util.Map;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
index 96a2e8d94aa..55d6cf23f33 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.agent.core.builder.interceptor.impl.TargetAdvic
import org.apache.shardingsphere.agent.core.classloader.ClassLoaderContext;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import
org.apache.shardingsphere.agent.core.plugin.PluginLifecycleServiceManager;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
import java.util.Collection;
import java.util.Map;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
index c90bab35c30..a6c9e4de7f7 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
@@ -24,9 +24,9 @@ import
org.apache.shardingsphere.agent.core.builder.interceptor.AgentBuilderInte
import org.apache.shardingsphere.agent.core.classloader.ClassLoaderContext;
import org.apache.shardingsphere.agent.core.log.LoggerFactory;
import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
-import
org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutorFactory;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
+import
org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutorFactory;
import java.util.Optional;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlAgentConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAgentConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlAgentConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAgentConfiguration.java
index 8eb16512590..eeed554b9e9 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlAgentConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAgentConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.plugin.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlPluginCategoryConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginCategoryConfiguration.java
similarity index 94%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlPluginCategoryConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginCategoryConfiguration.java
index 63d1decc9ed..4dd8a8686e3 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlPluginCategoryConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginCategoryConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.plugin.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlPluginConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlPluginConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginConfiguration.java
index 0af8785294a..8f870bcbcfb 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/entity/YamlPluginConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.plugin.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/loader/PluginConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/PluginConfigurationLoader.java
similarity index 89%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/loader/PluginConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/PluginConfigurationLoader.java
index 8b95eaf1e20..9674269b440 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/loader/PluginConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/PluginConfigurationLoader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.plugin.loader;
+package org.apache.shardingsphere.agent.core.plugin.yaml.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.plugin.entity.YamlAgentConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.plugin.swapper.YamlPluginsConfigurationSwapper;
+import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAgentConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlPluginsConfigurationSwapper;
import org.yaml.snakeyaml.Yaml;
import java.io.File;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/swapper/YamlPluginsConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPluginsConfigurationSwapper.java
similarity index 87%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/swapper/YamlPluginsConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPluginsConfigurationSwapper.java
index 0e9549b0f61..be1045e10ec 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/swapper/YamlPluginsConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPluginsConfigurationSwapper.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.plugin.swapper;
+package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.plugin.entity.YamlAgentConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.plugin.entity.YamlPluginCategoryConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.plugin.entity.YamlPluginConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAgentConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPluginCategoryConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPluginConfiguration;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryFactoryTest.java
similarity index 95%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryFactoryTest.java
index a45921d9ad0..f1be6b98c09 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryFactoryTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryFactoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advisor;
+package org.apache.shardingsphere.agent.core.advisor.config;
import org.junit.Test;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryTest.java
similarity index 95%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryTest.java
index 24917d3cab3..9cb2eaf8052 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationRegistryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advisor;
+package org.apache.shardingsphere.agent.core.advisor.config;
import org.junit.Test;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/fixture/YamlAdviceFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlAdviceFixture.java
similarity index 96%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/fixture/YamlAdviceFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlAdviceFixture.java
index d0c0cce0161..b1fdeb9e69f 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/fixture/YamlAdviceFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlAdviceFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture;
+package org.apache.shardingsphere.agent.core.advisor.yaml.fixture;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/fixture/YamlTargetObjectFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlTargetObjectFixture.java
similarity index 96%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/fixture/YamlTargetObjectFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlTargetObjectFixture.java
index bc49c3743fe..52dca81a207 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/fixture/YamlTargetObjectFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlTargetObjectFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture;
+package org.apache.shardingsphere.agent.core.advisor.yaml.fixture;
import lombok.NoArgsConstructor;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/loader/YamlAdvisorsConfigurationLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
similarity index 88%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/loader/YamlAdvisorsConfigurationLoaderTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
index d172e99a2df..622189f379d 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/loader/YamlAdvisorsConfigurationLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.loader;
+package org.apache.shardingsphere.agent.core.advisor.yaml.loader;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlAdvisorsConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlPointcutConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlPointcutParameterConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture.YamlAdviceFixture;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture.YamlTargetObjectFixture;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorsConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlPointcutConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlPointcutParameterConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.fixture.YamlAdviceFixture;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.fixture.YamlTargetObjectFixture;
import org.junit.Test;
import java.util.ArrayList;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorsConfigurationSwapperTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
similarity index 87%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorsConfigurationSwapperTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
index eb022568ecf..ae0b57625b5 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/advisor/swapper/YamlAdvisorsConfigurationSwapperTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.advisor.swapper;
+package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
import net.bytebuddy.matcher.ElementMatchers;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.entity.YamlAdvisorsConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture.YamlAdviceFixture;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture.YamlTargetObjectFixture;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.MethodAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorsConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.fixture.YamlAdviceFixture;
+import
org.apache.shardingsphere.agent.core.advisor.yaml.fixture.YamlTargetObjectFixture;
import org.junit.Test;
import org.yaml.snakeyaml.Yaml;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
index 5c20f4659e3..6dc5c912760 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
@@ -24,8 +24,8 @@ import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.fixture.advice.BarAdvice;
import org.apache.shardingsphere.fixture.advice.FooAdvice;
import org.apache.shardingsphere.fixture.targeted.TargetObjectFixture;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.MethodAdvisorConfiguration;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/loader/PluginConfigurationLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/PluginConfigurationLoaderTest.java
similarity index 95%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/loader/PluginConfigurationLoaderTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/PluginConfigurationLoaderTest.java
index 8bc3a28cf54..8418507c858 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/plugin/loader/PluginConfigurationLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/PluginConfigurationLoaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.plugin.loader;
+package org.apache.shardingsphere.agent.core.plugin.yaml.loader;
import org.junit.Test;
diff --git a/agent/core/src/test/resources/META-INF/conf/advisors.yaml
b/agent/core/src/test/resources/META-INF/conf/advisors.yaml
index f838422cd5d..4e8276f6a83 100644
--- a/agent/core/src/test/resources/META-INF/conf/advisors.yaml
+++ b/agent/core/src/test/resources/META-INF/conf/advisors.yaml
@@ -16,8 +16,8 @@
#
advisors:
- - target:
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture.YamlTargetObjectFixture
- advice:
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.fixture.YamlAdviceFixture
+ - target:
org.apache.shardingsphere.agent.core.advisor.yaml.fixture.YamlTargetObjectFixture
+ advice:
org.apache.shardingsphere.agent.core.advisor.yaml.fixture.YamlAdviceFixture
pointcuts:
- type: constructor
- type: constructor
