Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid reflection in SpringDataWebConfiguration.

Browse Source 
We now use an explicit lookup via the application context to consume PageableHandlerMethodArgumentResolverCustomizer and SortHandlerMethodArgumentResolverCustomizer rather than autowiring those into a field.

Fixes #2440.
This commit is contained in:
Oliver Drotbohm
2021-08-26 16:13:44 +02:00
parent 4acd3b7003
commit 3c887f6319
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java
View File

@@ -16,11 +16,9 @@
package org.springframework.data.web.config;
import java.util.List;
import java.util.Optional;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -66,9 +64,8 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo
private final Lazy<SortHandlerMethodArgumentResolver> sortResolver;
private final Lazy<PageableHandlerMethodArgumentResolver> pageableResolver;
private @Autowired Optional<PageableHandlerMethodArgumentResolverCustomizer> pageableResolverCustomizer;
private @Autowired Optional<SortHandlerMethodArgumentResolverCustomizer> sortResolverCustomizer;
private final Lazy<PageableHandlerMethodArgumentResolverCustomizer> pageableResolverCustomizer;
private final Lazy<SortHandlerMethodArgumentResolverCustomizer> sortResolverCustomizer;
public SpringDataWebConfiguration(ApplicationContext context,
@Qualifier("mvcConversionService") ObjectFactory<ConversionService> conversionService) {
@@ -77,10 +74,15 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo
Assert.notNull(conversionService, "ConversionService must not be null!");
this.context = context;
this.conversionService = conversionService;
this.sortResolver = Lazy.of(() -> context.getBean("sortResolver", SortHandlerMethodArgumentResolver.class));
this.pageableResolver = Lazy
.of(() -> context.getBean("pageableResolver", PageableHandlerMethodArgumentResolver.class));
this.pageableResolver = Lazy.of( //
() -> context.getBean("pageableResolver", PageableHandlerMethodArgumentResolver.class));
this.pageableResolverCustomizer = Lazy.of( //
() -> context.getBeanProvider(PageableHandlerMethodArgumentResolverCustomizer.class).getIfAvailable());
this.sortResolverCustomizer = Lazy.of( //
() -> context.getBeanProvider(SortHandlerMethodArgumentResolverCustomizer.class).getIfAvailable());
}
/*
@@ -181,11 +183,11 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo
}
protected void customizePageableResolver(PageableHandlerMethodArgumentResolver pageableResolver) {
pageableResolverCustomizer.ifPresent(c -> c.customize(pageableResolver));
pageableResolverCustomizer.getOptional().ifPresent(c -> c.customize(pageableResolver));
}
protected void customizeSortResolver(SortHandlerMethodArgumentResolver sortResolver) {
sortResolverCustomizer.ifPresent(c -> c.customize(sortResolver));
sortResolverCustomizer.getOptional().ifPresent(c -> c.customize(sortResolver));
}
private void forwardBeanClassLoader(BeanClassLoaderAware target) {