root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polish "Skip non-overridden methods of Object.class" 

See gh-24649
This commit is contained in:
Stephane Nicoll 2023-08-24 11:26:17 +02:00
parent b91179d1b8
commit 95c43bb0ae
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
View File

@ -331,8 +331,7 @@ class CglibAopProxy implements AopProxy, Serializable {
aopInterceptor, // for normal advice aopInterceptor, // for normal advice
targetInterceptor, // invoke target without considering advice, if optimized targetInterceptor, // invoke target without considering advice, if optimized
new SerializableNoOp(), // no override for methods mapped to this new SerializableNoOp(), // no override for methods mapped to this
targetDispatcher, targetDispatcher, this.advisedDispatcher,
this.advisedDispatcher,
new EqualsInterceptor(this.advised), new EqualsInterceptor(this.advised),
new HashCodeInterceptor(this.advised) new HashCodeInterceptor(this.advised)
}; };
@ -343,14 +342,14 @@ class CglibAopProxy implements AopProxy, Serializable {
if (isStatic && isFrozen) { if (isStatic && isFrozen) {
Method[] methods = rootClass.getMethods(); Method[] methods = rootClass.getMethods();
int methodsCount = methods.length; int methodsCount = methods.length;
ArrayList<Callback> fixedCallbacks = new ArrayList<>(methodsCount); List<Callback> fixedCallbacks = new ArrayList<>(methodsCount);
this.fixedInterceptorMap = CollectionUtils.newHashMap(methodsCount); this.fixedInterceptorMap = CollectionUtils.newHashMap(methodsCount);
int advicedMethodCount = methodsCount; int advicedMethodCount = methodsCount;
for (int x = 0; x < methodsCount; x++) { for (int x = 0; x < methodsCount; x++) {
Method method = methods[x]; Method method = methods[x];
//do not create advices for non-overridden methods of java.lang.Object //do not create advices for non-overridden methods of java.lang.Object
if (notOverriddenOfObject(method)) { if (method.getDeclaringClass() == Object.class) {
advicedMethodCount--; advicedMethodCount--;
continue; continue;
} }
@ -364,24 +363,14 @@ class CglibAopProxy implements AopProxy, Serializable {
// and fixedCallbacks into the callbacks array. // and fixedCallbacks into the callbacks array.
Callback[] callbacks = new Callback[mainCallbacks.length + advicedMethodCount]; Callback[] callbacks = new Callback[mainCallbacks.length + advicedMethodCount];
System.arraycopy(mainCallbacks, 0, callbacks, 0, mainCallbacks.length); System.arraycopy(mainCallbacks, 0, callbacks, 0, mainCallbacks.length);
System.arraycopy(fixedCallbacks.toArray(), 0, callbacks, mainCallbacks.length, advicedMethodCount); System.arraycopy(fixedCallbacks.toArray(Callback[]::new), 0, callbacks,
mainCallbacks.length, advicedMethodCount);
this.fixedInterceptorOffset = mainCallbacks.length; this.fixedInterceptorOffset = mainCallbacks.length;
return callbacks; return callbacks;
} }
return mainCallbacks; return mainCallbacks;
} }
/**
* Returns true if param is inherited from {@link Object} and not overridden in declaring class.
* We use this to detect {@link Object#notify()}, {@link Object#notifyAll()}, {@link Object#getClass()} etc.
* to skip creation of useless advices for them.
* @param method to be checked
* @return true in case {@code method} belongs to {@link Object}
*/
private static boolean notOverriddenOfObject(Method method) {
return method.getDeclaringClass() == Object.class;
}
@Override @Override
public boolean equals(@Nullable Object other) { public boolean equals(@Nullable Object other) {