This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 2a72b340f6a Rename agent.core.transformer to agent.core.builder
(#23391)
2a72b340f6a is described below
commit 2a72b340f6aa36ee09fc642530aa2641116d8649
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 7 15:17:05 2023 +0800
Rename agent.core.transformer to agent.core.builder (#23391)
* Rename agent.core.transformer to agent.core.builder
* Rename agent.core.transformer to agent.core.builder
---
.../shardingsphere/agent/core/ShardingSphereAgent.java | 4 ++--
.../builder/advise => builder}/AdviceFactory.java | 2 +-
.../agent/core/{transformer => builder}/AgentJunction.java | 2 +-
.../core/{transformer => builder}/AgentTransformer.java | 4 +---
.../agent/core/{transformer => builder}/MethodAdvisor.java | 2 +-
.../core/{transformer => }/builder/MethodAdvisorBuilder.java | 4 +---
.../core/{transformer => builder}/AgentTransformerTest.java | 12 ++++++------
.../{transformer => builder}/fixture/advice/BarAdvice.java | 2 +-
.../{transformer => builder}/fixture/advice/FooAdvice.java | 2 +-
.../fixture/targeted/TargetObjectFixture.java | 2 +-
10 files changed, 16 insertions(+), 20 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 a242e01ca56..f3cebf8adea 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
@@ -29,8 +29,8 @@ import
org.apache.shardingsphere.agent.core.logging.LoggingListener;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import
org.apache.shardingsphere.agent.core.plugin.loader.AdvisorConfigurationLoader;
import org.apache.shardingsphere.agent.core.plugin.loader.AgentPluginLoader;
-import org.apache.shardingsphere.agent.core.transformer.AgentJunction;
-import org.apache.shardingsphere.agent.core.transformer.AgentTransformer;
+import org.apache.shardingsphere.agent.core.builder.AgentJunction;
+import org.apache.shardingsphere.agent.core.builder.AgentTransformer;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/advise/AdviceFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AdviceFactory.java
similarity index 96%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/advise/AdviceFactory.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AdviceFactory.java
index 156232e1fbe..f893100fa0c 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/advise/AdviceFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AdviceFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer.builder.advise;
+package org.apache.shardingsphere.agent.core.builder;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentJunction.java
similarity index 96%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentJunction.java
index 574cf1cf609..3a604d6aa85 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentJunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer;
+package org.apache.shardingsphere.agent.core.builder;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.type.TypeDescription;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
index bef079f1ead..9f555d9f029 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer;
+package org.apache.shardingsphere.agent.core.builder;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.agent.builder.AgentBuilder.Transformer;
@@ -28,8 +28,6 @@ import
org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.classloader.ClassLoaderContext;
import org.apache.shardingsphere.agent.core.plugin.PluginBootServiceManager;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
-import
org.apache.shardingsphere.agent.core.transformer.builder.MethodAdvisorBuilder;
-import
org.apache.shardingsphere.agent.core.transformer.builder.advise.AdviceFactory;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
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/builder/MethodAdvisor.java
similarity index 95%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisor.java
index 2879468daa7..53f6525d85b 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/builder/MethodAdvisor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer;
+package org.apache.shardingsphere.agent.core.builder;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilder.java
similarity index 95%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilder.java
index 9cb683e1d0a..9f53f4bd6d8 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer.builder;
+package org.apache.shardingsphere.agent.core.builder;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.method.MethodDescription.InDefinedShape;
@@ -30,9 +30,7 @@ import
org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
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.transformer.MethodAdvisor;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.transformer.builder.advise.AdviceFactory;
import java.util.Collection;
import java.util.Optional;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
similarity index 93%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
index c7b1038e0c6..54db10faa52 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer;
+package org.apache.shardingsphere.agent.core.builder;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.ByteBuddyAgent;
@@ -26,9 +26,9 @@ 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.logging.LoggingListener;
-import
org.apache.shardingsphere.agent.core.transformer.fixture.advice.BarAdvice;
-import
org.apache.shardingsphere.agent.core.transformer.fixture.advice.FooAdvice;
-import
org.apache.shardingsphere.agent.core.transformer.fixture.targeted.TargetObjectFixture;
+import org.apache.shardingsphere.agent.core.builder.fixture.advice.BarAdvice;
+import org.apache.shardingsphere.agent.core.builder.fixture.advice.FooAdvice;
+import
org.apache.shardingsphere.agent.core.builder.fixture.targeted.TargetObjectFixture;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -53,7 +53,7 @@ public final class AgentTransformerTest {
Map<String, AdvisorConfiguration> advisorConfigs =
Collections.singletonMap(advisorConfig.getTargetClassName(), advisorConfig);
byteBuddyAgent = new AgentBuilder.Default().with(new
ByteBuddy().with(TypeValidation.ENABLED))
.ignore(ElementMatchers.isSynthetic()).or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.")
-
.and(ElementMatchers.not(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.core.transformer.fixture"))))
+
.and(ElementMatchers.not(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.core.builder.fixture"))))
.with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
.with(new LoggingListener())
.type(new AgentJunction(advisorConfigs))
@@ -63,7 +63,7 @@ public final class AgentTransformerTest {
}
private static AdvisorConfiguration createAdvisorConfiguration() {
- AdvisorConfiguration result = new
AdvisorConfiguration("org.apache.shardingsphere.agent.core.transformer.fixture.targeted.TargetObjectFixture");
+ AdvisorConfiguration result = new
AdvisorConfiguration("org.apache.shardingsphere.agent.core.builder.fixture.targeted.TargetObjectFixture");
result.getAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.isConstructor().and(ElementMatchers.takesArguments(1)),
FooAdvice.class.getName()));
result.getAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.isConstructor().and(ElementMatchers.takesArguments(1)),
BarAdvice.class.getName()));
result.getAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("call"),
FooAdvice.class.getName()));
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/BarAdvice.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/BarAdvice.java
similarity index 97%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/BarAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/BarAdvice.java
index 2b6c0bbec73..5242a142299 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/BarAdvice.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/BarAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer.fixture.advice;
+package org.apache.shardingsphere.agent.core.builder.fixture.advice;
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/transformer/fixture/advice/FooAdvice.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/FooAdvice.java
similarity index 97%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/FooAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/FooAdvice.java
index 47205eca964..198ac37fbc1 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/advice/FooAdvice.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/FooAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer.fixture.advice;
+package org.apache.shardingsphere.agent.core.builder.fixture.advice;
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/transformer/fixture/targeted/TargetObjectFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/targeted/TargetObjectFixture.java
similarity index 96%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/targeted/TargetObjectFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/targeted/TargetObjectFixture.java
index 5352d448b2b..5a479069b55 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/fixture/targeted/TargetObjectFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/targeted/TargetObjectFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.transformer.fixture.targeted;
+package org.apache.shardingsphere.agent.core.builder.fixture.targeted;
import java.util.List;
