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

DATACMNS-563 - Polishing.

Browse Source 
Removed obsolete generics. Rearranged some code for better readability.

Original pull request: #267.
This commit is contained in:
Oliver Gierke
2017-12-30 12:00:15 +01:00
parent da163fc9e4
commit eb2163a29e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2015 the original author or authors.
* Copyright 2013-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@ import org.springframework.web.util.UriComponentsBuilder;
* @since 1.6
* @author Oliver Gierke
* @author Nick Williams
* @author Marcel Overdijk
*/
public class PagedResourcesAssembler<T> implements ResourceAssembler<Page<T>, PagedResources<Resource<T>>> {
@@ -290,11 +291,13 @@ public class PagedResourcesAssembler<T> implements ResourceAssembler<Page<T>, Pa
* @param page must not be {@literal null}.
* @return
*/
private <T> PageMetadata asPageMetadata(Page<T> page) {
private PageMetadata asPageMetadata(Page<?> page) {
Assert.notNull(page, "Page must not be null!");
boolean isOneIndexedParameters = pageableResolver.isOneIndexedParameters();
return new PageMetadata(page.getSize(), isOneIndexedParameters ? page.getNumber() + 1 : page.getNumber(), page.getTotalElements(), page.getTotalPages());
int number = pageableResolver.isOneIndexedParameters() ? page.getNumber() + 1 : page.getNumber();
return new PageMetadata(page.getSize(), number, page.getTotalElements(), page.getTotalPages());
}
private String baseUriOrCurrentRequest() {