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

#89 - Tweaked assertions in PageMetadata.

Browse Source 
PageMetadata doesn't reject empty pages anymore if they're used with 1-indexed Pageables. Also tweaked the assertions to only reject negative values for now.
This commit is contained in:
Oliver Gierke
2013-08-26 18:08:46 +02:00
parent 9ee4552bfe
commit 64d2554325
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/hateoas/PagedResources.java
View File

@@ -204,8 +204,10 @@ public class PagedResources<T> extends Resources<T> {
*/
public PageMetadata(long size, long number, long totalElements, long totalPages) {
Assert.isTrue(number < totalPages,
"The current page number cannot be greater or equal to the total number of pages!");
Assert.isTrue(size > -1, "Size must not be negative!");
Assert.isTrue(number > -1, "Number must not be negative!");
Assert.isTrue(totalElements > -1, "Total elements must not be negative!");
Assert.isTrue(totalPages > -1, "Total pages must not be negative!");
this.size = size;
this.number = number;
@@ -221,7 +223,7 @@ public class PagedResources<T> extends Resources<T> {
* @param totalElements the total number of elements available
*/
public PageMetadata(long size, long number, long totalElements) {
this(size, number, totalElements, totalElements / size);
this(size, number, totalElements, size == 0 ? 0 : totalElements / size);
}
/**