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/11 05:55:42 UTC
[shardingsphere] branch master updated: Rename StaticMethodAroundAdvice (#22797)
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 8e0568dedbc Rename StaticMethodAroundAdvice (#22797)
8e0568dedbc is described below
commit 8e0568dedbcacbcc12735c17ae02f2ec7f68f6b0
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 11 13:55:32 2022 +0800
Rename StaticMethodAroundAdvice (#22797)
---
...ndAdvice.java => StaticMethodAroundAdvice.java} | 2 +-
.../agent/api/point/PluginInterceptorPoint.java | 2 +-
.../transformer/ShardingSphereTransformer.java | 68 +++++++++++-----------
...e.java => ComposeStaticMethodAroundAdvice.java} | 6 +-
...tor.java => StaticMethodAroundInterceptor.java} | 16 ++---
...va => StaticMethodInterceptorArgsOverride.java} | 16 ++---
...or.java => ComposedConstructorInterceptor.java} | 7 ++-
...> ComposedInstanceMethodAroundInterceptor.java} | 7 ++-
...osedInstanceMethodInterceptorArgsOverride.java} | 6 +-
... => ComposedStaticMethodAroundInterceptor.java} | 15 +++--
...mposedStaticMethodInterceptorArgsOverride.java} | 15 +++--
.../transformer/ShardingSphereTransformerTest.java | 8 +--
...va => ComposeStaticMethodAroundAdviceTest.java} | 16 ++---
...vice.java => MockStaticMethodAroundAdvice.java} | 6 +-
...java => StaticMethodAroundInterceptorTest.java} | 8 +--
.../core/plugin/loader/AgentPluginLoaderTest.java | 8 +--
.../base/advice/MetaDataContextsFactoryAdvice.java | 4 +-
.../BaseLoggingPluginDefinitionService.java | 4 +-
.../PrometheusPluginDefinitionService.java | 2 +-
19 files changed, 114 insertions(+), 102 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/ClassStaticMethodAroundAdvice.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/StaticMethodAroundAdvice.java
similarity index 98%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/ClassStaticMethodAroundAdvice.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/StaticMethodAroundAdvice.java
index 21908a0d44c..e1b7fb38ca9 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/ClassStaticMethodAroundAdvice.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/StaticMethodAroundAdvice.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
/**
* Weaving the advice around the static methods of target class.
*/
-public interface ClassStaticMethodAroundAdvice {
+public interface StaticMethodAroundAdvice {
/**
* Check if disable the check process when interceptor are trying to call the advice. Then the advice will be called by skipping checks.
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
index 92ea0a968a6..2c961582216 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
@@ -109,7 +109,7 @@ public final class PluginInterceptorPoint {
* @param matcher constraints
* @return static method point builder
*/
- public StaticMethodPointBuilder aroundClassStaticMethod(final ElementMatcher<? super MethodDescription> matcher) {
+ public StaticMethodPointBuilder aroundStaticMethod(final ElementMatcher<? super MethodDescription> matcher) {
return new StaticMethodPointBuilder(this, matcher);
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
index 0f585294971..8ded1e42087 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
@@ -31,7 +31,7 @@ import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.utility.JavaModule;
import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.advice.ConstructorAdvice;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.advice.OverrideArgsInvoker;
@@ -41,16 +41,16 @@ import org.apache.shardingsphere.agent.api.point.InstanceMethodInterceptorPoint;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginLoader;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.ClassStaticMethodAroundInterceptor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.ClassStaticMethodInterceptorArgsOverride;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.StaticMethodAroundInterceptor;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.StaticMethodInterceptorArgsOverride;
import org.apache.shardingsphere.agent.core.plugin.interceptor.ConstructorInterceptor;
import org.apache.shardingsphere.agent.core.plugin.interceptor.InstanceMethodAroundInterceptor;
import org.apache.shardingsphere.agent.core.plugin.interceptor.InstanceMethodInterceptorArgsOverride;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposeClassStaticMethodAroundInterceptor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposeClassStaticMethodInterceptorArgsOverride;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposeConstructorInterceptor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposeInstanceMethodAroundInterceptor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposeInstanceMethodInterceptorArgsOverride;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposedStaticMethodAroundInterceptor;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposedStaticMethodInterceptorArgsOverride;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposedConstructorInterceptor;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposedInstanceMethodAroundInterceptor;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.compose.ComposedInstanceMethodInterceptorArgsOverride;
import java.util.Collection;
import java.util.LinkedList;
@@ -77,14 +77,14 @@ public final class ShardingSphereTransformer implements Transformer {
}
Builder<?> result = builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE).implement(AdviceTargetObject.class).intercept(FieldAccessor.ofField(EXTRA_DATA));
PluginInterceptorPoint pluginInterceptorPoint = pluginLoader.loadPluginInterceptorPoint(typeDescription);
- result = interceptorConstructorPoint(typeDescription, pluginInterceptorPoint.getConstructorInterceptorPoints(), result, classLoader);
- result = interceptorClassStaticMethodPoint(typeDescription, pluginInterceptorPoint.getStaticMethodInterceptorPoints(), result, classLoader);
- result = interceptorInstanceMethodPoint(typeDescription, pluginInterceptorPoint.getInstanceMethodInterceptorPoints(), result, classLoader);
+ result = interceptConstructor(typeDescription, pluginInterceptorPoint.getConstructorInterceptorPoints(), result, classLoader);
+ result = interceptStaticMethod(typeDescription, pluginInterceptorPoint.getStaticMethodInterceptorPoints(), result, classLoader);
+ result = interceptInstanceMethod(typeDescription, pluginInterceptorPoint.getInstanceMethodInterceptorPoints(), result, classLoader);
return result;
}
- private Builder<?> interceptorConstructorPoint(final TypeDescription description,
- final Collection<ConstructorInterceptorPoint> constructorInterceptorPoints, final Builder<?> builder, final ClassLoader classLoader) {
+ private Builder<?> interceptConstructor(final TypeDescription description,
+ final Collection<ConstructorInterceptorPoint> constructorInterceptorPoints, final Builder<?> builder, final ClassLoader classLoader) {
Collection<ShardingSphereTransformationPoint<? extends ConstructorInterceptor>> constructorAdviceComposePoints = description.getDeclaredMethods().stream()
.filter(MethodDescription::isConstructor)
.map(each -> getMatchedTransformationPoint(constructorInterceptorPoints, each, classLoader))
@@ -119,20 +119,20 @@ public final class ShardingSphereTransformer implements Transformer {
.map(ConstructorInterceptorPoint::getAdvice)
.map(each -> (ConstructorAdvice) pluginLoader.getOrCreateInstance(each, classLoader))
.collect(Collectors.toList());
- return new ShardingSphereTransformationPoint<>(methodDescription, new ComposeConstructorInterceptor(constructorAdvices));
+ return new ShardingSphereTransformationPoint<>(methodDescription, new ComposedConstructorInterceptor(constructorAdvices));
}
- private Builder<?> interceptorClassStaticMethodPoint(final TypeDescription description, final Collection<StaticMethodInterceptorPoint> staticMethodInterceptorPoints,
- final Builder<?> builder, final ClassLoader classLoader) {
- Collection<ShardingSphereTransformationPoint<?>> classStaticMethodAdvicePoints = description.getDeclaredMethods().stream()
+ private Builder<?> interceptStaticMethod(final TypeDescription description, final Collection<StaticMethodInterceptorPoint> staticMethodInterceptorPoints,
+ final Builder<?> builder, final ClassLoader classLoader) {
+ Collection<ShardingSphereTransformationPoint<?>> staticMethodAdvicePoints = description.getDeclaredMethods().stream()
.filter(each -> each.isStatic() && !(each.isAbstract() || each.isSynthetic()))
.map(each -> getMatchedStaticMethodPoint(staticMethodInterceptorPoints, each, classLoader))
.filter(Objects::nonNull)
.collect(Collectors.toList());
Builder<?> result = builder;
- for (ShardingSphereTransformationPoint<?> each : classStaticMethodAdvicePoints) {
+ for (ShardingSphereTransformationPoint<?> each : staticMethodAdvicePoints) {
try {
- if (each.getInterceptor() instanceof ClassStaticMethodInterceptorArgsOverride || each.getInterceptor() instanceof ComposeClassStaticMethodInterceptorArgsOverride) {
+ if (each.getInterceptor() instanceof StaticMethodInterceptorArgsOverride || each.getInterceptor() instanceof ComposedStaticMethodInterceptorArgsOverride) {
result = result.method(ElementMatchers.is(each.getDescription()))
.intercept(MethodDelegation.withDefaultConfiguration().withBinders(Morph.Binder.install(OverrideArgsInvoker.class)).to(each.getInterceptor()));
} else {
@@ -157,35 +157,35 @@ public final class ShardingSphereTransformer implements Transformer {
if (1 == staticMethodInterceptorPoints.size()) {
return getSingleStaticMethodPoint(methodDescription, staticMethodInterceptorPoints.get(0), classLoader);
}
- return getComposeStaticMethodPoint(methodDescription, staticMethodInterceptorPoints, classLoader);
+ return getComposedStaticMethodPoint(methodDescription, staticMethodInterceptorPoints, classLoader);
}
private ShardingSphereTransformationPoint<?> getSingleStaticMethodPoint(final InDefinedShape methodDescription,
final StaticMethodInterceptorPoint staticMethodInterceptorPoint, final ClassLoader classLoader) {
- ClassStaticMethodAroundAdvice staticMethodAroundAdvice = pluginLoader.getOrCreateInstance(staticMethodInterceptorPoint.getAdvice(), classLoader);
+ StaticMethodAroundAdvice staticMethodAroundAdvice = pluginLoader.getOrCreateInstance(staticMethodInterceptorPoint.getAdvice(), classLoader);
return staticMethodInterceptorPoint.isOverrideArgs()
- ? new ShardingSphereTransformationPoint<>(methodDescription, new ClassStaticMethodInterceptorArgsOverride(staticMethodAroundAdvice))
- : new ShardingSphereTransformationPoint<>(methodDescription, new ClassStaticMethodAroundInterceptor(staticMethodAroundAdvice));
+ ? new ShardingSphereTransformationPoint<>(methodDescription, new StaticMethodInterceptorArgsOverride(staticMethodAroundAdvice))
+ : new ShardingSphereTransformationPoint<>(methodDescription, new StaticMethodAroundInterceptor(staticMethodAroundAdvice));
}
- private ShardingSphereTransformationPoint<?> getComposeStaticMethodPoint(final InDefinedShape methodDescription,
- final Collection<StaticMethodInterceptorPoint> staticMethodInterceptorPoints, final ClassLoader classLoader) {
- Collection<ClassStaticMethodAroundAdvice> classStaticMethodAroundAdvices = new LinkedList<>();
+ private ShardingSphereTransformationPoint<?> getComposedStaticMethodPoint(final InDefinedShape methodDescription,
+ final Collection<StaticMethodInterceptorPoint> staticMethodInterceptorPoints, final ClassLoader classLoader) {
+ Collection<StaticMethodAroundAdvice> staticMethodAroundAdvices = new LinkedList<>();
boolean isArgsOverride = false;
for (StaticMethodInterceptorPoint each : staticMethodInterceptorPoints) {
if (each.isOverrideArgs()) {
isArgsOverride = true;
}
if (null != each.getAdvice()) {
- classStaticMethodAroundAdvices.add(pluginLoader.getOrCreateInstance(each.getAdvice(), classLoader));
+ staticMethodAroundAdvices.add(pluginLoader.getOrCreateInstance(each.getAdvice(), classLoader));
}
}
- return isArgsOverride ? new ShardingSphereTransformationPoint<>(methodDescription, new ComposeClassStaticMethodInterceptorArgsOverride(classStaticMethodAroundAdvices))
- : new ShardingSphereTransformationPoint<>(methodDescription, new ComposeClassStaticMethodAroundInterceptor(classStaticMethodAroundAdvices));
+ return isArgsOverride ? new ShardingSphereTransformationPoint<>(methodDescription, new ComposedStaticMethodInterceptorArgsOverride(staticMethodAroundAdvices))
+ : new ShardingSphereTransformationPoint<>(methodDescription, new ComposedStaticMethodAroundInterceptor(staticMethodAroundAdvices));
}
- private Builder<?> interceptorInstanceMethodPoint(final TypeDescription description, final Collection<InstanceMethodInterceptorPoint> instanceMethodInterceptorPoints,
- final Builder<?> builder, final ClassLoader classLoader) {
+ private Builder<?> interceptInstanceMethod(final TypeDescription description, final Collection<InstanceMethodInterceptorPoint> instanceMethodInterceptorPoints,
+ final Builder<?> builder, final ClassLoader classLoader) {
Collection<ShardingSphereTransformationPoint<?>> instanceMethodAdviceComposePoints = description.getDeclaredMethods().stream()
.filter(each -> !(each.isAbstract() || each.isSynthetic()))
.map(each -> getMatchedInstanceMethodPoint(instanceMethodInterceptorPoints, each, classLoader))
@@ -194,7 +194,7 @@ public final class ShardingSphereTransformer implements Transformer {
Builder<?> result = builder;
for (ShardingSphereTransformationPoint<?> each : instanceMethodAdviceComposePoints) {
try {
- if (each.getInterceptor() instanceof InstanceMethodInterceptorArgsOverride || each.getInterceptor() instanceof ComposeInstanceMethodInterceptorArgsOverride) {
+ if (each.getInterceptor() instanceof InstanceMethodInterceptorArgsOverride || each.getInterceptor() instanceof ComposedInstanceMethodInterceptorArgsOverride) {
result = result.method(ElementMatchers.is(each.getDescription()))
.intercept(MethodDelegation.withDefaultConfiguration().withBinders(Morph.Binder.install(OverrideArgsInvoker.class)).to(each.getInterceptor()));
} else {
@@ -244,7 +244,7 @@ public final class ShardingSphereTransformer implements Transformer {
}
}
return isArgsOverride
- ? new ShardingSphereTransformationPoint<>(methodDescription, new ComposeInstanceMethodInterceptorArgsOverride(instanceMethodAroundAdvices))
- : new ShardingSphereTransformationPoint<>(methodDescription, new ComposeInstanceMethodAroundInterceptor(instanceMethodAroundAdvices));
+ ? new ShardingSphereTransformationPoint<>(methodDescription, new ComposedInstanceMethodInterceptorArgsOverride(instanceMethodAroundAdvices))
+ : new ShardingSphereTransformationPoint<>(methodDescription, new ComposedInstanceMethodAroundInterceptor(instanceMethodAroundAdvices));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeClassStaticMethodAroundAdvice.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdvice.java
similarity index 88%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeClassStaticMethodAroundAdvice.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdvice.java
index 6057cbb0761..4392b758a95 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeClassStaticMethodAroundAdvice.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdvice.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import java.lang.reflect.Method;
@@ -28,9 +28,9 @@ import java.util.Collection;
* Compose class static method around advice.
*/
@RequiredArgsConstructor
-public final class ComposeClassStaticMethodAroundAdvice implements ClassStaticMethodAroundAdvice {
+public final class ComposeStaticMethodAroundAdvice implements StaticMethodAroundAdvice {
- private final Collection<ClassStaticMethodAroundAdvice> advices;
+ private final Collection<StaticMethodAroundAdvice> advices;
@Override
public void beforeMethod(final Class<?> clazz, final Method method, final Object[] args, final MethodInvocationResult result) {
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
similarity index 84%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
index cd417ad0dd1..c31e0024b5a 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
@@ -23,7 +23,7 @@ import net.bytebuddy.implementation.bind.annotation.AllArguments;
import net.bytebuddy.implementation.bind.annotation.Origin;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.SuperCall;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
@@ -35,11 +35,11 @@ import java.util.concurrent.Callable;
* Proxy class for ByteBuddy to intercept methods of target and weave pre- and post-method around the target method.
*/
@RequiredArgsConstructor
-public class ClassStaticMethodAroundInterceptor {
+public class StaticMethodAroundInterceptor {
- private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(ClassStaticMethodAroundInterceptor.class);
+ private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(StaticMethodAroundInterceptor.class);
- private final ClassStaticMethodAroundAdvice classStaticMethodAroundAdvice;
+ private final StaticMethodAroundAdvice staticMethodAroundAdvice;
/**
* Only intercept static method.
@@ -55,10 +55,10 @@ public class ClassStaticMethodAroundInterceptor {
public Object intercept(@Origin final Class<?> klass, @Origin final Method method, @AllArguments final Object[] args, @SuperCall final Callable<?> callable) {
MethodInvocationResult methodResult = new MethodInvocationResult();
Object result;
- boolean adviceEnabled = classStaticMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
+ boolean adviceEnabled = staticMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- classStaticMethodAroundAdvice.beforeMethod(klass, method, args, methodResult);
+ staticMethodAroundAdvice.beforeMethod(klass, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
@@ -77,7 +77,7 @@ public class ClassStaticMethodAroundInterceptor {
// CHECKSTYLE:ON
try {
if (adviceEnabled) {
- classStaticMethodAroundAdvice.onThrowing(klass, method, args, ex);
+ staticMethodAroundAdvice.onThrowing(klass, method, args, ex);
}
// CHECKSTYLE:OFF
} catch (final Throwable ignored) {
@@ -88,7 +88,7 @@ public class ClassStaticMethodAroundInterceptor {
} finally {
try {
if (adviceEnabled) {
- classStaticMethodAroundAdvice.afterMethod(klass, method, args, methodResult);
+ staticMethodAroundAdvice.afterMethod(klass, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodInterceptorArgsOverride.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodInterceptorArgsOverride.java
similarity index 84%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodInterceptorArgsOverride.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodInterceptorArgsOverride.java
index 8209e70e7eb..331406f240a 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodInterceptorArgsOverride.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodInterceptorArgsOverride.java
@@ -22,7 +22,7 @@ import net.bytebuddy.implementation.bind.annotation.AllArguments;
import net.bytebuddy.implementation.bind.annotation.Morph;
import net.bytebuddy.implementation.bind.annotation.Origin;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.advice.OverrideArgsInvoker;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
@@ -34,11 +34,11 @@ import java.lang.reflect.Method;
* Proxy class for ByteBuddy to intercept methods of target and weave pre- and post-method around the target method with args override.
*/
@RequiredArgsConstructor
-public class ClassStaticMethodInterceptorArgsOverride {
+public class StaticMethodInterceptorArgsOverride {
- private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(ClassStaticMethodInterceptorArgsOverride.class);
+ private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(StaticMethodInterceptorArgsOverride.class);
- private final ClassStaticMethodAroundAdvice classStaticMethodAroundAdvice;
+ private final StaticMethodAroundAdvice staticMethodAroundAdvice;
/**
* Only intercept static method.
@@ -53,10 +53,10 @@ public class ClassStaticMethodInterceptorArgsOverride {
public Object intercept(@Origin final Class<?> klass, @Origin final Method method, @AllArguments final Object[] args, @Morph final OverrideArgsInvoker callable) {
MethodInvocationResult methodResult = new MethodInvocationResult();
Object result;
- boolean adviceEnabled = classStaticMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
+ boolean adviceEnabled = staticMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- classStaticMethodAroundAdvice.beforeMethod(klass, method, args, methodResult);
+ staticMethodAroundAdvice.beforeMethod(klass, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
@@ -75,7 +75,7 @@ public class ClassStaticMethodInterceptorArgsOverride {
// CHECKSTYLE:ON
try {
if (adviceEnabled) {
- classStaticMethodAroundAdvice.onThrowing(klass, method, args, ex);
+ staticMethodAroundAdvice.onThrowing(klass, method, args, ex);
}
// CHECKSTYLE:OFF
} catch (final Throwable ignored) {
@@ -86,7 +86,7 @@ public class ClassStaticMethodInterceptorArgsOverride {
} finally {
try {
if (adviceEnabled) {
- classStaticMethodAroundAdvice.afterMethod(klass, method, args, methodResult);
+ staticMethodAroundAdvice.afterMethod(klass, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeConstructorInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedConstructorInterceptor.java
similarity index 84%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeConstructorInterceptor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedConstructorInterceptor.java
index 9ecfdf58644..f80acd8c55f 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeConstructorInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedConstructorInterceptor.java
@@ -23,9 +23,12 @@ import org.apache.shardingsphere.agent.core.plugin.interceptor.ConstructorInterc
import java.util.Collection;
-public final class ComposeConstructorInterceptor extends ConstructorInterceptor {
+/**
+ * Composed constructor interceptor.
+ */
+public final class ComposedConstructorInterceptor extends ConstructorInterceptor {
- public ComposeConstructorInterceptor(final Collection<ConstructorAdvice> constructorAdvices) {
+ public ComposedConstructorInterceptor(final Collection<ConstructorAdvice> constructorAdvices) {
super(new ComposeConstructorAdvice(constructorAdvices));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeInstanceMethodAroundInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedInstanceMethodAroundInterceptor.java
similarity index 81%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeInstanceMethodAroundInterceptor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedInstanceMethodAroundInterceptor.java
index fdd730d1d14..b49a0328825 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeInstanceMethodAroundInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedInstanceMethodAroundInterceptor.java
@@ -23,9 +23,12 @@ import org.apache.shardingsphere.agent.core.plugin.interceptor.InstanceMethodAro
import java.util.Collection;
-public final class ComposeInstanceMethodAroundInterceptor extends InstanceMethodAroundInterceptor {
+/**
+ * Composed instance method around interceptor.
+ */
+public final class ComposedInstanceMethodAroundInterceptor extends InstanceMethodAroundInterceptor {
- public ComposeInstanceMethodAroundInterceptor(final Collection<InstanceMethodAroundAdvice> instanceMethodAroundAdvices) {
+ public ComposedInstanceMethodAroundInterceptor(final Collection<InstanceMethodAroundAdvice> instanceMethodAroundAdvices) {
super(new ComposeInstanceMethodAroundAdvice(instanceMethodAroundAdvices));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeInstanceMethodInterceptorArgsOverride.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedInstanceMethodInterceptorArgsOverride.java
similarity index 81%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeInstanceMethodInterceptorArgsOverride.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedInstanceMethodInterceptorArgsOverride.java
index 2fa50f24147..c0667f55221 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeInstanceMethodInterceptorArgsOverride.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedInstanceMethodInterceptorArgsOverride.java
@@ -24,11 +24,11 @@ import org.apache.shardingsphere.agent.core.plugin.interceptor.InstanceMethodInt
import java.util.Collection;
/**
- * Compose instance method interceptor args override.
+ * Composed instance method interceptor args override.
*/
-public class ComposeInstanceMethodInterceptorArgsOverride extends InstanceMethodInterceptorArgsOverride {
+public class ComposedInstanceMethodInterceptorArgsOverride extends InstanceMethodInterceptorArgsOverride {
- public ComposeInstanceMethodInterceptorArgsOverride(final Collection<InstanceMethodAroundAdvice> instanceMethodAroundAdvices) {
+ public ComposedInstanceMethodInterceptorArgsOverride(final Collection<InstanceMethodAroundAdvice> instanceMethodAroundAdvices) {
super(new ComposeInstanceMethodAroundAdvice(instanceMethodAroundAdvices));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeClassStaticMethodAroundInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedStaticMethodAroundInterceptor.java
similarity index 63%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeClassStaticMethodAroundInterceptor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedStaticMethodAroundInterceptor.java
index b85eb0fa090..02f484cf76a 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeClassStaticMethodAroundInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedStaticMethodAroundInterceptor.java
@@ -17,15 +17,18 @@
package org.apache.shardingsphere.agent.core.plugin.interceptor.compose;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice.ComposeClassStaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.ClassStaticMethodAroundInterceptor;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice.ComposeStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.StaticMethodAroundInterceptor;
import java.util.Collection;
-public final class ComposeClassStaticMethodAroundInterceptor extends ClassStaticMethodAroundInterceptor {
+/**
+ * Composed static method around interceptor.
+ */
+public final class ComposedStaticMethodAroundInterceptor extends StaticMethodAroundInterceptor {
- public ComposeClassStaticMethodAroundInterceptor(final Collection<ClassStaticMethodAroundAdvice> instanceMethodAroundAdvices) {
- super(new ComposeClassStaticMethodAroundAdvice(instanceMethodAroundAdvices));
+ public ComposedStaticMethodAroundInterceptor(final Collection<StaticMethodAroundAdvice> instanceMethodAroundAdvices) {
+ super(new ComposeStaticMethodAroundAdvice(instanceMethodAroundAdvices));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeClassStaticMethodInterceptorArgsOverride.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedStaticMethodInterceptorArgsOverride.java
similarity index 62%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeClassStaticMethodInterceptorArgsOverride.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedStaticMethodInterceptorArgsOverride.java
index c5ec8339c7d..a6f52b39b69 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposeClassStaticMethodInterceptorArgsOverride.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/compose/ComposedStaticMethodInterceptorArgsOverride.java
@@ -17,15 +17,18 @@
package org.apache.shardingsphere.agent.core.plugin.interceptor.compose;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice.ComposeClassStaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.ClassStaticMethodInterceptorArgsOverride;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice.ComposeStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.core.plugin.interceptor.StaticMethodInterceptorArgsOverride;
import java.util.Collection;
-public final class ComposeClassStaticMethodInterceptorArgsOverride extends ClassStaticMethodInterceptorArgsOverride {
+/**
+ * Composed static method interceptor args override.
+ */
+public final class ComposedStaticMethodInterceptorArgsOverride extends StaticMethodInterceptorArgsOverride {
- public ComposeClassStaticMethodInterceptorArgsOverride(final Collection<ClassStaticMethodAroundAdvice> instanceMethodAroundAdvices) {
- super(new ComposeClassStaticMethodAroundAdvice(instanceMethodAroundAdvices));
+ public ComposedStaticMethodInterceptorArgsOverride(final Collection<StaticMethodAroundAdvice> instanceMethodAroundAdvices) {
+ super(new ComposeStaticMethodAroundAdvice(instanceMethodAroundAdvices));
}
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
index 955759180b9..25cfdc01ee2 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
@@ -25,7 +25,7 @@ import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.core.bytebuddy.listener.LoggingListener;
-import org.apache.shardingsphere.agent.core.mock.advice.MockClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundRepeatedAdvice;
@@ -71,14 +71,14 @@ public final class ShardingSphereTransformerTest {
Map<String, Object> objectPool = (Map<String, Object>) objectPoolReader.read();
objectPool.put(MockConstructorAdvice.class.getTypeName(), new MockConstructorAdvice());
objectPool.put(MockInstanceMethodAroundAdvice.class.getTypeName(), new MockInstanceMethodAroundAdvice());
- objectPool.put(MockClassStaticMethodAroundAdvice.class.getTypeName(), new MockClassStaticMethodAroundAdvice());
+ objectPool.put(MockStaticMethodAroundAdvice.class.getTypeName(), new MockStaticMethodAroundAdvice());
Map<String, PluginInterceptorPoint> interceptorPointMap = new HashMap<>(2, 1);
PluginInterceptorPoint interceptorPoint = PluginInterceptorPoint.intercept("org.apache.shardingsphere.agent.core.mock.material.Material")
.aroundInstanceMethod(ElementMatchers.named("mock"))
.implement(MockInstanceMethodAroundAdvice.class.getTypeName())
.build()
- .aroundClassStaticMethod(ElementMatchers.named("staticMock"))
- .implement(MockClassStaticMethodAroundAdvice.class.getTypeName())
+ .aroundStaticMethod(ElementMatchers.named("staticMock"))
+ .implement(MockStaticMethodAroundAdvice.class.getTypeName())
.build()
.onConstructor(ElementMatchers.takesArguments(1))
.implement(MockConstructorAdvice.class.getTypeName())
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeClassStaticMethodAroundAdviceTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdviceTest.java
similarity index 76%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeClassStaticMethodAroundAdviceTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdviceTest.java
index 24bc3c1c795..c121e1ad7c3 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeClassStaticMethodAroundAdviceTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import org.junit.Before;
import org.junit.Test;
@@ -33,16 +33,16 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
-public final class ComposeClassStaticMethodAroundAdviceTest {
+public final class ComposeStaticMethodAroundAdviceTest {
@Mock
- private ClassStaticMethodAroundAdvice classStaticMethodAroundAdvice;
+ private StaticMethodAroundAdvice staticMethodAroundAdvice;
- private ComposeClassStaticMethodAroundAdvice actual;
+ private ComposeStaticMethodAroundAdvice actual;
@Before
public void setUp() {
- actual = new ComposeClassStaticMethodAroundAdvice(new ArrayList<>(Collections.singleton(classStaticMethodAroundAdvice)));
+ actual = new ComposeStaticMethodAroundAdvice(new ArrayList<>(Collections.singleton(staticMethodAroundAdvice)));
}
@Test
@@ -51,7 +51,7 @@ public final class ComposeClassStaticMethodAroundAdviceTest {
Object[] args = new Object[2];
MethodInvocationResult methodInvocationResult = mock(MethodInvocationResult.class);
actual.beforeMethod(String.class, method, args, methodInvocationResult);
- verify(classStaticMethodAroundAdvice).beforeMethod(String.class, method, args, methodInvocationResult);
+ verify(staticMethodAroundAdvice).beforeMethod(String.class, method, args, methodInvocationResult);
}
@Test
@@ -60,7 +60,7 @@ public final class ComposeClassStaticMethodAroundAdviceTest {
Object[] args = new Object[2];
MethodInvocationResult methodInvocationResult = mock(MethodInvocationResult.class);
actual.afterMethod(String.class, method, args, methodInvocationResult);
- verify(classStaticMethodAroundAdvice).afterMethod(String.class, method, args, methodInvocationResult);
+ verify(staticMethodAroundAdvice).afterMethod(String.class, method, args, methodInvocationResult);
}
@Test
@@ -69,6 +69,6 @@ public final class ComposeClassStaticMethodAroundAdviceTest {
Object[] args = new Object[2];
NullPointerException exception = new NullPointerException("");
actual.onThrowing(String.class, method, args, exception);
- verify(classStaticMethodAroundAdvice).onThrowing(String.class, method, args, exception);
+ verify(staticMethodAroundAdvice).onThrowing(String.class, method, args, exception);
}
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockClassStaticMethodAroundAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java
similarity index 89%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockClassStaticMethodAroundAdvice.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java
index 432af35a98b..d62866e87e6 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockClassStaticMethodAroundAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import java.lang.reflect.Method;
@@ -26,11 +26,11 @@ import java.util.List;
@RequiredArgsConstructor
@SuppressWarnings("unchecked")
-public final class MockClassStaticMethodAroundAdvice implements ClassStaticMethodAroundAdvice {
+public final class MockStaticMethodAroundAdvice implements StaticMethodAroundAdvice {
private final boolean rebase;
- public MockClassStaticMethodAroundAdvice() {
+ public MockStaticMethodAroundAdvice() {
this(false);
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptorTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptorTest.java
similarity index 92%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptorTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptorTest.java
index 678cb0ddb48..23fd3c47bbb 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptorTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptorTest.java
@@ -28,7 +28,7 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
-import org.apache.shardingsphere.agent.core.mock.advice.MockClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.material.StaticMaterial;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -49,7 +49,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class ClassStaticMethodAroundInterceptorTest {
+public final class StaticMethodAroundInterceptorTest {
private static final String EXTRA_DATA = "_$EXTRA_DATA$_";
@@ -82,9 +82,9 @@ public final class ClassStaticMethodAroundInterceptorTest {
.implement(AdviceTargetObject.class)
.intercept(FieldAccessor.ofField(EXTRA_DATA))
.method(ElementMatchers.named("staticMockWithException"))
- .intercept(MethodDelegation.withDefaultConfiguration().to(new ClassStaticMethodAroundInterceptor(new MockClassStaticMethodAroundAdvice(false))))
+ .intercept(MethodDelegation.withDefaultConfiguration().to(new StaticMethodAroundInterceptor(new MockStaticMethodAroundAdvice(false))))
.method(ElementMatchers.named("staticMock"))
- .intercept(MethodDelegation.withDefaultConfiguration().to(new ClassStaticMethodAroundInterceptor(new MockClassStaticMethodAroundAdvice(true))));
+ .intercept(MethodDelegation.withDefaultConfiguration().to(new StaticMethodAroundInterceptor(new MockStaticMethodAroundAdvice(true))));
}
return builder;
})
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
index 0b389f13303..1ae8a1165f4 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
@@ -21,7 +21,7 @@ import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.pool.TypePool;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
-import org.apache.shardingsphere.agent.core.mock.advice.MockClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.plugin.AdviceInstanceLoader;
@@ -60,13 +60,13 @@ public final class AgentPluginLoaderTest {
Map<String, Object> objectPool = (Map<String, Object>) objectPoolReader.read();
objectPool.put(MockConstructorAdvice.class.getTypeName(), new MockConstructorAdvice());
objectPool.put(MockInstanceMethodAroundAdvice.class.getTypeName(), new MockInstanceMethodAroundAdvice());
- objectPool.put(MockClassStaticMethodAroundAdvice.class.getTypeName(), new MockClassStaticMethodAroundAdvice());
+ objectPool.put(MockStaticMethodAroundAdvice.class.getTypeName(), new MockStaticMethodAroundAdvice());
PluginInterceptorPoint interceptorPoint = PluginInterceptorPoint.intercept("org.apache.shardingsphere.agent.core.mock.material.Material")
.aroundInstanceMethod(ElementMatchers.named("mock"))
.implement(MockInstanceMethodAroundAdvice.class.getTypeName())
.build()
- .aroundClassStaticMethod(ElementMatchers.named("staticMock"))
- .implement(MockClassStaticMethodAroundAdvice.class.getTypeName())
+ .aroundStaticMethod(ElementMatchers.named("staticMock"))
+ .implement(MockStaticMethodAroundAdvice.class.getTypeName())
.build()
.onConstructor(ElementMatchers.takesArguments(1))
.implement(MockConstructorAdvice.class.getTypeName())
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
index 3b865716008..e5937700575 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.logging.base.advice;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.logging.base.threadlocal.ElapsedTimeThreadLocal;
@@ -28,7 +28,7 @@ import java.lang.reflect.Method;
* Schema meta data loader advice.
*/
@Slf4j
-public final class MetaDataContextsFactoryAdvice implements ClassStaticMethodAroundAdvice {
+public final class MetaDataContextsFactoryAdvice implements StaticMethodAroundAdvice {
@Override
public void beforeMethod(final Class<?> clazz, final Method method, final Object[] args, final MethodInvocationResult result) {
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
index ff7ee25839f..0563e9647c6 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
@@ -35,7 +35,7 @@ public final class BaseLoggingPluginDefinitionService extends AbstractPluginDefi
@Override
protected void defineProxyInterceptors() {
defineInterceptor(SCHEMA_METADATA_LOADER_CLASS)
- .aroundClassStaticMethod(ElementMatchers.named(SCHEMA_METADATA_LOADER_METHOD_NAME).and(ElementMatchers.takesArguments(4)))
+ .aroundStaticMethod(ElementMatchers.named(SCHEMA_METADATA_LOADER_METHOD_NAME).and(ElementMatchers.takesArguments(4)))
.implement(SCHEMA_METADATA_LOADER_ADVICE_CLASS)
.build();
}
@@ -43,7 +43,7 @@ public final class BaseLoggingPluginDefinitionService extends AbstractPluginDefi
@Override
protected void defineJdbcInterceptors() {
defineInterceptor(SCHEMA_METADATA_LOADER_CLASS)
- .aroundClassStaticMethod(ElementMatchers.named(SCHEMA_METADATA_LOADER_METHOD_NAME).and(ElementMatchers.takesArguments(4)))
+ .aroundStaticMethod(ElementMatchers.named(SCHEMA_METADATA_LOADER_METHOD_NAME).and(ElementMatchers.takesArguments(4)))
.implement(SCHEMA_METADATA_LOADER_ADVICE_CLASS)
.build();
}
diff --git a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
index bf4f956bd42..e291dc19383 100644
--- a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
+++ b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
@@ -53,7 +53,7 @@ public final class PrometheusPluginDefinitionService extends AbstractPluginDefin
builder.aroundInstanceMethod(ElementMatchers.namedOneOf(instancePoints)).implement(each.getInstanceAdvice()).build();
}
if (staticPoints.length > 0) {
- builder.aroundClassStaticMethod(ElementMatchers.namedOneOf(staticPoints)).implement(each.getStaticAdvice()).build();
+ builder.aroundStaticMethod(ElementMatchers.namedOneOf(staticPoints)).implement(each.getStaticAdvice()).build();
}
}
}