Merge branch '890-event-parameters' into 2.x

Author: twoseat

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

@@ -36,6 +36,20 @@ abstract class _ListEventsRequest extends PaginatedRequest {
     @Nullable
     abstract List<String> getActees();
 
+    /**
+     * The organization ids
+     */
+    @FilterParameter("organization_guid")
+    @Nullable
+    abstract List<String> getOrganizationIds();
+
+    /**
+     * The space ids
+     */
+    @FilterParameter("space_guid")
+    @Nullable
+    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 {
 
@@ -89,6 +88,42 @@ public void listFilterByActee() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @Test
+    public void listFilterByOrganizationId() {
+        getFirstEvent(this.cloudFoundryClient)
+            .then(resource -> Mono.when(
+                Mono.just(resource),
+                this.cloudFoundryClient.events()
+                    .list(ListEventsRequest.builder()
+                        .organizationId(ResourceUtils.getEntity(resource).getOrganizationId())
+                        .build())
+                    .flatMapMany(ResourceUtils::getResources)
+                    .next()
+            ))
+            .as(StepVerifier::create)
+            .consumeNextWith(tupleEquality())
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
+    }
+
+    @Test
+    public void listFilterBySpaceId() {
+        getFirstEvent(this.cloudFoundryClient)
+            .then(resource -> Mono.when(
+                Mono.just(resource),
+                this.cloudFoundryClient.events()
+                    .list(ListEventsRequest.builder()
+                        .spaceId(ResourceUtils.getEntity(resource).getSpaceId())
+                        .build())
+                    .flatMapMany(ResourceUtils::getResources)
+                    .next()
+            ))
+            .as(StepVerifier::create)
+            .consumeNextWith(tupleEquality())
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
+    }
+
     @Test
     public void listFilterByTimestamp() {
         getFirstEvent(this.cloudFoundryClient)