Merge branch '2.x'

twoseat · twoseat · commit 0f8da5d9f59b · 2018-01-18T12:19:51.000Z
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationAuditorByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationAuditorByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _AssociateOrganizationAuditorByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationBillingManagerByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationBillingManagerByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _AssociateOrganizationBillingManagerByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationManagerByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationManagerByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _AssociateOrganizationManagerByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationUserByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_AssociateOrganizationUserByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _AssociateOrganizationUserByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationAuditorByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationAuditorByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _RemoveOrganizationAuditorByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+    
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationBillingManagerByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationBillingManagerByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _RemoveOrganizationBillingManagerByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationManagerByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationManagerByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _RemoveOrganizationManagerByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationUserByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/_RemoveOrganizationUserByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -32,6 +33,13 @@ abstract class _RemoveOrganizationUserByUsernameRequest {
     @JsonIgnore
     abstract String getOrganizationId();
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The username
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_AssociateSpaceAuditorByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_AssociateSpaceAuditorByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -26,6 +27,13 @@
 @Value.Immutable
 abstract class _AssociateSpaceAuditorByUsernameRequest {
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The space id
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_AssociateSpaceDeveloperByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_AssociateSpaceDeveloperByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -26,6 +27,13 @@
 @Value.Immutable
 abstract class _AssociateSpaceDeveloperByUsernameRequest {
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The space id
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_AssociateSpaceManagerByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_AssociateSpaceManagerByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -26,6 +27,13 @@
 @Value.Immutable
 abstract class _AssociateSpaceManagerByUsernameRequest {
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The space id
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_RemoveSpaceAuditorByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_RemoveSpaceAuditorByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -26,6 +27,13 @@
 @Value.Immutable
 abstract class _RemoveSpaceAuditorByUsernameRequest {
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The space id
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_RemoveSpaceDeveloperByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_RemoveSpaceDeveloperByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -26,6 +27,13 @@
 @Value.Immutable
 abstract class _RemoveSpaceDeveloperByUsernameRequest {
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The space id
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_RemoveSpaceManagerByUsernameRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_RemoveSpaceManagerByUsernameRequest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -26,6 +27,13 @@
 @Value.Immutable
 abstract class _RemoveSpaceManagerByUsernameRequest {
 
+    /**
+     * The origin
+     */
+    @JsonProperty("origin")
+    @Nullable
+    abstract String getOrigin();
+
     /**
      * The space id
      */
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java
@@ -94,7 +94,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 import java.util.function.UnaryOperator;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -153,6 +152,7 @@ public void associateAuditorByUsername() {
                 Mono.just(organizationId),
                 this.cloudFoundryClient.organizations()
                     .associateAuditorByUsername(AssociateOrganizationAuditorByUsernameRequest.builder()
+                        .origin("uaa")
                         .organizationId(organizationId)
                         .username(this.username)
                         .build())
@@ -1733,6 +1733,7 @@ public void removeBillingManagerByUsername() {
             .delayUntil(function((organizationId, userId) -> requestAssociateBillingManager(this.cloudFoundryClient, organizationId, userId)))
             .delayUntil(function((organizationId, userId) -> this.cloudFoundryClient.organizations()
                 .removeBillingManagerByUsername(RemoveOrganizationBillingManagerByUsernameRequest.builder()
+                    .origin("uaa")
                     .username(this.username)
                     .organizationId(organizationId)
                     .build())))
