Skip to content

Commit de14ca2

Browse files
committed
DefaultApplications: add constructor non-reactive params
1 parent 87344b7 commit de14ca2

File tree

5 files changed

+274
-555
lines changed

5 files changed

+274
-555
lines changed

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/_DefaultCloudFoundryOperations.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public Advanced advanced() {
7979
@Override
8080
@Value.Derived
8181
public Applications applications() {
82-
return new DefaultApplications(getCloudFoundryClientPublisher(), getDopplerClientPublisher(), getSpaceId());
82+
return new DefaultApplications(getCloudFoundryClient(), getDopplerClient(), getSpaceId().block());
8383
}
8484

8585
@Override
@@ -318,12 +318,14 @@ private static boolean hasText(CharSequence str) {
318318

319319
private static Flux<OrganizationResource> requestOrganizations(Mono<CloudFoundryClient> cloudFoundryClientPublisher, String organization) {
320320
return cloudFoundryClientPublisher
321-
.flatMapMany(cloudFoundryClient -> PaginationUtils
322-
.requestClientV3Resources(page -> cloudFoundryClient.organizationsV3()
323-
.list(ListOrganizationsRequest.builder()
324-
.name(organization)
325-
.page(page)
326-
.build())));
321+
.flatMapMany(cloudFoundryClient -> PaginationUtils
322+
.requestClientV3Resources(page -> cloudFoundryClient.organizationsV3()
323+
.list(ListOrganizationsRequest.builder()
324+
.name(organization)
325+
.page(page)
326+
.build())
327+
)
328+
);
327329
}
328330

329331
private static Flux<SpaceResource> requestSpaces(Mono<CloudFoundryClient> cloudFoundryClientPublisher, String organizationId, String space) {

0 commit comments

Comments
 (0)