You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/16 15:19:37 UTC
[shardingsphere] branch master updated: Remove AgentAdvice.disableCheck() (#22923)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 a0642049df0 Remove AgentAdvice.disableCheck() (#22923)
a0642049df0 is described below
commit a0642049df02a878c8646ffa9da9334c66fccbd8
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 16 23:19:30 2022 +0800
Remove AgentAdvice.disableCheck() (#22923)
* Refactor MethodAdvisorConfiguration
* Refactor ConstructorInterceptor
* Remove AgentAdvice.disableCheck()
* Remove AgentAdvice.disableCheck()
---
.../shardingsphere/agent/core/plugin/advice/AgentAdvice.java | 9 ---------
.../agent/core/plugin/interceptor/ConstructorInterceptor.java | 6 +++---
.../plugin/interceptor/InstanceMethodAroundInterceptor.java | 10 +++++-----
.../core/plugin/interceptor/StaticMethodAroundInterceptor.java | 10 +++++-----
4 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AgentAdvice.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AgentAdvice.java
index dc219003d3b..aeeb099e697 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AgentAdvice.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AgentAdvice.java
@@ -21,13 +21,4 @@ package org.apache.shardingsphere.agent.core.plugin.advice;
* Agent advice.
*/
public interface AgentAdvice {
-
- /**
- * Check if disable the check process when interceptor are trying to call the advice. Then the advice will be called by skipping checks.
- *
- * @return disable or not
- */
- default boolean disableCheck() {
- return false;
- }
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
index b83f7ab2108..d7b9cca59c4 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
@@ -35,7 +35,7 @@ public class ConstructorInterceptor {
private static final Logger LOGGER = LoggerFactory.getLogger(ConstructorInterceptor.class);
- private final ConstructorAdvice constructorAdvice;
+ private final ConstructorAdvice advice;
/**
* Intercept constructor.
@@ -45,10 +45,10 @@ public class ConstructorInterceptor {
*/
@RuntimeType
public void intercept(@This final TargetAdviceObject target, @AllArguments final Object[] args) {
- boolean adviceEnabled = constructorAdvice.disableCheck() || PluginContext.isPluginEnabled();
+ boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- constructorAdvice.onConstructor(target, args);
+ advice.onConstructor(target, args);
}
// CHECKSTYLE:OFF
} catch (final Throwable throwable) {
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
index e145f2585b5..4f6322a2eed 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
@@ -41,7 +41,7 @@ public class InstanceMethodAroundInterceptor {
private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(InstanceMethodAroundInterceptor.class);
- private final InstanceMethodAroundAdvice instanceMethodAroundAdvice;
+ private final InstanceMethodAroundAdvice advice;
/**
* Only intercept instance method.
@@ -57,10 +57,10 @@ public class InstanceMethodAroundInterceptor {
public Object intercept(@This final TargetAdviceObject target, @Origin final Method method, @AllArguments final Object[] args, @SuperCall final Callable<?> callable) {
MethodInvocationResult methodResult = new MethodInvocationResult();
Object result;
- boolean adviceEnabled = instanceMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
+ boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- instanceMethodAroundAdvice.beforeMethod(target, method, args, methodResult);
+ advice.beforeMethod(target, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
@@ -79,7 +79,7 @@ public class InstanceMethodAroundInterceptor {
// CHECKSTYLE:ON
try {
if (adviceEnabled) {
- instanceMethodAroundAdvice.onThrowing(target, method, args, ex);
+ advice.onThrowing(target, method, args, ex);
}
// CHECKSTYLE:OFF
} catch (final Throwable ignored) {
@@ -90,7 +90,7 @@ public class InstanceMethodAroundInterceptor {
} finally {
try {
if (adviceEnabled) {
- instanceMethodAroundAdvice.afterMethod(target, method, args, methodResult);
+ advice.afterMethod(target, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
index 9fc96a4ce98..7f247692fcf 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
@@ -39,7 +39,7 @@ public class StaticMethodAroundInterceptor {
private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(StaticMethodAroundInterceptor.class);
- private final StaticMethodAroundAdvice staticMethodAroundAdvice;
+ private final StaticMethodAroundAdvice advice;
/**
* Only intercept static method.
@@ -55,10 +55,10 @@ public class StaticMethodAroundInterceptor {
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 = staticMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
+ boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- staticMethodAroundAdvice.beforeMethod(klass, method, args, methodResult);
+ advice.beforeMethod(klass, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
@@ -77,7 +77,7 @@ public class StaticMethodAroundInterceptor {
// CHECKSTYLE:ON
try {
if (adviceEnabled) {
- staticMethodAroundAdvice.onThrowing(klass, method, args, ex);
+ advice.onThrowing(klass, method, args, ex);
}
// CHECKSTYLE:OFF
} catch (final Throwable ignored) {
@@ -88,7 +88,7 @@ public class StaticMethodAroundInterceptor {
} finally {
try {
if (adviceEnabled) {
- staticMethodAroundAdvice.afterMethod(klass, method, args, methodResult);
+ advice.afterMethod(klass, method, args, methodResult);
}
// CHECKSTYLE:OFF
} catch (final Throwable ex) {