spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-26 08:59:09 +00:00
Code Issues Projects Releases Wiki Activity

Polish contribution

Browse Source 
See gh-36935
This commit is contained in:
Sam Brannen
2026-08-24 12:36:28 +02:00
parent ac95b96c21
commit 79a75a5762
3 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
+1
View File
@@ -286,6 +286,7 @@ public abstract class AopProxyUtils {
* Determine whether the given interface is a Spring configuration callback
* interface (i.e. {@link InitializingBean}, {@link DisposableBean},
* {@link Closeable}/{@link AutoCloseable}, or an {@link Aware} sub-interface).
* @since 7.1
*/
static boolean isConfigurationCallbackInterface(Class<?> ifc) {
return (InitializingBean.class == ifc || DisposableBean.class == ifc ||
spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
+7 -11
View File
@@ -16,7 +16,6 @@
package org.springframework.aop.framework;
import java.io.Closeable;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -38,9 +37,6 @@ import org.springframework.aop.RawTargetAccess;
import org.springframework.aop.TargetSource;
import org.springframework.aop.support.AopUtils;
import org.springframework.aot.AotDetector;
import org.springframework.beans.factory.Aware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.cglib.core.ClassLoaderAwareGeneratorStrategy;
import org.springframework.cglib.core.CodeGenerationException;
import org.springframework.cglib.core.GeneratorStrategy;
@@ -296,6 +292,9 @@ class CglibAopProxy implements AopProxy, Serializable {
if (Modifier.isFinal(mod)) {
if (logger.isWarnEnabled() && Modifier.isPublic(mod)) {
if (implementsInterface(method, ifcs)) {
// Final methods inherited from configuration callback interfaces are
// typically driven by the container itself rather than by user code, so
// logging a warning about CGLIB being unable to advise them is misleading noise.
if (!implementsOnlyConfigurationCallbackInterfaces(method, ifcs)) {
logger.warn("Unable to proxy interface-implementing method [" + method + "] because " +
"it is marked as final, consider using interface-based JDK proxies instead.");
@@ -422,13 +421,10 @@ class CglibAopProxy implements AopProxy, Serializable {
}
/**
* Check whether every interface that declares the given method is a Spring
* configuration callback interface, such as {@link InitializingBean},
* {@link DisposableBean}, an {@link Aware} sub-interface, or
* {@link Closeable}/{@link AutoCloseable}. Final methods inherited from such
* interfaces are typically driven by the container itself rather than by user
* code, so logging a WARN about CGLIB being unable to advise them is
* misleading noise (gh-35365).
* Check whether every interface that declares the given method is a
* configuration callback interface.
* @since 7.1
* @see AopProxyUtils#isConfigurationCallbackInterface(Class)
*/
static boolean implementsOnlyConfigurationCallbackInterfaces(Method method, Set<Class<?>> ifcs) {
boolean matched = false;
spring-aop/src/test/java/org/springframework/aop/framework/CglibAopProxyConfigurationCallbackTests.java
+44 -28
View File
@@ -17,11 +17,10 @@
package org.springframework.aop.framework;
import java.io.Closeable;
import java.lang.reflect.Method;
import java.util.Set;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
@@ -34,56 +33,66 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* <p>Verifies that final methods inherited from Spring's configuration callback
* interfaces (InitializingBean, DisposableBean, Aware sub-interfaces,
* Closeable/AutoCloseable) are recognised so that the CGLIB validation warning
* can be suppressed for those container-driven methods (gh-35365).
* Closeable/AutoCloseable) are recognized so that the CGLIB validation warning
* can be suppressed for those container-driven methods.
*
* @since 7.1
* @see <a href="https://github.com/spring-projects/spring-framework/pull/36935>gh-36935</a>
*/
class CglibAopProxyConfigurationCallbackTests {
@Test
void finalAfterPropertiesSetIsRecognisedAsCallback() throws NoSuchMethodException {
Method method = WithFinalAfterPropertiesSet.class.getDeclaredMethod("afterPropertiesSet");
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalAfterPropertiesSet.class);
void finalAfterPropertiesSetIsRecognisedAsCallback() {
var method = ClassUtils.getMethod(WithFinalAfterPropertiesSet.class, "afterPropertiesSet");
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalAfterPropertiesSet.class);
assertThat(CglibAopProxy.implementsOnlyConfigurationCallbackInterfaces(method, interfaces)).isTrue();
}
@Test
void finalDestroyIsRecognisedAsCallback() throws NoSuchMethodException {
Method method = WithFinalDestroy.class.getDeclaredMethod("destroy");
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalDestroy.class);
void finalDestroyIsRecognisedAsCallback() {
var method = ClassUtils.getMethod(WithFinalDestroy.class, "destroy");
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalDestroy.class);
assertThat(CglibAopProxy.implementsOnlyConfigurationCallbackInterfaces(method, interfaces)).isTrue();
}
@Test
void finalAwareCallbackIsRecognisedAsCallback() throws NoSuchMethodException {
Method method = WithFinalBeanFactoryAware.class.getDeclaredMethod("setBeanFactory",
org.springframework.beans.factory.BeanFactory.class);
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalBeanFactoryAware.class);
void finalAwareCallbackIsRecognisedAsCallback() {
var method = ClassUtils.getMethod(WithFinalBeanFactoryAware.class, "setBeanFactory", BeanFactory.class);
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalBeanFactoryAware.class);
assertThat(CglibAopProxy.implementsOnlyConfigurationCallbackInterfaces(method, interfaces)).isTrue();
}
@Test
void finalCloseIsRecognisedAsCallback() throws NoSuchMethodException {
Method method = WithFinalClose.class.getDeclaredMethod("close");
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalClose.class);
void finalCloseableCloseIsRecognisedAsCallback() {
var method = ClassUtils.getMethod(WithFinalCloseableClose.class, "close");
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalCloseableClose.class);
assertThat(CglibAopProxy.implementsOnlyConfigurationCallbackInterfaces(method, interfaces)).isTrue();
}
@Test
void finalUserInterfaceMethodIsNotSuppressed() throws NoSuchMethodException {
Method method = WithFinalUserApi.class.getDeclaredMethod("execute");
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalUserApi.class);
void finalAutoCloseableCloseIsRecognisedAsCallback() {
var method = ClassUtils.getMethod(WithFinalAutoCloseableClose.class, "close");
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalAutoCloseableClose.class);
assertThat(CglibAopProxy.implementsOnlyConfigurationCallbackInterfaces(method, interfaces)).isTrue();
}
@Test
void finalUserInterfaceMethodIsNotSuppressed() {
var method = ClassUtils.getMethod(WithFinalUserApi.class, "execute");
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithFinalUserApi.class);
assertThat(CglibAopProxy.implementsOnlyConfigurationCallbackInterfaces(method, interfaces)).isFalse();
}
@Test
void methodSharedBetweenCallbackAndUserInterfaceIsNotSuppressed() throws NoSuchMethodException {
Method method = WithSharedSignature.class.getDeclaredMethod("afterPropertiesSet");
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithSharedSignature.class);
void methodSharedBetweenCallbackAndUserInterfaceIsNotSuppressed() {
var method = ClassUtils.getMethod(WithSharedSignature.class, "afterPropertiesSet");
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithSharedSignature.class);
// Even though InitializingBean declares afterPropertiesSet(), a user
// interface (CustomLifecycle) declares the same signature, so the
@@ -92,9 +101,9 @@ class CglibAopProxyConfigurationCallbackTests {
}
@Test
void finalMethodWithoutInterfaceMatchIsNotSuppressed() throws NoSuchMethodException {
Method method = WithStandaloneFinal.class.getDeclaredMethod("doSomething");
Set<Class<?>> interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithStandaloneFinal.class);
void finalMethodWithoutInterfaceMatchIsNotSuppressed() {
var method = ClassUtils.getMethod(WithStandaloneFinal.class, "doSomething");
var interfaces = ClassUtils.getAllInterfacesForClassAsSet(WithStandaloneFinal.class);
assertThat(CglibAopProxy.implementsOnlyConfigurationCallbackInterfaces(method, interfaces)).isFalse();
}
@@ -117,11 +126,18 @@ class CglibAopProxyConfigurationCallbackTests {
static class WithFinalBeanFactoryAware implements BeanFactoryAware {
@Override
public final void setBeanFactory(org.springframework.beans.factory.BeanFactory beanFactory) {
public final void setBeanFactory(BeanFactory beanFactory) {
}
}
static class WithFinalClose implements Closeable {
static class WithFinalCloseableClose implements Closeable {
@Override
public final void close() {
}
}
static class WithFinalAutoCloseableClose implements AutoCloseable {
@Override
public final void close() {