From 170d038f7b365fae5a7f02c848f2fdd8a6cf0bc0 Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Mon, 31 Jul 2023 08:06:37 +0200 Subject: [PATCH] Pagination: page parameter renamed to currentPage --- .../uk/ac/hutton/ics/brapi/resource/base/BaseResult.java | 2 +- .../uk/ac/hutton/ics/brapi/resource/base/Pagination.java | 6 ++++-- 2 files changed, 5 insertions(+), 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 index 97ecd38..8c577fe 100644 --- 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) 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 index fcb23fd..783bb0d 100644 --- 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); }