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 e48454a8a73 Rename MethodAdvisorBuilderDecorator to
MethodAdvisorBuilderInterceptor (#23400)
e48454a8a73 is described below
commit e48454a8a73765100dedb2282d83401807d926fa
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 8 13:19:28 2023 +0800
Rename MethodAdvisorBuilderDecorator to MethodAdvisorBuilderInterceptor
(#23400)
---
.../agent/core/builder/AgentTransformer.java | 2 +-
...tor.java => MethodAdvisorBuilderInterceptor.java} | 18 +++++++++---------
.../agent/core/plugin/executor/AdviceExecutor.java | 8 ++++----
.../executor/type/ConstructorAdviceExecutor.java | 6 +++---
.../executor/type/InstanceMethodAdviceExecutor.java | 20 ++++++++++----------
.../executor/type/StaticMethodAdviceExecutor.java | 20 ++++++++++----------
6 files changed, 37 insertions(+), 37 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
index 1d8d092bb8f..be2f4975b08 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentTransformer.java
@@ -60,6 +60,6 @@ public final class AgentTransformer implements Transformer {
PluginLifecycleServiceManager.init(pluginConfigs, pluginJars,
classLoaderContext.getAgentClassLoader(), isEnhancedForProxy);
Builder<?> targetAdviceObjectBuilder = builder.defineField(EXTRA_DATA,
Object.class, Opcodes.ACC_PRIVATE |
Opcodes.ACC_VOLATILE).implement(TargetAdviceObject.class).intercept(FieldAccessor.ofField(EXTRA_DATA));
- return new MethodAdvisorBuilderDecorator(typeDescription,
classLoaderContext,
advisorConfigs.get(typeDescription.getTypeName())).decorate(targetAdviceObjectBuilder);
+ return new MethodAdvisorBuilderInterceptor(typeDescription,
classLoaderContext,
advisorConfigs.get(typeDescription.getTypeName())).intercept(targetAdviceObjectBuilder);
}
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilderDecorator.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilderInterceptor.java
similarity index 81%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilderDecorator.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilderInterceptor.java
index 7b752f68dc2..3118ebdfa03 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilderDecorator.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilderInterceptor.java
@@ -30,28 +30,28 @@ import
org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutorFactor
import java.util.Optional;
/**
- * Method advisor builder decorator.
+ * Method advisor builder interceptor.
*/
-public final class MethodAdvisorBuilderDecorator {
+public final class MethodAdvisorBuilderInterceptor {
- private static final Logger LOGGER =
LoggerFactory.getLogger(MethodAdvisorBuilderDecorator.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(MethodAdvisorBuilderInterceptor.class);
private final TypeDescription typePointcut;
private final AdviceExecutorFactory adviceExecutorFactory;
- public MethodAdvisorBuilderDecorator(final TypeDescription typePointcut,
final ClassLoaderContext classLoaderContext, final AdvisorConfiguration
advisorConfig) {
+ public MethodAdvisorBuilderInterceptor(final TypeDescription typePointcut,
final ClassLoaderContext classLoaderContext, final AdvisorConfiguration
advisorConfig) {
this.typePointcut = typePointcut;
adviceExecutorFactory = new AdviceExecutorFactory(classLoaderContext,
advisorConfig);
}
/**
- * Decorate agent builder with method advisor.
+ * Intercept agent builder with method advisor.
*
- * @param builder to be decorated agent builder
- * @return decorated agent builder
+ * @param builder to be intercepted agent builder
+ * @return intercepted agent builder
*/
- public Builder<?> decorate(final Builder<?> builder) {
+ public Builder<?> intercept(final Builder<?> builder) {
Builder<?> result = builder;
for (InDefinedShape each : typePointcut.getDeclaredMethods()) {
Optional<AdviceExecutor> adviceExecutor =
adviceExecutorFactory.findMatchedAdviceExecutor(each);
@@ -59,7 +59,7 @@ public final class MethodAdvisorBuilderDecorator {
continue;
}
try {
- result = adviceExecutor.get().decorateBuilder(result, each);
+ result = adviceExecutor.get().intercept(result, each);
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
// CHECKSTYLE:ON
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
index 502d3819069..4e8701c28bb 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/AdviceExecutor.java
@@ -26,11 +26,11 @@ import net.bytebuddy.dynamic.DynamicType.Builder;
public interface AdviceExecutor {
/**
- * Decorate advice builder.
+ * Intercept agent builder.
*
- * @param builder original builder
+ * @param builder to be intercepted builder
* @param pointcut method pointcut
- * @return decorated builder
+ * @return intercepted builder
*/
- Builder<?> decorateBuilder(Builder<?> builder, MethodDescription pointcut);
+ Builder<?> intercept(Builder<?> builder, MethodDescription pointcut);
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
index 6862e7850ec..bf7bed75d0b 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
@@ -46,13 +46,13 @@ public final class ConstructorAdviceExecutor implements
AdviceExecutor {
private final Collection<ConstructorAdvice> advices;
/**
- * Intercept constructor.
+ * Advice constructor.
*
* @param target target object
* @param args all constructor arguments
*/
@RuntimeType
- public void intercept(@This final TargetAdviceObject target, @AllArguments
final Object[] args) {
+ public void advice(@This final TargetAdviceObject target, @AllArguments
final Object[] args) {
boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
@@ -68,7 +68,7 @@ public final class ConstructorAdviceExecutor implements
AdviceExecutor {
}
@Override
- public Builder<?> decorateBuilder(final Builder<?> builder, final
MethodDescription pointcut) {
+ public Builder<?> intercept(final Builder<?> builder, final
MethodDescription pointcut) {
return
builder.constructor(ElementMatchers.is(pointcut)).intercept(SuperMethodCall.INSTANCE.andThen(MethodDelegation.withDefaultConfiguration().to(this)));
}
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
index eb136a230a6..2f58231f9be 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
@@ -50,20 +50,20 @@ public final class InstanceMethodAdviceExecutor implements
AdviceExecutor {
private final Collection<InstanceMethodAdvice> advices;
/**
- * Intercept instance method.
+ * Advice instance method.
*
* @param target target object
- * @param method intercepted method
+ * @param method advised method
* @param args all arguments of method
* @param callable origin method invocation
* @return return value of target invocation
*/
@RuntimeType
@SneakyThrows
- public Object intercept(@This final TargetAdviceObject target, @Origin
final Method method, @AllArguments final Object[] args, @SuperCall final
Callable<?> callable) {
+ public Object advice(@This final TargetAdviceObject target, @Origin final
Method method, @AllArguments final Object[] args, @SuperCall final Callable<?>
callable) {
boolean adviceEnabled = PluginContext.isPluginEnabled();
if (adviceEnabled) {
- interceptBefore(target, method, args);
+ adviceBefore(target, method, args);
}
Object result = null;
try {
@@ -72,18 +72,18 @@ public final class InstanceMethodAdviceExecutor implements
AdviceExecutor {
} catch (final Throwable ex) {
// CHECKSTYLE:ON
if (adviceEnabled) {
- interceptThrow(target, method, args, ex);
+ adviceThrow(target, method, args, ex);
}
throw ex;
} finally {
if (adviceEnabled) {
- interceptAfter(target, method, args, result);
+ adviceAfter(target, method, args, result);
}
}
return result;
}
- private void interceptBefore(final TargetAdviceObject target, final Method
method, final Object[] args) {
+ private void adviceBefore(final TargetAdviceObject target, final Method
method, final Object[] args) {
try {
for (InstanceMethodAdvice each : advices) {
each.beforeMethod(target, method, args);
@@ -95,7 +95,7 @@ public final class InstanceMethodAdviceExecutor implements
AdviceExecutor {
}
}
- private void interceptThrow(final TargetAdviceObject target, final Method
method, final Object[] args, final Throwable ex) {
+ private void adviceThrow(final TargetAdviceObject target, final Method
method, final Object[] args, final Throwable ex) {
try {
for (InstanceMethodAdvice each : advices) {
each.onThrowing(target, method, args, ex);
@@ -107,7 +107,7 @@ public final class InstanceMethodAdviceExecutor implements
AdviceExecutor {
}
}
- private void interceptAfter(final TargetAdviceObject target, final Method
method, final Object[] args, final Object result) {
+ private void adviceAfter(final TargetAdviceObject target, final Method
method, final Object[] args, final Object result) {
try {
for (InstanceMethodAdvice each : advices) {
each.afterMethod(target, method, args, result);
@@ -120,7 +120,7 @@ public final class InstanceMethodAdviceExecutor implements
AdviceExecutor {
}
@Override
- public Builder<?> decorateBuilder(final Builder<?> builder, final
MethodDescription pointcut) {
+ public Builder<?> intercept(final Builder<?> builder, final
MethodDescription pointcut) {
return
builder.method(ElementMatchers.is(pointcut)).intercept(MethodDelegation.withDefaultConfiguration().to(this));
}
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
index 73ce9565542..d84085f79ab 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
@@ -48,20 +48,20 @@ public final class StaticMethodAdviceExecutor implements
AdviceExecutor {
private final Collection<StaticMethodAdvice> executors;
/**
- * Intercept static method.
+ * Advice static method.
*
* @param klass target class
- * @param method intercepted method
+ * @param method advised method
* @param args all arguments of method
* @param callable origin method invocation
* @return return value of target invocation
*/
@RuntimeType
@SneakyThrows
- public Object intercept(@Origin final Class<?> klass, @Origin final Method
method, @AllArguments final Object[] args, @SuperCall final Callable<?>
callable) {
+ public Object advice(@Origin final Class<?> klass, @Origin final Method
method, @AllArguments final Object[] args, @SuperCall final Callable<?>
callable) {
boolean adviceEnabled = PluginContext.isPluginEnabled();
if (adviceEnabled) {
- interceptBefore(klass, method, args);
+ adviceBefore(klass, method, args);
}
Object result = null;
try {
@@ -70,18 +70,18 @@ public final class StaticMethodAdviceExecutor implements
AdviceExecutor {
} catch (final Throwable ex) {
// CHECKSTYLE:ON
if (adviceEnabled) {
- interceptThrow(klass, method, args, ex);
+ adviceThrow(klass, method, args, ex);
}
throw ex;
} finally {
if (adviceEnabled) {
- interceptAfter(klass, method, args, result);
+ adviceAfter(klass, method, args, result);
}
}
return result;
}
- private void interceptBefore(final Class<?> klass, final Method method,
final Object[] args) {
+ private void adviceBefore(final Class<?> klass, final Method method, final
Object[] args) {
try {
for (StaticMethodAdvice each : executors) {
each.beforeMethod(klass, method, args);
@@ -93,7 +93,7 @@ public final class StaticMethodAdviceExecutor implements
AdviceExecutor {
}
}
- private void interceptThrow(final Class<?> klass, final Method method,
final Object[] args, final Throwable ex) {
+ private void adviceThrow(final Class<?> klass, final Method method, final
Object[] args, final Throwable ex) {
try {
for (StaticMethodAdvice each : executors) {
each.onThrowing(klass, method, args, ex);
@@ -105,7 +105,7 @@ public final class StaticMethodAdviceExecutor implements
AdviceExecutor {
}
}
- private void interceptAfter(final Class<?> klass, final Method method,
final Object[] args, final Object result) {
+ private void adviceAfter(final Class<?> klass, final Method method, final
Object[] args, final Object result) {
try {
for (StaticMethodAdvice each : executors) {
each.afterMethod(klass, method, args, result);
@@ -118,7 +118,7 @@ public final class StaticMethodAdviceExecutor implements
AdviceExecutor {
}
@Override
- public Builder<?> decorateBuilder(final Builder<?> builder, final
MethodDescription pointcut) {
+ public Builder<?> intercept(final Builder<?> builder, final
MethodDescription pointcut) {
return
builder.method(ElementMatchers.is(pointcut)).intercept(MethodDelegation.withDefaultConfiguration().to(this));
}
}
