Polishing

[resolves #889, resolves #890]

Author: twoseat

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/events/_ListEventsRequest.java

@@ -37,18 +37,18 @@ abstract class _ListEventsRequest extends PaginatedRequest {
     abstract List<String> getActees();
 
     /**
-     * The organization id
+     * The organization ids
      */
     @FilterParameter("organization_guid")
     @Nullable
-    abstract List<String> getOrganizationId();
+    abstract List<String> getOrganizationIds();
 
     /**
-     * The space id
+     * The space ids
      */
     @FilterParameter("space_guid")
     @Nullable
-    abstract List<String> getSpaceId();
+    abstract List<String> getSpaceIds();
 
     /**
      * The timestamps

integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java

@@ -29,7 +29,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 public final class EventsTest extends AbstractIntegrationTest {
 
@@ -90,13 +89,13 @@ public void listFilterByActee() {
     }
 
     @Test
-    public void listFilterByTimestamp() {
+    public void listFilterByOrganizationId() {
         getFirstEvent(this.cloudFoundryClient)
             .then(resource -> Mono.when(
                 Mono.just(resource),
                 this.cloudFoundryClient.events()
                     .list(ListEventsRequest.builder()
-                        .timestamp(ResourceUtils.getEntity(resource).getTimestamp())
+                        .organizationId(ResourceUtils.getEntity(resource).getOrganizationId())
                         .build())
                     .flatMapMany(ResourceUtils::getResources)
                     .next()
@@ -108,13 +107,13 @@ public void listFilterByTimestamp() {
     }
 
     @Test
-    public void listFilterByType() {
+    public void listFilterBySpaceId() {
         getFirstEvent(this.cloudFoundryClient)
             .then(resource -> Mono.when(
                 Mono.just(resource),
                 this.cloudFoundryClient.events()
                     .list(ListEventsRequest.builder()
-                        .type(ResourceUtils.getEntity(resource).getType())
+                        .spaceId(ResourceUtils.getEntity(resource).getSpaceId())
                         .build())
                     .flatMapMany(ResourceUtils::getResources)
                     .next()
@@ -126,13 +125,13 @@ public void listFilterByType() {
     }
 
     @Test
-    public void listFilterByOrganizationId(){
+    public void listFilterByTimestamp() {
         getFirstEvent(this.cloudFoundryClient)
-            .flatMap(resource -> Mono.zip(
+            .then(resource -> Mono.when(
                 Mono.just(resource),
                 this.cloudFoundryClient.events()
                     .list(ListEventsRequest.builder()
-                        .spaceId(ResourceUtils.getEntity(resource).getOrganizationId())
+                        .timestamp(ResourceUtils.getEntity(resource).getTimestamp())
                         .build())
                     .flatMapMany(ResourceUtils::getResources)
                     .next()
@@ -144,13 +143,13 @@ public void listFilterByOrganizationId(){
     }
 
     @Test
-    public void listFilterBySpaceId() {
+    public void listFilterByType() {
         getFirstEvent(this.cloudFoundryClient)
-            .flatMap(resource -> Mono.zip(
+            .then(resource -> Mono.when(
                 Mono.just(resource),
                 this.cloudFoundryClient.events()
                     .list(ListEventsRequest.builder()
-                        .spaceId(ResourceUtils.getEntity(resource).getSpaceId())
+                        .type(ResourceUtils.getEntity(resource).getType())
                         .build())
                     .flatMapMany(ResourceUtils::getResources)
                     .next()