Pagination: page parameter renamed to currentPage

cropgeeks · Jul 31, 2023 · 170d038 · 170d038
1 parent d4d4640
commit 170d038
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/uk/ac/hutton/ics/brapi/resource/base/BaseResult.java b/src/main/java/uk/ac/hutton/ics/brapi/resource/base/BaseResult.java
@@ -29,7 +29,7 @@ public BaseResult(T result, int currentPage, int pageSize, long totalCount)
 	public BaseResult(T result, int currentPage, int pageSize, long totalCount, int totalPages)
 	{
 		this.result = result;
-		metadata.setPagination(new Pagination().setPage(currentPage).setPageSize(pageSize).setTotalCount(totalCount).setTotalPages(totalPages));
+		metadata.setPagination(new Pagination().setCurrentPage(currentPage).setPageSize(pageSize).setTotalCount(totalCount).setTotalPages(totalPages));
 	}
 
 	public BaseResult(T result, List<Status> status)

diff --git a/src/main/java/uk/ac/hutton/ics/brapi/resource/base/Pagination.java b/src/main/java/uk/ac/hutton/ics/brapi/resource/base/Pagination.java
@@ -1,5 +1,7 @@
 package uk.ac.hutton.ics.brapi.resource.base;
 
+import com.fasterxml.jackson.annotation.JsonValue;
+
 import lombok.*;
 import lombok.experimental.Accessors;
 
@@ -10,14 +12,14 @@
 public class Pagination
 {
 	private int  pageSize;
-	private int  page;
+	private int  currentPage;
 	private long totalCount;
 	private int  totalPages;
 
 	public Pagination(int pageSize, int page, long totalCount, int desiredPageSize)
 	{
 		this.pageSize = pageSize;
-		this.page = page;
+		this.currentPage = page;
 		this.totalCount = totalCount;
 		this.totalPages = (int) Math.ceil(totalCount / (float) desiredPageSize);
 	}