Create User must user-id must be optional since users may be created using username and origin and integration clean up should use version 3

Author: SaifuddinMerchant

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/users/_CreateUserRequest.java

@@ -32,6 +32,7 @@ abstract class _CreateUserRequest {
      * Unique identifier for the user. For UAA users this will match the UAA user ID; in the case of UAA clients, this will match the UAA client ID
      */
     @JsonProperty("guid")
+    @Nullable
     abstract String getUserId();
 
     /**

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/users/CreateUserRequestTest.java

@@ -16,18 +16,12 @@
 
 package org.cloudfoundry.client.v3.users;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import org.junit.jupiter.api.Test;
 
 class CreateUserRequestTest {
-    @Test
-    void noUserId() {
-        assertThrows(IllegalStateException.class, () -> CreateUserRequest.builder().build());
-    }
 
     @Test
     void valid() {
-        CreateUserRequest.builder().userId("test-user-id").build();
+        CreateUserRequest.builder().build();
     }
 }

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

@@ -73,7 +73,6 @@
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.ListUserProvidedServiceInstancesRequest;
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.RemoveUserProvidedServiceInstanceRouteRequest;
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.UserProvidedServiceInstanceResource;
-import org.cloudfoundry.client.v2.users.UserResource;
 import org.cloudfoundry.client.v3.Metadata;
 import org.cloudfoundry.client.v3.Relationship;
 import org.cloudfoundry.client.v3.applications.Application;
@@ -86,6 +85,7 @@
 import org.cloudfoundry.client.v3.spaces.GetSpaceResponse;
 import org.cloudfoundry.client.v3.spaces.UpdateSpaceRequest;
 import org.cloudfoundry.client.v3.spaces.UpdateSpaceResponse;
+import org.cloudfoundry.client.v3.users.UserResource;
 import org.cloudfoundry.networking.NetworkingClient;
 import org.cloudfoundry.networking.v1.policies.DeletePoliciesRequest;
 import org.cloudfoundry.networking.v1.policies.Destination;
@@ -213,7 +213,7 @@ void clean() {
                                 cleanSpaceQuotaDefinitions(
                                         this.cloudFoundryClient, this.nameFactory),
                                 cleanStacks(this.cloudFoundryClient, this.nameFactory),
-                                cleanUsers(this.cloudFoundryClient, this.nameFactory)))
+                                cleanUsersV3(this.cloudFoundryClient, this.nameFactory)))
                 .thenMany(
                         Mono.when(
                                 cleanApplicationsV3(
@@ -1043,35 +1043,29 @@ private static Flux<Void> cleanUserProvidedServiceInstances(
                                                                 t)));
     }
 
-    private static Flux<Void> cleanUsers(
+    private static Flux<Void> cleanUsersV3(
             CloudFoundryClient cloudFoundryClient, NameFactory nameFactory) {
-        return PaginationUtils.requestClientV2Resources(
+        return PaginationUtils.requestClientV3Resources(
                         page ->
                                 cloudFoundryClient
-                                        .users()
+                                        .usersV3()
                                         .list(
-                                                org.cloudfoundry.client.v2.users.ListUsersRequest
+                                                org.cloudfoundry.client.v3.users.ListUsersRequest
                                                         .builder()
                                                         .page(page)
                                                         .build()))
                 .filter(resource -> isCleanable(nameFactory, resource))
-                .map(resource -> resource.getMetadata().getId())
+                .map(UserResource::getId)
                 .flatMap(
                         userId ->
                                 cloudFoundryClient
-                                        .users()
+                                        .usersV3()
                                         .delete(
-                                                org.cloudfoundry.client.v2.users.DeleteUserRequest
+                                                org.cloudfoundry.client.v3.users.DeleteUserRequest
                                                         .builder()
-                                                        .async(true)
                                                         .userId(userId)
                                                         .build())
-                                        .flatMapMany(
-                                                job ->
-                                                        JobUtils.waitForCompletion(
-                                                                cloudFoundryClient,
-                                                                Duration.ofMinutes(5),
-                                                                job))
+                                        .then()
                                         .doOnError(
                                                 t ->
                                                         LOGGER.error(
@@ -1150,12 +1144,12 @@ private static Flux<Void> ifCfVersion(
             CloudFoundryVersion expectedVersion,
             Version serverVersion,
             Supplier<Flux<Void>> supplier) {
-        return serverVersion.lessThan(expectedVersion.getVersion()) ? Flux.empty() : supplier.get();
+        return serverVersion.isLowerThan(expectedVersion.getVersion()) ? Flux.empty() : supplier.get();
     }
 
     private static boolean isCleanable(NameFactory nameFactory, UserResource resource) {
-        return nameFactory.isUserId(ResourceUtils.getId(resource))
-                || nameFactory.isUserName(ResourceUtils.getEntity(resource).getUsername());
+        return nameFactory.isUserId(resource.getId())
+                || nameFactory.isUserName(resource.getUsername());
     }
 
     private static Flux<Void> removeApplicationServiceBindings(