Polishing

Removes the custom handling of versioned types in the UAA.

[#114246561]

Author: nebhale

cloudfoundry-client-spring/src/main/java/org/cloudfoundry/reactor/uaa/AbstractUaaOperations.java

@@ -34,8 +34,6 @@ public abstract class AbstractUaaOperations extends AbstractReactorOperations {
 
     private static final AsciiString BASIC_PREAMBLE = new AsciiString("Basic ");
 
-    private static final AsciiString IF_MATCH = new AsciiString("If-Match");
-
     protected AbstractUaaOperations(AuthorizationProvider authorizationProvider, HttpClient httpClient, ObjectMapper objectMapper, Mono<String> root) {
         super(authorizationProvider, httpClient, objectMapper, root);
     }
@@ -74,13 +72,6 @@ protected final <T> Mono<T> get(Object request, Class<T> responseType, Function<
         return doGet(responseType, getUriAugmenter(request, uriTransformer), getRequestTransformer(request));
     }
 
-    protected final HttpOutbound ifMatch(HttpOutbound outbound, Integer version) {
-        if (version != null) {
-            outbound.headers().set(IF_MATCH, version);
-        }
-        return outbound;
-    }
-
     protected final <T> Mono<T> post(Object request, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer,
                                      Function<HttpOutbound, HttpOutbound> requestTransformer) {
 

cloudfoundry-client-spring/src/main/java/org/cloudfoundry/reactor/uaa/users/ReactorUsers.java

@@ -64,8 +64,7 @@ public Mono<CreateUserResponse> create(CreateUserRequest request) {
 
     @Override
     public Mono<DeleteUserResponse> delete(DeleteUserRequest request) {
-        return delete(request, DeleteUserResponse.class, builder -> builder.pathSegment("Users", request.getUserId()),
-            outbound -> ifMatch(outbound, request.getVersion()));
+        return delete(request, DeleteUserResponse.class, builder -> builder.pathSegment("Users", request.getUserId()));
     }
 
     @Override

cloudfoundry-client-spring/src/test/java/org/cloudfoundry/reactor/uaa/users/ReactorUsersTest.java

@@ -243,6 +243,7 @@ protected InteractionContext getInteractionContext() {
             return InteractionContext.builder()
                 .request(TestRequest.builder()
                     .method(DELETE).path("/Users/421225f4-318e-4a4d-9219-4b6a0ed3678a")
+                    .header("If-Match", "*")
                     .build())
                 .response(TestResponse.builder()
                     .status(OK)
@@ -364,7 +365,7 @@ protected DeleteUserResponse getResponse() {
         protected DeleteUserRequest getValidRequest() throws Exception {
             return DeleteUserRequest.builder()
                 .userId("421225f4-318e-4a4d-9219-4b6a0ed3678a")
-                .version(0)
+                .version("*")
                 .build();
         }
 

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/Versioned.java

@@ -17,6 +17,7 @@
 package org.cloudfoundry.uaa;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.cloudfoundry.Nullable;
 
 /**
  * An interface that indicates that a UAA request can specify an If Match in its header
@@ -29,6 +30,7 @@ public interface Versioned {
      * @return the version
      */
     @JsonIgnore
+    @Nullable
     String getVersion();
 
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/users/_DeleteUserRequest.java

@@ -17,26 +17,19 @@
 package org.cloudfoundry.uaa.users;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.cloudfoundry.Nullable;
+import org.cloudfoundry.uaa.Versioned;
 import org.immutables.value.Value;
 
 /**
  * The request payload for the delete user operation
  */
 @Value.Immutable
-abstract class _DeleteUserRequest {
+abstract class _DeleteUserRequest implements Versioned {
 
     /**
      * The user id
      */
     @JsonIgnore
     abstract String getUserId();
 
-    /**
-     * The version of the SCIM object to be deleted
-     */
-    @JsonIgnore
-    @Nullable
-    abstract Integer getVersion();
-
-}
+}

cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/DeleteUserRequestTest.java

@@ -30,7 +30,6 @@ public void noName() {
     public void valid() {
         DeleteUserRequest.builder()
             .userId("test-user-id")
-            .version(1)
             .build();
     }
 

cloudfoundry-client/src/test/java/org/cloudfoundry/uaa/users/UpdateUserRequestTest.java

@@ -37,23 +37,6 @@ public void noId() {
             .build();
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void noVersion() {
-        UpdateUserRequest.builder()
-            .active(true)
-            .email(Email.builder()
-                .primary(true)
-                .value("john.doe@pivotal.io")
-                .build())
-            .id("user-id")
-            .name(Name.builder()
-                .familyName("Doe")
-                .givenName("John")
-                .build())
-            .userName("jdoe")
-            .build();
-    }
-
     @Test(expected = IllegalStateException.class)
     public void noName() {
         UpdateUserRequest.builder()