You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/16 09:17:09 UTC
[shardingsphere] branch master updated: Remove useless generic type of MethodAdvisor (#22913)
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 9569895f2d0 Remove useless generic type of MethodAdvisor (#22913)
9569895f2d0 is described below
commit 9569895f2d029fd52fc073bbc5aa770298b47e98
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 16 17:17:02 2022 +0800
Remove useless generic type of MethodAdvisor (#22913)
---
.../agent/core/transformer/MethodAdvisor.java | 4 ++--
.../transformer/builder/ConstructorAdvisorBuilder.java | 14 +++++++-------
.../builder/InstanceMethodAdvisorBuilder.java | 14 +++++++-------
.../transformer/builder/StaticMethodAdvisorBuilder.java | 16 ++++++++--------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
index 81733a407e1..7aaa6c642d1 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/MethodAdvisor.java
@@ -26,9 +26,9 @@ import net.bytebuddy.description.method.MethodDescription;
*/
@RequiredArgsConstructor
@Getter
-public final class MethodAdvisor<T> {
+public final class MethodAdvisor {
private final MethodDescription pointcut;
- private final T advice;
+ private final Object advice;
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/ConstructorAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/ConstructorAdvisorBuilder.java
index 141c26fb502..4e4516adacf 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/ConstructorAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/ConstructorAdvisorBuilder.java
@@ -67,9 +67,9 @@ public final class ConstructorAdvisorBuilder {
*/
public Builder<?> create(final Builder<?> builder) {
Builder<?> result = builder;
- Collection<MethodAdvisor<?>> matchedAdvisor = typePointcut.getDeclaredMethods()
+ Collection<MethodAdvisor> matchedAdvisor = typePointcut.getDeclaredMethods()
.stream().filter(MethodDescription::isConstructor).map(this::getMatchedAdvisor).filter(Objects::nonNull).collect(Collectors.toList());
- for (MethodAdvisor<?> each : matchedAdvisor) {
+ for (MethodAdvisor each : matchedAdvisor) {
try {
result = result.constructor(ElementMatchers.is(each.getPointcut()))
.intercept(SuperMethodCall.INSTANCE.andThen(MethodDelegation.withDefaultConfiguration().to(each.getAdvice())));
@@ -82,7 +82,7 @@ public final class ConstructorAdvisorBuilder {
return result;
}
- private MethodAdvisor<?> getMatchedAdvisor(final InDefinedShape methodPointcut) {
+ private MethodAdvisor getMatchedAdvisor(final InDefinedShape methodPointcut) {
List<ConstructorAdvisorConfiguration> matchedAdvisorConfigs = advisorConfigs.stream().filter(each -> each.getPointcut().matches(methodPointcut)).collect(Collectors.toList());
if (matchedAdvisorConfigs.isEmpty()) {
return null;
@@ -93,13 +93,13 @@ public final class ConstructorAdvisorBuilder {
return getComposedMethodAdvisor(methodPointcut, matchedAdvisorConfigs);
}
- private MethodAdvisor<ConstructorInterceptor> getSingleMethodAdvisor(final InDefinedShape methodPointcut, final List<ConstructorAdvisorConfiguration> matchedAdvisorConfigs) {
- return new MethodAdvisor<>(methodPointcut, new ConstructorInterceptor(adviceFactory.getAdvice(matchedAdvisorConfigs.get(0).getAdviceClassName())));
+ private MethodAdvisor getSingleMethodAdvisor(final InDefinedShape methodPointcut, final List<ConstructorAdvisorConfiguration> matchedAdvisorConfigs) {
+ return new MethodAdvisor(methodPointcut, new ConstructorInterceptor(adviceFactory.getAdvice(matchedAdvisorConfigs.get(0).getAdviceClassName())));
}
- private MethodAdvisor<ComposedConstructorInterceptor> getComposedMethodAdvisor(final InDefinedShape methodPointcut, final List<ConstructorAdvisorConfiguration> matchedAdvisorConfigs) {
+ private MethodAdvisor getComposedMethodAdvisor(final InDefinedShape methodPointcut, final List<ConstructorAdvisorConfiguration> matchedAdvisorConfigs) {
Collection<ConstructorAdvice> advices = matchedAdvisorConfigs
.stream().map(ConstructorAdvisorConfiguration::getAdviceClassName).map(each -> (ConstructorAdvice) adviceFactory.getAdvice(each)).collect(Collectors.toList());
- return new MethodAdvisor<>(methodPointcut, new ComposedConstructorInterceptor(advices));
+ return new MethodAdvisor(methodPointcut, new ComposedConstructorInterceptor(advices));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/InstanceMethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/InstanceMethodAdvisorBuilder.java
index bca178da249..c428c6c4c57 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/InstanceMethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/InstanceMethodAdvisorBuilder.java
@@ -70,9 +70,9 @@ public final class InstanceMethodAdvisorBuilder {
*/
public Builder<?> create(final Builder<?> builder) {
Builder<?> result = builder;
- Collection<MethodAdvisor<?>> matchedAdvisors = typePointcut.getDeclaredMethods()
+ Collection<MethodAdvisor> matchedAdvisors = typePointcut.getDeclaredMethods()
.stream().filter(each -> !(each.isAbstract() || each.isSynthetic())).map(this::getMatchedAdvisor).filter(Objects::nonNull).collect(Collectors.toList());
- for (MethodAdvisor<?> each : matchedAdvisors) {
+ for (MethodAdvisor each : matchedAdvisors) {
try {
if (each.getAdvice() instanceof InstanceMethodInterceptorArgsOverride) {
result = result.method(ElementMatchers.is(each.getPointcut()))
@@ -89,7 +89,7 @@ public final class InstanceMethodAdvisorBuilder {
return result;
}
- private MethodAdvisor<?> getMatchedAdvisor(final InDefinedShape methodPointcut) {
+ private MethodAdvisor getMatchedAdvisor(final InDefinedShape methodPointcut) {
List<InstanceMethodAdvisorConfiguration> matchedAdvisorConfigs = advisorConfigs.stream().filter(each -> each.getPointcut().matches(methodPointcut)).collect(Collectors.toList());
if (matchedAdvisorConfigs.isEmpty()) {
return null;
@@ -100,13 +100,13 @@ public final class InstanceMethodAdvisorBuilder {
return getComposedMethodAdvisor(methodPointcut);
}
- private MethodAdvisor<?> getSingleMethodAdvisor(final InDefinedShape methodPointcut, final InstanceMethodAdvisorConfiguration advisorConfig) {
+ private MethodAdvisor getSingleMethodAdvisor(final InDefinedShape methodPointcut, final InstanceMethodAdvisorConfiguration advisorConfig) {
InstanceMethodAroundAdvice instanceMethodAroundAdvice = adviceFactory.getAdvice(advisorConfig.getAdviceClassName());
Object advice = advisorConfig.isOverrideArgs() ? new InstanceMethodInterceptorArgsOverride(instanceMethodAroundAdvice) : new InstanceMethodAroundInterceptor(instanceMethodAroundAdvice);
- return new MethodAdvisor<>(methodPointcut, advice);
+ return new MethodAdvisor(methodPointcut, advice);
}
- private MethodAdvisor<?> getComposedMethodAdvisor(final InDefinedShape methodPointcut) {
+ private MethodAdvisor getComposedMethodAdvisor(final InDefinedShape methodPointcut) {
Collection<InstanceMethodAroundAdvice> instanceMethodAroundAdvices = new LinkedList<>();
boolean isArgsOverride = false;
for (InstanceMethodAdvisorConfiguration each : advisorConfigs) {
@@ -118,6 +118,6 @@ public final class InstanceMethodAdvisorBuilder {
}
}
Object advice = isArgsOverride ? new ComposedInstanceMethodInterceptorArgsOverride(instanceMethodAroundAdvices) : new ComposedInstanceMethodAroundInterceptor(instanceMethodAroundAdvices);
- return new MethodAdvisor<>(methodPointcut, advice);
+ return new MethodAdvisor(methodPointcut, advice);
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/StaticMethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/StaticMethodAdvisorBuilder.java
index 62003cc9698..78aa28ff750 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/StaticMethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/StaticMethodAdvisorBuilder.java
@@ -70,9 +70,9 @@ public final class StaticMethodAdvisorBuilder {
*/
public Builder<?> create(final Builder<?> builder) {
Builder<?> result = builder;
- Collection<MethodAdvisor<?>> matchedAdvisors = typePointcut.getDeclaredMethods()
+ Collection<MethodAdvisor> matchedAdvisors = typePointcut.getDeclaredMethods()
.stream().filter(each -> each.isStatic() && !(each.isAbstract() || each.isSynthetic())).map(this::getMatchedAdvisor).filter(Objects::nonNull).collect(Collectors.toList());
- for (MethodAdvisor<?> each : matchedAdvisors) {
+ for (MethodAdvisor each : matchedAdvisors) {
try {
if (each.getAdvice() instanceof StaticMethodInterceptorArgsOverride) {
result = result.method(ElementMatchers.is(each.getPointcut()))
@@ -89,7 +89,7 @@ public final class StaticMethodAdvisorBuilder {
return result;
}
- private MethodAdvisor<?> getMatchedAdvisor(final InDefinedShape methodPointcut) {
+ private MethodAdvisor getMatchedAdvisor(final InDefinedShape methodPointcut) {
List<StaticMethodAdvisorConfiguration> matchedAdvisorConfigs = advisorConfigs.stream().filter(each -> each.getPointcut().matches(methodPointcut)).collect(Collectors.toList());
if (matchedAdvisorConfigs.isEmpty()) {
return null;
@@ -100,14 +100,14 @@ public final class StaticMethodAdvisorBuilder {
return getComposedMethodAdvisor(methodPointcut);
}
- private MethodAdvisor<?> getSingleMethodAdvisor(final InDefinedShape methodPointcut, final StaticMethodAdvisorConfiguration advisorConfig) {
+ private MethodAdvisor getSingleMethodAdvisor(final InDefinedShape methodPointcut, final StaticMethodAdvisorConfiguration advisorConfig) {
StaticMethodAroundAdvice staticMethodAroundAdvice = adviceFactory.getAdvice(advisorConfig.getAdviceClassName());
return advisorConfig.isOverrideArgs()
- ? new MethodAdvisor<>(methodPointcut, new StaticMethodInterceptorArgsOverride(staticMethodAroundAdvice))
- : new MethodAdvisor<>(methodPointcut, new StaticMethodAroundInterceptor(staticMethodAroundAdvice));
+ ? new MethodAdvisor(methodPointcut, new StaticMethodInterceptorArgsOverride(staticMethodAroundAdvice))
+ : new MethodAdvisor(methodPointcut, new StaticMethodAroundInterceptor(staticMethodAroundAdvice));
}
- private MethodAdvisor<?> getComposedMethodAdvisor(final InDefinedShape methodPointcut) {
+ private MethodAdvisor getComposedMethodAdvisor(final InDefinedShape methodPointcut) {
Collection<StaticMethodAroundAdvice> staticMethodAroundAdvices = new LinkedList<>();
boolean isArgsOverride = false;
for (StaticMethodAdvisorConfiguration each : advisorConfigs) {
@@ -119,6 +119,6 @@ public final class StaticMethodAdvisorBuilder {
}
}
Object advice = isArgsOverride ? new ComposedStaticMethodInterceptorArgsOverride(staticMethodAroundAdvices) : new ComposedStaticMethodAroundInterceptor(staticMethodAroundAdvices);
- return new MethodAdvisor<>(methodPointcut, advice);
+ return new MethodAdvisor(methodPointcut, advice);
}
}