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

Merge branch 'master' of github.com:SpringSource/spring-data-rest

Browse Source
This commit is contained in:
Jon Brisbin
2012-10-11 10:38:39 -05:00
parent 4b6a408b5a 72691f2d16
commit 96a37b490f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BaseUriMethodArgumentResolver.java
View File

@@ -17,8 +17,8 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
*/
public class BaseUriMethodArgumentResolver implements HandlerMethodArgumentResolver {
@Autowired
private RepositoryRestConfiguration config;
@Autowired(required = false)
private RepositoryRestConfiguration config = RepositoryRestConfiguration.DEFAULT;
@Override public boolean supportsParameter(MethodParameter parameter) {
return (RepositoryRestController.class.isAssignableFrom(parameter.getDeclaringClass())

4
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PagingAndSortingMethodArgumentResolver.java
View File

@@ -27,8 +27,8 @@ public class PagingAndSortingMethodArgumentResolver implements HandlerMethodArgu
private static final int DEFAULT_PAGE = 1; // We're 1-based, not 0-based
@Autowired
private RepositoryRestConfiguration config;
@Autowired(required = false)
private RepositoryRestConfiguration config = RepositoryRestConfiguration.DEFAULT;
@Override public boolean supportsParameter(MethodParameter parameter) {
return ClassUtils.isAssignable(parameter.getParameterType(), PagingAndSorting.class);