This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 0e07a3ddea7 Refactor AgentBuilderFactoryTest (#23407)
0e07a3ddea7 is described below
commit 0e07a3ddea74f5f621a3cef39b075719376ecf2c
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 8 21:46:53 2023 +0800
Refactor AgentBuilderFactoryTest (#23407)
* Refactor AgentTransformerTest
* Refactor AgentBuilderFactoryTest
---
.../agent/core/builder/AgentBuilderFactory.java | 4 ++--
...ormerTest.java => AgentBuilderFactoryTest.java} | 24 ++++++++--------------
2 files changed, 10 insertions(+), 18 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 514a8912a8b..a7064f7a11a 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
@@ -43,14 +43,14 @@ public final class AgentBuilderFactory {
* @param pluginJars plugin jars
* @param advisorConfigs advisor configurations
* @param isEnhancedForProxy is enhanced for proxy
- * @return created gent builder
+ * @return created agent builder
*/
public static AgentBuilder create(final Map<String, PluginConfiguration>
pluginConfigs,
final Collection<PluginJar> pluginJars,
final Map<String, AdvisorConfiguration> advisorConfigs, final boolean
isEnhancedForProxy) {
return new AgentBuilder.Default()
.with(new ByteBuddy().with(TypeValidation.ENABLED))
.ignore(ElementMatchers.isSynthetic())
-
.or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent."))
+
.or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.plugin."))
.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/AgentTransformerTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
similarity index 84%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
index 62389cc9ae4..f3f7d4060e2 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactoryTest.java
@@ -17,17 +17,15 @@
package org.apache.shardingsphere.agent.core.builder;
-import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.ByteBuddyAgent;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
-import net.bytebuddy.dynamic.scaffold.TypeValidation;
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.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.agent.core.plugin.advisor.AdvisorConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -41,24 +39,18 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class AgentTransformerTest {
+public final class AgentBuilderFactoryTest {
- private static ResettableClassFileTransformer byteBuddyAgent;
+ private static ResettableClassFileTransformer agent;
@BeforeClass
public static void setup() {
ByteBuddyAgent.install();
AdvisorConfiguration advisorConfig = createAdvisorConfiguration();
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.builder.fixture"))))
- .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
- .with(new AgentLoggingListener())
- .type(new AgentJunction(advisorConfigs))
- .transform(new AgentTransformer(Collections.emptyMap(),
Collections.emptyList(), advisorConfigs, true))
- .asTerminalTransformation()
- .installOnByteBuddyAgent();
+ AgentBuilder agentBuilder =
AgentBuilderFactory.create(Collections.emptyMap(), Collections.emptyList(),
advisorConfigs, true);
+ agent = agentBuilder.installOnByteBuddyAgent();
+
}
private static AdvisorConfiguration createAdvisorConfiguration() {
@@ -78,7 +70,7 @@ public final class AgentTransformerTest {
@AfterClass
public static void destroy() {
- byteBuddyAgent.reset(ByteBuddyAgent.getInstrumentation(),
AgentBuilder.RedefinitionStrategy.RETRANSFORMATION);
+ agent.reset(ByteBuddyAgent.getInstrumentation(),
AgentBuilder.RedefinitionStrategy.RETRANSFORMATION);
}
@Test
