Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatible with negative page number and size #5311

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions api/src/main/java/run/halo/app/extension/PageRequestImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ public class PageRequestImpl implements PageRequest {

public PageRequestImpl(int pageNumber, int pageSize, Sort sort) {
Assert.notNull(sort, "Sort must not be null");
Assert.isTrue(pageNumber >= 0, "Page index must not be less than zero!");
Assert.isTrue(pageSize >= 0, "Page size must not be less than one!");
if (pageNumber < 1) {
pageNumber = 1;
}
if (pageSize < 0) {
pageSize = 0;
}
this.pageNumber = pageNumber;
this.pageSize = pageSize;
this.sort = sort;
Expand Down
27 changes: 27 additions & 0 deletions api/src/test/java/run/halo/app/extension/PageRequestImplTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package run.halo.app.extension;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.Random;
import org.junit.jupiter.api.RepeatedTest;
import org.springframework.data.domain.Sort;

class PageRequestImplTest {

@RepeatedTest(10)
void shouldBeCompatibleZeroAndNegativePageNumber() {
var randomPageNumber = -(new Random().nextInt(0, Integer.MAX_VALUE));
var page = new PageRequestImpl(randomPageNumber, 10, Sort.unsorted());
assertEquals(1, page.getPageNumber());
assertEquals(10, page.getPageSize());
}

@RepeatedTest(10)
void shouldBeCompatibleNegativePageSize() {
var randomPageSize = -(new Random().nextInt(1, Integer.MAX_VALUE));
var page = new PageRequestImpl(10, randomPageSize, Sort.unsorted());
assertEquals(10, page.getPageNumber());
assertEquals(0, page.getPageSize());
}

}
Loading