fix: Fix default values for pagination in tracker exporters

dhis2 · Nov 27, 2023 · 5c12116 · 5c12116
1 parent abcd608
commit 5c12116
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...b-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/PageRequestParams.java b/...b-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/PageRequestParams.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.webapi.controller.tracker.export;
 
-import java.util.Objects;
 import org.hisp.dhis.common.OpenApi;
 
 /**
@@ -61,7 +60,7 @@ public interface PageRequestParams {
    */
   @OpenApi.Ignore
   default boolean isPaged() {
-    return Objects.requireNonNullElse(getSkipPaging(), true);
+    return !Boolean.TRUE.equals(getSkipPaging());
   }
 
   /** Indicates whether to include the total number of items and pages in the paginated response. */

diff --git a/.../src/main/java/org/hisp/dhis/webapi/controller/tracker/export/RequestParamsValidator.java b/.../src/main/java/org/hisp/dhis/webapi/controller/tracker/export/RequestParamsValidator.java
@@ -404,7 +404,7 @@ private static boolean orgUnitModeDoesNotRequireOrgUnit(
 
   public static void validatePaginationParameters(PageRequestParams params)
       throws BadRequestException {
-    if (Boolean.TRUE.equals(params.getSkipPaging())
+    if (!params.isPaged()
         && (ObjectUtils.firstNonNull(params.getPage(), params.getPageSize()) != null
             || Boolean.TRUE.equals(params.getTotalPages()))) {
       throw new BadRequestException(