Polishing

This commit tweaks some formatting, adds a missing unit test, and adds
integration tests.

[resolves #1079]

Signed-off-by: Paul Harris <harrisp@vmware.com>

Author: twoseat

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/Role.java

@@ -17,23 +17,24 @@
 package org.cloudfoundry.client.v3.roles;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.cloudfoundry.client.v3.Resource;
 
 /**
  * Base class for responses that are roles
  */
 public abstract class Role extends Resource {
 
-    /**
-     * The type
-     */
-    @JsonProperty("type")
-    public abstract RoleType getType();
-
     /**
      * Relationships of the role
      */
     @JsonProperty("relationships")
     public abstract RoleRelationships getRelationships();
 
+    /**
+     * The type
+     */
+    @JsonProperty("type")
+    public abstract RoleType getType();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/RoleType.java

@@ -31,24 +31,24 @@
 public enum RoleType {
 
     /**
-     * organization_user role type
+     * organization_auditor role type
      */
-    ORGANIZATION_USER,
+    ORGANIZATION_AUDITOR,
 
     /**
-     * organization_auditor role type
+     * organization_billing_manager role type
      */
-    ORGANIZATION_AUDITOR,
+    ORGANIZATION_BILLING_MANAGER,
 
     /**
      * organization_manager role type
      */
     ORGANIZATION_MANAGER,
 
     /**
-     * organization_billing_manager role type
+     * organization_user role type
      */
-    ORGANIZATION_BILLING_MANAGER,
+    ORGANIZATION_USER,
 
     /**
      * space_auditor role type
@@ -65,8 +65,8 @@ public enum RoleType {
      */
     SPACE_MANAGER;
 
-    public static final Set<RoleType> ORGANIZATION_ROLE_TYPES = EnumSet.of(ORGANIZATION_USER, ORGANIZATION_AUDITOR,
-        ORGANIZATION_MANAGER, ORGANIZATION_BILLING_MANAGER);
+    public static final Set<RoleType> ORGANIZATION_ROLE_TYPES = EnumSet.of(ORGANIZATION_AUDITOR, ORGANIZATION_BILLING_MANAGER, ORGANIZATION_MANAGER, ORGANIZATION_USER);
+
     public static final Set<RoleType> SPACE_ROLE_TYPES = EnumSet.of(SPACE_AUDITOR, SPACE_DEVELOPER, SPACE_MANAGER);
 
     private static final Map<String, RoleType> NAMES_TO_VALUES = Arrays.stream(RoleType.values())

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/_CreateRoleRequest.java

@@ -27,18 +27,6 @@
 @Value.Immutable
 abstract class _CreateRoleRequest {
 
-    /**
-     * The type
-     */
-    @JsonProperty("type")
-    abstract RoleType getType();
-
-    /**
-     * The relationships
-     */
-    @JsonProperty("relationships")
-    abstract RoleRelationships getRelationships();
-
     @Value.Check
     protected void validateRelationships() {
         if (RoleType.ORGANIZATION_ROLE_TYPES.contains(getType()) && getRelationships().getOrganization() == null) {
@@ -49,4 +37,16 @@ protected void validateRelationships() {
         }
     }
 
+    /**
+     * The relationships
+     */
+    @JsonProperty("relationships")
+    abstract RoleRelationships getRelationships();
+
+    /**
+     * The type
+     */
+    @JsonProperty("type")
+    abstract RoleType getType();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/_ListRolesRequest.java

@@ -32,13 +32,13 @@ abstract class _ListRolesRequest extends PaginatedRequest {
      * The role ids filter
      */
     @FilterParameter("guids")
-    abstract List<String> getIds();
+    abstract List<String> getRoleIds();
 
     /**
-     * The types filter
+     * The organization ids filter
      */
-    @FilterParameter("types")
-    abstract List<RoleType> getTypes();
+    @FilterParameter("organization_guids")
+    abstract List<String> getOrganizationIds();
 
     /**
      * The space ids filter
@@ -47,10 +47,10 @@ abstract class _ListRolesRequest extends PaginatedRequest {
     abstract List<String> getSpaceIds();
 
     /**
-     * The organization ids filter
+     * The types filter
      */
-    @FilterParameter("organization_guids")
-    abstract List<String> getOrganizationIds();
+    @FilterParameter("types")
+    abstract List<RoleType> getTypes();
 
     /**
      * The user ids filter

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/_RoleRelationships.java

@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.Nullable;
 import org.cloudfoundry.client.v3.ToOneRelationship;
 import org.immutables.value.Value;
@@ -30,10 +31,11 @@
 abstract class _RoleRelationships {
 
     /**
-     * The user relationship
+     * The organization relationship
      */
-    @JsonProperty("user")
-    abstract ToOneRelationship getUser();
+    @JsonProperty("organization")
+    @Nullable
+    abstract ToOneRelationship getOrganization();
 
     /**
      * The space relationship
@@ -43,10 +45,9 @@ abstract class _RoleRelationships {
     abstract ToOneRelationship getSpace();
 
     /**
-     * The organization relationship
+     * The user relationship
      */
-    @JsonProperty("organization")
-    @Nullable
-    abstract ToOneRelationship getOrganization();
+    @JsonProperty("user")
+    abstract ToOneRelationship getUser();
 
 }

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/CreateRoleRequestTest.java

@@ -37,20 +37,15 @@ public void invalidWithMissingOrgRelationship() {
     }
 
     @Test(expected = IllegalStateException.class)
-    public void invalidWithSpaceRelationship() {
+    public void invalidWithMissingSpaceRelationship() {
         CreateRoleRequest.builder()
-            .type(RoleType.ORGANIZATION_AUDITOR)
+            .type(RoleType.SPACE_AUDITOR)
             .relationships(RoleRelationships.builder()
                 .user(ToOneRelationship.builder()
                     .data(Relationship.builder()
                         .id("test-user-id")
                         .build())
                     .build())
-                .space(ToOneRelationship.builder()
-                    .data(Relationship.builder()
-                        .id("test-space-id")
-                        .build())
-                    .build())
                 .build())
             .build();
     }
@@ -63,47 +58,52 @@ public void invalidWithNoRelationships() {
     }
 
     @Test(expected = IllegalStateException.class)
-    public void invalidWithoutType() {
+    public void invalidWithOrgRelationship() {
         CreateRoleRequest.builder()
+            .type(RoleType.SPACE_AUDITOR)
             .relationships(RoleRelationships.builder()
                 .user(ToOneRelationship.builder()
                     .data(Relationship.builder()
                         .id("test-user-id")
                         .build())
                     .build())
+                .organization(ToOneRelationship.builder()
+                    .data(Relationship.builder()
+                        .id("test-org-id")
+                        .build())
+                    .build())
                 .build())
             .build();
     }
 
     @Test(expected = IllegalStateException.class)
-    public void invalidWithMissingSpaceRelationship() {
+    public void invalidWithSpaceRelationship() {
         CreateRoleRequest.builder()
-            .type(RoleType.SPACE_AUDITOR)
+            .type(RoleType.ORGANIZATION_AUDITOR)
             .relationships(RoleRelationships.builder()
                 .user(ToOneRelationship.builder()
                     .data(Relationship.builder()
                         .id("test-user-id")
                         .build())
                     .build())
+                .space(ToOneRelationship.builder()
+                    .data(Relationship.builder()
+                        .id("test-space-id")
+                        .build())
+                    .build())
                 .build())
             .build();
     }
 
     @Test(expected = IllegalStateException.class)
-    public void invalidWithOrgRelationship() {
+    public void invalidWithoutType() {
         CreateRoleRequest.builder()
-            .type(RoleType.SPACE_AUDITOR)
             .relationships(RoleRelationships.builder()
                 .user(ToOneRelationship.builder()
                     .data(Relationship.builder()
                         .id("test-user-id")
                         .build())
                     .build())
-                .organization(ToOneRelationship.builder()
-                    .data(Relationship.builder()
-                        .id("test-org-id")
-                        .build())
-                    .build())
                 .build())
             .build();
     }

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/roles/ListRolesRequestTest.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.client.v3.roles;
+
+import org.junit.Test;
+
+public class ListRolesRequestTest {
+
+    @Test
+    public void valid() {
+        ListRolesRequest.builder()
+            .build();
+    }
+
+}