Fix: Fallback Values for Pagination (#194)

* Add Fallback Values for Pagination * Renove obsolete testcase * More robust
eu-digital-green-certificates · Jul 21, 2022 · 617e48e · 617e48e
1 parent ee51852
commit 617e48e
Show file tree

Hide file tree

Showing 2 changed files with 427 additions and 377 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/TrustListController.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/TrustListController.java
@@ -149,8 +149,11 @@ public ResponseEntity<List<TrustListDto>> downloadTrustList(
     ) {
         List<TrustListDto> trustList;
         if (isPaginationRequired(page,size)) {
+            page = (page != null && page >= 0) ? page : 0;
+            size = (size != null && size >= 0) ? size : 100;
+
             trustList = trustListMapper.trustListToTrustListDto(
-                trustListService.getTrustList(ifModifiedSince, page, size));
+                    trustListService.getTrustList(ifModifiedSince, page, size));
         } else {
             trustList = trustListMapper.trustListToTrustListDto(
                 trustListService.getTrustList(ifModifiedSince, null, null));
@@ -240,8 +243,11 @@ public ResponseEntity<List<TrustListDto>> downloadTrustListFilteredByType(
         TrustListType mappedType = trustListMapper.certificateTypeDtoToTrustListType(type);
         List<TrustListDto> trustList;
         if (isPaginationRequired(page,size)) {
+            page = (page != null && page >= 0) ? page : 0;
+            size = (size != null && size >= 0) ? size : 100;
+
             trustList = trustListMapper.trustListToTrustListDto(
-                trustListService.getTrustList(mappedType, ifModifiedSince, page, size));
+                    trustListService.getTrustList(mappedType, ifModifiedSince, page, size));
         } else {
             trustList = trustListMapper.trustListToTrustListDto(
                 trustListService.getTrustList(mappedType, ifModifiedSince, null, null));
@@ -342,8 +348,11 @@ public ResponseEntity<List<TrustListDto>> downloadTrustListFilteredByCountryAndT
 
         List<TrustListDto> trustList;
         if (isPaginationRequired(page,size)) {
+            page = (page != null && page >= 0) ? page : 0;
+            size = (size != null && size >= 0) ? size : 100;
+
             trustList = trustListMapper.trustListToTrustListDto(
-                trustListService.getTrustList(mappedType, countryCode, ifModifiedSince, page, size));
+                    trustListService.getTrustList(mappedType, countryCode, ifModifiedSince, page, size));
         } else {
             trustList = trustListMapper.trustListToTrustListDto(
                 trustListService.getTrustList(mappedType, countryCode, ifModifiedSince, null, null));
@@ -409,6 +418,6 @@ public ResponseEntity<List<TrustedIssuerDto>> getTrustedIssuersByCountry(
     }
 
     private boolean isPaginationRequired(Integer page, Integer size) {
-        return page != null && size != null && page >= 0 && size > 0;
+        return (page != null && page >= 0) || (size != null && size >= 0);
     }
 }