This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 8f1f790 Rename variable (#12715)
8f1f790 is described below
commit 8f1f7901ead90ca0ec12ab7aa06c455ed6a827ff
Author: Dachuan J <[email protected]>
AuthorDate: Sun Sep 26 14:55:26 2021 +0800
Rename variable (#12715)
---
.../plugin/interceptor/ClassStaticMethodAroundInterceptor.java | 10 ++++------
.../interceptor/ClassStaticMethodInterceptorArgsOverride.java | 10 ++++------
.../agent/core/plugin/interceptor/ConstructorInterceptor.java | 6 ++----
.../plugin/interceptor/InstanceMethodAroundInterceptor.java | 10 ++++------
.../interceptor/InstanceMethodInterceptorArgsOverride.java | 10 ++++------
5 files changed, 18 insertions(+), 28 deletions(-)
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptor.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptor.java
index 9dad705..6069751 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptor.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodAroundInterceptor.java
@@ -41,8 +41,6 @@ public class ClassStaticMethodAroundInterceptor {
private final ClassStaticMethodAroundAdvice classStaticMethodAroundAdvice;
- private boolean needCall = true;
-
/**
* Only intercept static method.
*
@@ -57,9 +55,9 @@ 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;
- needCall = classStaticMethodAroundAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
+ boolean adviceEnabled = classStaticMethodAroundAdvice.disableCheck()
|| PluginContext.isPluginEnabled();
try {
- if (needCall) {
+ if (adviceEnabled) {
classStaticMethodAroundAdvice.beforeMethod(klass, method,
args, methodResult);
}
// CHECKSTYLE:OFF
@@ -78,7 +76,7 @@ public class ClassStaticMethodAroundInterceptor {
} catch (final Throwable ex) {
// CHECKSTYLE:ON
try {
- if (needCall) {
+ if (adviceEnabled) {
classStaticMethodAroundAdvice.onThrowing(klass, method,
args, ex);
}
// CHECKSTYLE:OFF
@@ -89,7 +87,7 @@ public class ClassStaticMethodAroundInterceptor {
throw ex;
} finally {
try {
- if (needCall) {
+ if (adviceEnabled) {
classStaticMethodAroundAdvice.afterMethod(klass, method,
args, methodResult);
}
// CHECKSTYLE:OFF
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodInterceptorArgsOverride.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodInterceptorArgsOverride.java
index 8d6bf6d..d4e0b83 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodInterceptorArgsOverride.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ClassStaticMethodInterceptorArgsOverride.java
@@ -40,8 +40,6 @@ public class ClassStaticMethodInterceptorArgsOverride {
private final ClassStaticMethodAroundAdvice classStaticMethodAroundAdvice;
- private boolean needCall = true;
-
/**
* Only intercept static method.
*
@@ -56,9 +54,9 @@ 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;
- needCall = classStaticMethodAroundAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
+ boolean adviceEnabled = classStaticMethodAroundAdvice.disableCheck()
|| PluginContext.isPluginEnabled();
try {
- if (needCall) {
+ if (adviceEnabled) {
classStaticMethodAroundAdvice.beforeMethod(klass, method,
args, methodResult);
}
// CHECKSTYLE:OFF
@@ -77,7 +75,7 @@ public class ClassStaticMethodInterceptorArgsOverride {
} catch (final Throwable ex) {
// CHECKSTYLE:ON
try {
- if (needCall) {
+ if (adviceEnabled) {
classStaticMethodAroundAdvice.onThrowing(klass, method,
args, ex);
}
// CHECKSTYLE:OFF
@@ -88,7 +86,7 @@ public class ClassStaticMethodInterceptorArgsOverride {
throw ex;
} finally {
try {
- if (needCall) {
+ if (adviceEnabled) {
classStaticMethodAroundAdvice.afterMethod(klass, method,
args, methodResult);
}
// CHECKSTYLE:OFF
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
index 9d0f72c..1383f28 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
@@ -36,8 +36,6 @@ public class ConstructorInterceptor {
private final ConstructorAdvice constructorAdvice;
- private boolean needCall = true;
-
/**
* Intercept constructor.
*
@@ -47,8 +45,8 @@ public class ConstructorInterceptor {
@RuntimeType
public void intercept(@This final AdviceTargetObject target, @AllArguments
final Object[] args) {
try {
- needCall = constructorAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
- if (needCall) {
+ boolean adviceEnabled = constructorAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
+ if (adviceEnabled) {
constructorAdvice.onConstructor(target, args);
}
// CHECKSTYLE:OFF
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
index 730ad57..cd9a028 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
@@ -43,8 +43,6 @@ public class InstanceMethodAroundInterceptor {
private final InstanceMethodAroundAdvice instanceMethodAroundAdvice;
- private boolean needCall = true;
-
/**
* Only intercept instance method.
*
@@ -60,9 +58,9 @@ public class InstanceMethodAroundInterceptor {
AdviceTargetObject instance = (AdviceTargetObject) target;
MethodInvocationResult methodResult = new MethodInvocationResult();
Object result;
- needCall = instanceMethodAroundAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
+ boolean adviceEnabled = instanceMethodAroundAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
try {
- if (needCall) {
+ if (adviceEnabled) {
instanceMethodAroundAdvice.beforeMethod(instance, method,
args, methodResult);
}
// CHECKSTYLE:OFF
@@ -81,7 +79,7 @@ public class InstanceMethodAroundInterceptor {
} catch (final Throwable ex) {
// CHECKSTYLE:ON
try {
- if (needCall) {
+ if (adviceEnabled) {
instanceMethodAroundAdvice.onThrowing(instance, method,
args, ex);
}
// CHECKSTYLE:OFF
@@ -92,7 +90,7 @@ public class InstanceMethodAroundInterceptor {
throw ex;
} finally {
try {
- if (needCall) {
+ if (adviceEnabled) {
instanceMethodAroundAdvice.afterMethod(instance, method,
args, methodResult);
}
// CHECKSTYLE:OFF
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java
index 38d78c1..f8643cf 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java
@@ -42,8 +42,6 @@ public class InstanceMethodInterceptorArgsOverride {
private final InstanceMethodAroundAdvice instanceMethodAroundAdvice;
- private boolean needCall = true;
-
/**
* Only intercept instance method.
*
@@ -59,9 +57,9 @@ public class InstanceMethodInterceptorArgsOverride {
AdviceTargetObject instance = (AdviceTargetObject) target;
MethodInvocationResult methodResult = new MethodInvocationResult();
Object result;
- needCall = instanceMethodAroundAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
+ boolean adviceEnabled = instanceMethodAroundAdvice.disableCheck() ||
PluginContext.isPluginEnabled();
try {
- if (needCall) {
+ if (adviceEnabled) {
instanceMethodAroundAdvice.beforeMethod(instance, method,
args, methodResult);
}
// CHECKSTYLE:OFF
@@ -80,7 +78,7 @@ public class InstanceMethodInterceptorArgsOverride {
} catch (final Throwable ex) {
// CHECKSTYLE:ON
try {
- if (needCall) {
+ if (adviceEnabled) {
instanceMethodAroundAdvice.onThrowing(instance, method,
args, ex);
}
// CHECKSTYLE:OFF
@@ -91,7 +89,7 @@ public class InstanceMethodInterceptorArgsOverride {
throw ex;
} finally {
try {
- if (needCall) {
+ if (adviceEnabled) {
instanceMethodAroundAdvice.afterMethod(instance, method,
args, methodResult);
}
// CHECKSTYLE:OFF
