This is an automated email from the ASF dual-hosted git repository.
panjuan 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 a2f1014ca63 Refactor agent.core.advisor.config package (#23428)
a2f1014ca63 is described below
commit a2f1014ca63364d547defbb7b19e187983ad5f95
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 9 13:41:02 2023 +0800
Refactor agent.core.advisor.config package (#23428)
---
.../shardingsphere/agent/core/ShardingSphereAgent.java | 2 +-
.../advisor/{ => config}/AdvisorConfigurationLoader.java | 7 +++----
.../{ => config}/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 | 6 +++---
.../yaml/swapper/YamlAdvisorsConfigurationSwapper.java | 6 +++---
.../yaml/swapper/YamlPointcutConfigurationSwapper.java | 6 +++---
.../{ => config}/yaml/fixture/YamlAdviceFixture.java | 2 +-
.../{ => config}/yaml/fixture/YamlTargetObjectFixture.java | 2 +-
.../yaml/loader/YamlAdvisorsConfigurationLoaderTest.java | 14 +++++++-------
.../yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java | 8 ++++----
agent/core/src/test/resources/META-INF/conf/advisors.yaml | 4 ++--
15 files changed, 34 insertions(+), 35 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 8060c0acdd6..50e65f664ef 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
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.agent.core.builder.AgentBuilderFactory;
import org.apache.shardingsphere.agent.core.path.AgentPath;
import org.apache.shardingsphere.agent.core.plugin.jar.PluginJar;
import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.advisor.AdvisorConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfigurationLoader;
import org.apache.shardingsphere.agent.core.plugin.jar.PluginJarLoader;
import
org.apache.shardingsphere.agent.core.plugin.config.PluginConfigurationLoader;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/AdvisorConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
similarity index 92%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/AdvisorConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
index a825707faf7..9c78f4ad7b3 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/AdvisorConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor;
+package org.apache.shardingsphere.agent.core.advisor.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -23,10 +23,9 @@ 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.jar.PluginJar;
-import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.jar.PluginJarLoader;
-import
org.apache.shardingsphere.agent.core.advisor.yaml.loader.YamlAdvisorsConfigurationLoader;
-import
org.apache.shardingsphere.agent.core.advisor.yaml.swapper.YamlAdvisorsConfigurationSwapper;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.loader.YamlAdvisorsConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.swapper.YamlAdvisorsConfigurationSwapper;
import java.io.InputStream;
import java.util.Collection;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlAdvisorConfiguration.java
similarity index 94%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlAdvisorConfiguration.java
index 5a9db785a53..10e56da7cac 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlAdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorsConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlAdvisorsConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorsConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlAdvisorsConfiguration.java
index afc29078c03..595f11d95dc 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlAdvisorsConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlAdvisorsConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlPointcutConfiguration.java
similarity index 94%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlPointcutConfiguration.java
index a1798919063..dce3e17ce4d 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlPointcutConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutParameterConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlPointcutParameterConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutParameterConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlPointcutParameterConfiguration.java
index c55063aa0b1..5c8160c11fc 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/entity/YamlPointcutParameterConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/entity/YamlPointcutParameterConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.entity;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoader.java
similarity index 89%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoader.java
index febb11d4807..cd3a7f3a630 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.loader;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlAdvisorsConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.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/advisor/yaml/swapper/YamlAdvisorConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapper.java
similarity index 88%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapper.java
index bd1c0d22950..a9e6334444d 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorConfigurationSwapper.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
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;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlPointcutConfiguration;
/**
* YAML advisor configuration swapper.
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
similarity index 87%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
index 05af5275949..860a2be7190 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
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
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorsConfiguration;
import java.util.Collection;
import java.util.LinkedList;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlPointcutConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapper.java
similarity index 89%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlPointcutConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapper.java
index aa2dac0020e..c8bdb0d09d1 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlPointcutConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlPointcutConfigurationSwapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
+package org.apache.shardingsphere.agent.core.advisor.config.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.advisor.yaml.entity.YamlPointcutConfiguration;
-import
org.apache.shardingsphere.agent.core.advisor.yaml.entity.YamlPointcutParameterConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlPointcutConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlPointcutParameterConfiguration;
import java.util.Optional;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlAdviceFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/fixture/YamlAdviceFixture.java
similarity index 96%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlAdviceFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/fixture/YamlAdviceFixture.java
index b1fdeb9e69f..f804c7d1b6c 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlAdviceFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/fixture/YamlAdviceFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.fixture;
+package org.apache.shardingsphere.agent.core.advisor.config.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/advisor/yaml/fixture/YamlTargetObjectFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/fixture/YamlTargetObjectFixture.java
similarity index 96%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlTargetObjectFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/fixture/YamlTargetObjectFixture.java
index 52dca81a207..b86d819c35a 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/fixture/YamlTargetObjectFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/fixture/YamlTargetObjectFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.fixture;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.fixture;
import lombok.NoArgsConstructor;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
similarity index 88%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
index 622189f379d..05c1d3a3b3c 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.loader;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.loader;
-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.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorsConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlPointcutConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlPointcutParameterConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.fixture.YamlAdviceFixture;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.fixture.YamlTargetObjectFixture;
import org.junit.Test;
import java.util.ArrayList;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
similarity index 91%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
index ae0b57625b5..98bc121aa3e 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/config/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor.yaml.swapper;
+package org.apache.shardingsphere.agent.core.advisor.config.yaml.swapper;
import net.bytebuddy.matcher.ElementMatchers;
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.apache.shardingsphere.agent.core.advisor.config.yaml.entity.YamlAdvisorsConfiguration;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.fixture.YamlAdviceFixture;
+import
org.apache.shardingsphere.agent.core.advisor.config.yaml.fixture.YamlTargetObjectFixture;
import org.junit.Test;
import org.yaml.snakeyaml.Yaml;
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 4e8276f6a83..946c222ed3d 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.advisor.yaml.fixture.YamlTargetObjectFixture
- advice:
org.apache.shardingsphere.agent.core.advisor.yaml.fixture.YamlAdviceFixture
+ - target:
org.apache.shardingsphere.agent.core.advisor.config.yaml.fixture.YamlTargetObjectFixture
+ advice:
org.apache.shardingsphere.agent.core.advisor.config.yaml.fixture.YamlAdviceFixture
pointcuts:
- type: constructor
- type: constructor
