Merge branch '2.x'

Author: twoseat

integration-test/src/test/java/org/cloudfoundry/CloudFoundryCleaner.java

@@ -162,10 +162,12 @@ void clean() {
                 cleanServiceBrokers(this.cloudFoundryClient, this.nameFactory),
                 cleanSpaceQuotaDefinitions(this.cloudFoundryClient, this.nameFactory),
                 cleanStacks(this.cloudFoundryClient, this.nameFactory),
-                cleanUsers(this.cloudFoundryClient, this.nameFactory),
-                cleanUsers(this.uaaClient, this.nameFactory)
+                cleanUsers(this.cloudFoundryClient, this.nameFactory)
+            ))
+            .thenMany(Mono.when(
+                cleanApplicationsV2(this.cloudFoundryClient, this.nameFactory), // After Routes, cannot run with other cleanApps
+                cleanUsers(this.uaaClient, this.nameFactory) // After CF Users
             ))
-            .thenMany(cleanApplicationsV2(this.cloudFoundryClient, this.nameFactory)) // After Routes, cannot run with other cleanApps
             .thenMany(Mono.when( // After Routes/Applications
                 cleanPrivateDomains(this.cloudFoundryClient, this.nameFactory),
                 cleanSharedDomains(this.cloudFoundryClient, this.nameFactory),
@@ -546,8 +548,8 @@ private static Flux<Void> cleanUsers(CloudFoundryClient cloudFoundryClient, Name
                     .async(true)
                     .userId(userId)
                     .build())
-                .doOnError(t -> LOGGER.error("Unable to delete user {}", userId, t)))
-            .flatMap(job -> JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(5), job));
+                .flatMapMany(job -> JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(5), job))
+                .doOnError(t -> LOGGER.error("Unable to delete user {}", userId, t)));
     }
 
     private static Flux<Void> cleanUsers(UaaClient uaaClient, NameFactory nameFactory) {
@@ -593,7 +595,7 @@ private static Flux<Void> ifCfVersion(CloudFoundryVersion expectedVersion, Versi
     }
 
     private static boolean isCleanable(NameFactory nameFactory, UserResource resource) {
-        return nameFactory.isUserId(ResourceUtils.getId(resource)) || nameFactory.isUserId(ResourceUtils.getEntity(resource).getUsername());
+        return nameFactory.isUserId(ResourceUtils.getId(resource)) || nameFactory.isUserName(ResourceUtils.getEntity(resource).getUsername());
     }
 
     private static Flux<Void> removeApplicationServiceBindings(CloudFoundryClient cloudFoundryClient, ApplicationResource application) {

integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java

@@ -50,7 +50,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;