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

DATACMNS-388 - Improve declaration of PagedResourceAssembler in JavaConfig.

Browse Source 
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
This commit is contained in:
Ben Hale
2013-10-27 14:31:07 +00:00
committed by Oliver Gierke
parent ae9ee5b428
commit 3a7acf29d7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java
View File

@@ -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<Object> pagedResourcesAssembler() {
public PagedResourcesAssembler<?> pagedResourcesAssembler() {
return new PagedResourcesAssembler<Object>(pageableResolver(), null);
}