diff --git a/pom.xml b/pom.xml index 078c62331..a023c37b2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT GBIF Registry Parent GBIF Registry project diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index b7c853566..391154518 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 6d4aac988..529b6f64a 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 7db13a938..a2a1e3da0 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index e2252285f..ec473d1b4 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 49777d852..d5ff9fabf 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index edfc91e50..4bcd8a92e 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 registry-examples - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index dd55b21f0..10bb8dbbf 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index c00d6e4aa..76d85aaee 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java index 0a85c1685..0bad6a910 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java @@ -1164,6 +1164,18 @@ public void testListByType(ServiceType serviceType) { assertResultsOfSize(service.listByType(DatasetType.SAMPLING_EVENT, new PagingRequest()), 4); } + @ParameterizedTest + @EnumSource(ServiceType.class) + public void testListLimits(ServiceType serviceType) { + DatasetService service = (DatasetService) getService(serviceType); + + // test high limit + DatasetRequestSearchParams searchParams = new DatasetRequestSearchParams(); + searchParams.setLimit(301); + assertThrows(IllegalArgumentException.class, () -> service.list(searchParams)); + assertThrows(IllegalArgumentException.class, () -> service.listDeleted(searchParams)); + } + @ParameterizedTest @EnumSource(ServiceType.class) public void testList(ServiceType serviceType) { diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index d7e38315f..85cf2b77b 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 0e0c72344..fe9074421 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9da60ebec..7ca2983ba 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 33adffb44..0e837a3e6 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index b3b40f784..877b8c73a 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 3a6f80bb0..424bddddf 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 54c85081e..7dbde9d11 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 86adf0bf6..066f4829d 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 1bcab91f8..3321f079c 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 1083542c4..299fced25 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index b1d377005..c0f42c492 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.94.10-SNAPSHOT + 3.94.11-SNAPSHOT registry-ws GBIF Registry Webservices diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/DatasetResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/DatasetResource.java index 53542061f..d2a510493 100644 --- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/DatasetResource.java +++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/DatasetResource.java @@ -474,6 +474,11 @@ private PagingResponse listInternal( request = new DatasetRequestSearchParams(); } + // A high limit might cause outages due to the high amount of data to be loaded + if (request.getPage().getLimit() > 300) { + throw new IllegalArgumentException("The maximum limit allowed is 300"); + } + DatasetListParams listParams = DatasetListParams.builder() .query(parseQuery(request.getQ()))