diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/_ListSecurityGroupsRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/_ListSecurityGroupsRequest.java index 2ec1c16369..e8a4a0be88 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/_ListSecurityGroupsRequest.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/securitygroups/_ListSecurityGroupsRequest.java @@ -14,7 +14,7 @@ package org.cloudfoundry.client.v3.securitygroups; -import org.cloudfoundry.client.v2.PaginatedRequest; +import org.cloudfoundry.client.v3.PaginatedRequest; import org.immutables.value.Value; import org.cloudfoundry.client.v3.FilterParameter; import org.cloudfoundry.Nullable; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/SecurityGroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/SecurityGroupsTest.java index 2b8a0d4be1..30d8de45af 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/SecurityGroupsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/SecurityGroupsTest.java @@ -18,6 +18,7 @@ import java.time.Duration; import java.util.Arrays; +import java.util.Collections; import org.cloudfoundry.AbstractIntegrationTest; import org.cloudfoundry.client.CloudFoundryClient; import org.cloudfoundry.client.v3.securitygroups.BindRunningSecurityGroupRequest; @@ -34,6 +35,7 @@ import org.cloudfoundry.client.v3.securitygroups.UnbindRunningSecurityGroupRequest; import org.cloudfoundry.client.v3.securitygroups.UnbindStagingSecurityGroupRequest; import org.cloudfoundry.client.v3.securitygroups.UpdateSecurityGroupRequest; +import org.cloudfoundry.util.PaginationUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -196,6 +198,32 @@ public void listStaging() { .verify(Duration.ofMinutes(5)); } + @Test + public void listWithPagination() { + this.securityGroup + .flux() + .flatMap( + securityGroup -> + PaginationUtils.requestClientV3Resources( + page -> + cloudFoundryClient + .securityGroupsV3() + .list( + ListSecurityGroupsRequest.builder() + .page(page) + .perPage(1) + .names( + Collections + .singletonList( + securityGroup + .getName())) + .build()))) + .as(StepVerifier::create) + .expectNextCount(1) + .expectComplete() + .verify(Duration.ofMinutes(5)); + } + @Test public void bindStagingSecurityGroup() { Mono.zip(this.securityGroup, this.spaceId)