Fix CI Failures

A previous commit did not allow properly for possible existing test data, and made
overly-optimistic assumptions about what actions could be parallelized. This commit
makes the test more forgiving.

Author: twoseat

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

@@ -116,7 +116,7 @@ public void listAfterServiceUsageEventId() {
     public void listFilterByServiceId() {
         Mono.when(this.serviceBrokerId, this.spaceId)
             .then(function((serviceBrokerId, spaceId) -> seedEvents(this.cloudFoundryClient, this.nameFactory, serviceBrokerId, spaceId)))
-            .then(getFirstEvent(this.cloudFoundryClient))
+            .then(getFirstEventWithServiceId(this.cloudFoundryClient))
             .then(resource -> Mono.when(
                 Mono.just(resource),
                 this.cloudFoundryClient.serviceUsageEvents()
@@ -179,6 +179,12 @@ private static Mono<ServiceUsageEventResource> getFirstEvent(CloudFoundryClient
             .next();
     }
 
+    private static Mono<ServiceUsageEventResource> getFirstEventWithServiceId(CloudFoundryClient cloudFoundryClient) {
+        return listServiceUsageEvents(cloudFoundryClient)
+            .filter(resource -> ResourceUtils.getEntity(resource).getServiceId() != null)
+            .next();
+    }
+
     private static Mono<String> getPlanId(CloudFoundryClient cloudFoundryClient, String serviceBrokerId) {
         return requestListServices(cloudFoundryClient, serviceBrokerId)
             .single()
@@ -198,8 +204,7 @@ private static Flux<ServiceUsageEventResource> listServiceUsageEvents(CloudFound
         return cloudFoundryClient.serviceUsageEvents()
             .list(ListServiceUsageEventsRequest.builder()
                 .build())
-            .flatMapMany(ResourceUtils::getResources)
-            .filter(resource -> ResourceUtils.getEntity(resource).getServiceId() != null);
+            .flatMapMany(ResourceUtils::getResources);
     }
 
     private static Mono<CreateServiceInstanceResponse> requestCreateServiceInstance(CloudFoundryClient cloudFoundryClient, String planId, String serviceInstanceName, String spaceId) {
@@ -235,11 +240,8 @@ private static Mono<Void> seedEvents(CloudFoundryClient cloudFoundryClient, Name
         String serviceInstanceName2 = nameFactory.getServiceInstanceName();
 
         return getPlanId(cloudFoundryClient, serviceBrokerId)
-            .then(planId -> Mono
-                .when(
-                    requestCreateServiceInstance(cloudFoundryClient, planId, serviceInstanceName1, spaceId),
-                    requestCreateServiceInstance(cloudFoundryClient, planId, serviceInstanceName2, spaceId)
-                ))
+            .then(planId -> requestCreateServiceInstance(cloudFoundryClient, planId, serviceInstanceName1, spaceId)
+                .then(requestCreateServiceInstance(cloudFoundryClient, planId, serviceInstanceName2, spaceId)))
             .then();
     }