From 3a7acf29d797c76037c15d55a9ae2d1ef56e8925 Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Sun, 27 Oct 2013 14:31:07 +0000 Subject: [PATCH] DATACMNS-388 - Improve declaration of PagedResourceAssembler in JavaConfig. Based on the discussion in SPR-11004 [0], the declaration of the PagedResourcesAssembler in HateoasAwareSpringDataWebConfiguration will not result in it being autowired using Spring 4.0 in certain circumstances. This change loosens the declaration so that it can be autowired into declarations that have specific generics declarations. Original pull request: #51. [1]: https://jira.springsource.org/browse/SPR-11004 --- .../web/config/HateoasAwareSpringDataWebConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java b/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java index f8b6c5956..354dd5ed8 100644 --- a/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java +++ b/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java @@ -31,6 +31,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; * @since 1.6 * @author Oliver Gierke * @author Nick Williams + * @author Ben Hale */ @Configuration public class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfiguration { @@ -56,7 +57,7 @@ public class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfigu } @Bean - public PagedResourcesAssembler pagedResourcesAssembler() { + public PagedResourcesAssembler pagedResourcesAssembler() { return new PagedResourcesAssembler(pageableResolver(), null); }