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

DATAREST-1427 - Fixed handling of unpaged Pageable values.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-09-25 14:27:00 +02:00
parent 051479481b
commit 384e0ed0cd
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/MappingAwarePageableArgumentResolver.java
View File

@@ -65,11 +65,12 @@ public class MappingAwarePageableArgumentResolver implements HandlerMethodArgume
Pageable pageable = delegate.resolveArgument(methodParameter, mavContainer, webRequest, binderFactory); Pageable pageable = delegate.resolveArgument(methodParameter, mavContainer, webRequest, binderFactory);
if (pageable == null || pageable.getSort() == null) { if (pageable.isUnpaged() || pageable.getSort().isUnsorted()) {
return pageable; return pageable;
} }
Sort translated = translator.translateSort(pageable.getSort(), methodParameter, webRequest); Sort translated = translator.translateSort(pageable.getSort(), methodParameter, webRequest);
return PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), translated); return PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), translated);
} }
} }

12
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/MappingAwarePageableArgumentResolverUnitTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2016-2018 original author or authors. * Copyright 2016-2019 original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
* Unit tests for {@link MappingAwarePageableArgumentResolver}. * Unit tests for {@link MappingAwarePageableArgumentResolver}.
* *
* @author Mark Paluch * @author Mark Paluch
* @author Oliver Drotbohm
*/ */
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class MappingAwarePageableArgumentResolverUnitTests { public class MappingAwarePageableArgumentResolverUnitTests {
@@ -82,14 +83,17 @@ public class MappingAwarePageableArgumentResolverUnitTests {
assertThat(result.getPageSize()).isEqualTo(1); assertThat(result.getPageSize()).isEqualTo(1);
assertThat(result.getPageNumber()).isEqualTo(0); assertThat(result.getPageNumber()).isEqualTo(0);
assertThat(result.getSort()).isNull(); assertThat(result.getSort().isUnsorted()).isTrue();
} }
@Test // DATAREST-906 @Test // DATAREST-906
public void resolveArgumentShouldReturnNoPageable() throws Exception { public void resolveArgumentShouldReturnUnpagedPageable() throws Exception {
when(delegate.resolveArgument(parameter, modelAndViewContainer, webRequest, binderFactory))
.thenReturn(Pageable.unpaged());
Pageable result = resolver.resolveArgument(parameter, modelAndViewContainer, webRequest, binderFactory); Pageable result = resolver.resolveArgument(parameter, modelAndViewContainer, webRequest, binderFactory);
assertThat(result).isNull(); assertThat(result.isUnpaged()).isTrue();
} }
} }