You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/12/17 09:50:14 UTC
[shardingsphere] branch master updated: Rename package of AdviceExecutor (#22934)
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 c1f5ff4a665 Rename package of AdviceExecutor (#22934)
c1f5ff4a665 is described below
commit c1f5ff4a6659b7bd72c92a23f65f697b60b52b09
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Dec 17 17:50:07 2022 +0800
Rename package of AdviceExecutor (#22934)
---
agent/core/pom.xml | 12 ------------
.../core/plugin/{advice => executor}/AdviceExecutor.java | 2 +-
.../{advice => executor}/type/ConstructorAdviceExecutor.java | 4 ++--
.../type/InstanceMethodAdviceExecutor.java | 4 ++--
.../type/StaticMethodAdviceExecutor.java | 4 ++--
.../shardingsphere/agent/core/transformer/MethodAdvisor.java | 2 +-
.../build/builder/type/ConstructorAdvisorBuilder.java | 2 +-
.../build/builder/type/InstanceMethodAdvisorBuilder.java | 2 +-
.../build/builder/type/StaticMethodAdvisorBuilder.java | 2 +-
.../ConstructorAdviceExecutorTest.java} | 6 +++---
.../InstanceMethodAdviceExecutorTest.java} | 6 +++---
.../StaticMethodAdviceExecutorTest.java} | 6 +++---
12 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index eafcfbb9b0b..2ce97a49cef 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -44,18 +44,6 @@
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
similarity index 93%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
index af8c40f93cf..abe76d2c60d 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice;
+package org.apache.shardingsphere.agent.core.plugin.executor;
/**
* Advice executor.
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/ConstructorAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
similarity index 94%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/ConstructorAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
index b0f97e31d43..12290794e2c 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/ConstructorAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice.type;
+package org.apache.shardingsphere.agent.core.plugin.executor.type;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.implementation.bind.annotation.AllArguments;
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.agent.advice.type.ConstructorAdvice;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
-import org.apache.shardingsphere.agent.core.plugin.advice.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
import java.util.Collection;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/InstanceMethodAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
similarity index 97%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/InstanceMethodAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
index 6d2ae154fad..8e82d443ecb 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/InstanceMethodAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice.type;
+package org.apache.shardingsphere.agent.core.plugin.executor.type;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
-import org.apache.shardingsphere.agent.core.plugin.advice.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.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/advice/type/StaticMethodAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
similarity index 97%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/StaticMethodAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
index 22869cf5b10..6b508b2586a 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/type/StaticMethodAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice.type;
+package org.apache.shardingsphere.agent.core.plugin.executor.type;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.agent.advice.MethodInvocationResult;
import org.apache.shardingsphere.agent.advice.type.StaticMethodAdvice;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
-import org.apache.shardingsphere.agent.core.plugin.advice.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
import java.lang.reflect.Method;
import java.util.Collection;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
index 483eee1f3dd..2879468daa7 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.core.transformer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.method.MethodDescription;
-import org.apache.shardingsphere.agent.core.plugin.advice.AdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
/**
* Method advisor.
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
index 06006c7b469..5d310246f2f 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
@@ -25,7 +25,7 @@ import net.bytebuddy.implementation.SuperMethodCall;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advice.type.ConstructorAdvice;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advice.type.ConstructorAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.ConstructorAdviceExecutor;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
import org.apache.shardingsphere.agent.core.transformer.build.builder.MethodAdvisorBuilder;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
index 32844530b47..e849b25e18b 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
@@ -24,7 +24,7 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
-import org.apache.shardingsphere.agent.core.plugin.advice.type.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
import org.apache.shardingsphere.agent.core.transformer.build.builder.MethodAdvisorBuilder;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
index c42818241e8..2f7271da7ed 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
@@ -24,7 +24,7 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advice.type.StaticMethodAdvice;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advice.type.StaticMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.StaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
import org.apache.shardingsphere.agent.core.transformer.build.builder.MethodAdvisorBuilder;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/ConstructorAdviceExecutorTest.java
similarity index 95%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/ConstructorAdviceExecutorTest.java
index 7986e4c5ce9..5c7f4fcd6fa 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/ConstructorAdviceExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice;
+package org.apache.shardingsphere.agent.core.plugin.executor;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.ByteBuddyAgent;
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.logging.LoggingListener;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
import org.apache.shardingsphere.agent.core.mock.material.ConstructorMaterial;
-import org.apache.shardingsphere.agent.core.plugin.advice.type.ConstructorAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.ConstructorAdviceExecutor;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -45,7 +45,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertArrayEquals;
-public final class ConstructorYamlAdvisorConfigurationTest {
+public final class ConstructorAdviceExecutorTest {
private static final String EXTRA_DATA = "_$EXTRA_DATA$_";
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/InstanceMethodAdviceExecutorTest.java
similarity index 95%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/InstanceMethodAdviceExecutorTest.java
index c31d96c01b9..3c79e7afaa6 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/InstanceMethodAdviceExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice;
+package org.apache.shardingsphere.agent.core.plugin.executor;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.ByteBuddy;
@@ -30,7 +30,7 @@ import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.mock.material.InstanceMaterial;
-import org.apache.shardingsphere.agent.core.plugin.advice.type.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.InstanceMethodAdviceExecutor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertArrayEquals;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class InstanceMethodAroundYamlAdvisorConfigurationTest {
+public final class InstanceMethodAdviceExecutorTest {
private static final String EXTRA_DATA = "_$EXTRA_DATA$_";
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/StaticMethodAdviceExecutorTest.java
similarity index 95%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/StaticMethodAdviceExecutorTest.java
index b0178daae90..ec99542b425 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/executor/StaticMethodAdviceExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice;
+package org.apache.shardingsphere.agent.core.plugin.executor;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.ByteBuddy;
@@ -30,7 +30,7 @@ import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAdvice;
import org.apache.shardingsphere.agent.core.mock.material.StaticMaterial;
-import org.apache.shardingsphere.agent.core.plugin.advice.type.StaticMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.executor.type.StaticMethodAdviceExecutor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertArrayEquals;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class StaticMethodAroundYamlAdvisorConfigurationTest {
+public final class StaticMethodAdviceExecutorTest {
private static final String EXTRA_DATA = "_$EXTRA_DATA$_";