This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 e0dbd9ba0f8 Refactor AgentBuilderFactory (#23410)
e0dbd9ba0f8 is described below
commit e0dbd9ba0f8872002466a016a9cc966c14b0b825
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 8 22:39:16 2023 +0800
Refactor AgentBuilderFactory (#23410)
* Refactor AgentBuilderFactory
* Refactor AgentBuilderFactory
---
.../shardingsphere/agent/core/builder/AgentBuilderFactory.java | 2 +-
.../agent/core/builder/AgentBuilderFactoryTest.java | 9 ++++-----
.../{agent/core/builder => }/fixture/advice/BarAdvice.java | 2 +-
.../{agent/core/builder => }/fixture/advice/FooAdvice.java | 2 +-
.../core/builder => }/fixture/targeted/TargetObjectFixture.java | 2 +-
5 files changed, 8 insertions(+), 9 deletions(-)
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 a7064f7a11a..4a0474c273c 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
@@ -50,7 +50,7 @@ public final class AgentBuilderFactory {
return new AgentBuilder.Default()
.with(new ByteBuddy().with(TypeValidation.ENABLED))
.ignore(ElementMatchers.isSynthetic())
-
.or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.plugin."))
+
.or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent."))
.type(new AgentJunction(advisorConfigs))
.transform(new AgentTransformer(pluginConfigs, pluginJars,
advisorConfigs, isEnhancedForProxy))
.with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
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 f3f7d4060e2..5c20f4659e3 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
@@ -21,9 +21,9 @@ import net.bytebuddy.agent.ByteBuddyAgent;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
import net.bytebuddy.matcher.ElementMatchers;
-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.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.junit.AfterClass;
@@ -50,11 +50,10 @@ public final class AgentBuilderFactoryTest {
Map<String, AdvisorConfiguration> advisorConfigs =
Collections.singletonMap(advisorConfig.getTargetClassName(), advisorConfig);
AgentBuilder agentBuilder =
AgentBuilderFactory.create(Collections.emptyMap(), Collections.emptyList(),
advisorConfigs, true);
agent = agentBuilder.installOnByteBuddyAgent();
-
}
private static AdvisorConfiguration createAdvisorConfiguration() {
- AdvisorConfiguration result = new
AdvisorConfiguration("org.apache.shardingsphere.agent.core.builder.fixture.targeted.TargetObjectFixture");
+ AdvisorConfiguration result = new
AdvisorConfiguration("org.apache.shardingsphere.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/builder/fixture/advice/BarAdvice.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/BarAdvice.java
similarity index 97%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/BarAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/BarAdvice.java
index 5242a142299..bd74dc37427 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/BarAdvice.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/BarAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.builder.fixture.advice;
+package org.apache.shardingsphere.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/builder/fixture/advice/FooAdvice.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/FooAdvice.java
similarity index 97%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/FooAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/FooAdvice.java
index 198ac37fbc1..f29271a872a 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/advice/FooAdvice.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/advice/FooAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.builder.fixture.advice;
+package org.apache.shardingsphere.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/builder/fixture/targeted/TargetObjectFixture.java
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/targeted/TargetObjectFixture.java
similarity index 96%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/targeted/TargetObjectFixture.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/fixture/targeted/TargetObjectFixture.java
index 5a479069b55..9d3182f1499 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/fixture/targeted/TargetObjectFixture.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/fixture/targeted/TargetObjectFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.builder.fixture.targeted;
+package org.apache.shardingsphere.fixture.targeted;
import java.util.List;
