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

DATACMNS-563 - PagedResourcesAssembler now correctly forwards one-index settings to PageMetadata.

Browse Source 
Original pull request: #267.
This commit is contained in:
Marcel Overdijk
2017-12-29 15:02:30 +01:00
committed by Oliver Gierke
parent e7f6c62ca1
commit da163fc9e4
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/web/PagedResourcesAssembler.java
View File

@@ -290,10 +290,11 @@ public class PagedResourcesAssembler<T> implements ResourceAssembler<Page<T>, Pa
* @param page must not be {@literal null}.
* @return
*/
private static <T> PageMetadata asPageMetadata(Page<T> page) {
private <T> PageMetadata asPageMetadata(Page<T> page) {
Assert.notNull(page, "Page must not be null!");
return new PageMetadata(page.getSize(), page.getNumber(), page.getTotalElements(), page.getTotalPages());
boolean isOneIndexedParameters = pageableResolver.isOneIndexedParameters();
return new PageMetadata(page.getSize(), isOneIndexedParameters ? page.getNumber() + 1 : page.getNumber(), page.getTotalElements(), page.getTotalPages());
}
private String baseUriOrCurrentRequest() {