DATACMNS-1736 - Polishing.

Avoid reuse of Lazy instances for (Sort|Pageable)HandlerMethodArgumentResolver and consistently use those to avoid breaking API changes in configuration classes.

Author: odrotbohm

src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java

@@ -22,15 +22,12 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.util.Lazy;
 import org.springframework.data.web.HateoasPageableHandlerMethodArgumentResolver;
 import org.springframework.data.web.HateoasSortHandlerMethodArgumentResolver;
-import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
 import org.springframework.data.web.PagedResourcesAssembler;
 import org.springframework.data.web.PagedResourcesAssemblerArgumentResolver;
-import org.springframework.data.web.SortHandlerMethodArgumentResolver;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 
 /**
@@ -42,36 +39,42 @@
  * @author Ben Hale
  * @author Vedran Pavic
  * @author Mark Paluch
+ * @author Greg Turnquist
  */
 @Configuration(proxyBeanMethods = false)
 public class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfiguration {
 
-	private final ApplicationContext context;
+	private final Lazy<HateoasSortHandlerMethodArgumentResolver> sortResolver;
+	private final Lazy<HateoasPageableHandlerMethodArgumentResolver> pageableResolver;
+	private final Lazy<PagedResourcesAssemblerArgumentResolver> argumentResolver;
 
 	/**
 	 * @param context must not be {@literal null}.
 	 * @param conversionService must not be {@literal null}.
 	 */
 	public HateoasAwareSpringDataWebConfiguration(ApplicationContext context,
 			@Qualifier("mvcConversionService") ObjectFactory<ConversionService> conversionService) {
+
 		super(context, conversionService);
-		this.context = context;
+
 		this.sortResolver = Lazy
-				.of(() -> context.getBean("hateoasSortResolver", HateoasSortHandlerMethodArgumentResolver.class));
+				.of(() -> context.getBean("sortResolver", HateoasSortHandlerMethodArgumentResolver.class));
 		this.pageableResolver = Lazy
-				.of(() -> context.getBean("hateoasPageableResolver", HateoasPageableHandlerMethodArgumentResolver.class));
-
+				.of(() -> context.getBean("pageableResolver", HateoasPageableHandlerMethodArgumentResolver.class));
+		this.argumentResolver = Lazy.of(() -> context.getBean("pagedResourcesAssemblerArgumentResolver",
+				PagedResourcesAssemblerArgumentResolver.class));
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.web.config.SpringDataWebConfiguration#pageableResolver()
 	 */
+	@Override
 	@Bean
-	public HateoasPageableHandlerMethodArgumentResolver hateoasPageableResolver() {
+	public HateoasPageableHandlerMethodArgumentResolver pageableResolver() {
 
 		HateoasPageableHandlerMethodArgumentResolver pageableResolver = new HateoasPageableHandlerMethodArgumentResolver(
-				(HateoasSortHandlerMethodArgumentResolver) this.sortResolver.get());
+				this.sortResolver.get());
 		customizePageableResolver(pageableResolver);
 		return pageableResolver;
 	}
@@ -81,23 +84,22 @@ public HateoasPageableHandlerMethodArgumentResolver hateoasPageableResolver() {
 	 * @see org.springframework.data.web.config.SpringDataWebConfiguration#sortResolver()
 	 */
 	@Bean
-	public HateoasSortHandlerMethodArgumentResolver hateoasSortResolver() {
+	@Override
+	public HateoasSortHandlerMethodArgumentResolver sortResolver() {
 
 		HateoasSortHandlerMethodArgumentResolver sortResolver = new HateoasSortHandlerMethodArgumentResolver();
 		customizeSortResolver(sortResolver);
 		return sortResolver;
 	}
 
 	@Bean
-	public PagedResourcesAssembler<?> pagedResourcesAssembler(
-			HateoasPageableHandlerMethodArgumentResolver pageableResolver) {
-		return new PagedResourcesAssembler<>(pageableResolver, null);
+	public PagedResourcesAssembler<?> pagedResourcesAssembler() {
+		return new PagedResourcesAssembler<>(pageableResolver.get(), null);
 	}
 
 	@Bean
-	public PagedResourcesAssemblerArgumentResolver pagedResourcesAssemblerArgumentResolver(
-			HateoasPageableHandlerMethodArgumentResolver pageableResolver) {
-		return new PagedResourcesAssemblerArgumentResolver(pageableResolver, null);
+	public PagedResourcesAssemblerArgumentResolver pagedResourcesAssemblerArgumentResolver() {
+		return new PagedResourcesAssemblerArgumentResolver(pageableResolver.get(), null);
 	}
 
 	/*
@@ -106,8 +108,9 @@ public PagedResourcesAssemblerArgumentResolver pagedResourcesAssemblerArgumentRe
 	 */
 	@Override
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+
 		super.addArgumentResolvers(argumentResolvers);
-		argumentResolvers
-				.add(context.getBean("pagedResourcesAssemblerArgumentResolver", PagedResourcesAssemblerArgumentResolver.class));
+
+		argumentResolvers.add(argumentResolver.get());
 	}
 }

src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java

@@ -55,6 +55,7 @@
  * @author Vedran Pavic
  * @author Jens Schauder
  * @author Mark Paluch
+ * @author Greg Turnquist
  */
 @Configuration(proxyBeanMethods = false)
 public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLoaderAware {
@@ -63,8 +64,8 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo
 	private final ObjectFactory<ConversionService> conversionService;
 	private @Nullable ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
-	protected Lazy<SortHandlerMethodArgumentResolver> sortResolver;
-	protected Lazy<PageableHandlerMethodArgumentResolver> pageableResolver;
+	private final Lazy<SortHandlerMethodArgumentResolver> sortResolver;
+	private final Lazy<PageableHandlerMethodArgumentResolver> pageableResolver;
 
 	private @Autowired Optional<PageableHandlerMethodArgumentResolverCustomizer> pageableResolverCustomizer;
 	private @Autowired Optional<SortHandlerMethodArgumentResolverCustomizer> sortResolverCustomizer;
@@ -96,10 +97,10 @@ public void setBeanClassLoader(ClassLoader classLoader) {
 	 * @see org.springframework.data.web.config.SpringDataWebConfiguration#pageableResolver()
 	 */
 	@Bean
-	public PageableHandlerMethodArgumentResolver pageableResolver(SortHandlerMethodArgumentResolver sortResolver) {
+	public PageableHandlerMethodArgumentResolver pageableResolver() {
 
 		PageableHandlerMethodArgumentResolver pageableResolver = //
-				new PageableHandlerMethodArgumentResolver(sortResolver);
+				new PageableHandlerMethodArgumentResolver(sortResolver.get());
 		customizePageableResolver(pageableResolver);
 		return pageableResolver;
 	}
@@ -143,8 +144,8 @@ public void addFormatters(FormatterRegistry registry) {
 	@Override
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
 
-		argumentResolvers.add(this.sortResolver.get());
-		argumentResolvers.add(this.pageableResolver.get());
+		argumentResolvers.add(sortResolver.get());
+		argumentResolvers.add(pageableResolver.get());
 
 		ProxyingHandlerMethodArgumentResolver resolver = new ProxyingHandlerMethodArgumentResolver(conversionService, true);
 		resolver.setBeanFactory(context);
@@ -193,5 +194,4 @@ private void forwardBeanClassLoader(BeanClassLoaderAware target) {
 			target.setBeanClassLoader(beanClassLoader);
 		}
 	}
-
 }