Merge 119999655-delete-org-recursively to master

[Completes #119999655]

Author: nebhale

cloudfoundry-client-spring/src/test/java/org/cloudfoundry/reactor/client/v2/organizations/ReactorOrganizationsTest.java

@@ -788,12 +788,6 @@ protected InteractionContext getInteractionContext() {
                 .build();
         }
 
-        @Override
-        protected DeleteOrganizationRequest getInvalidRequest() {
-            return DeleteOrganizationRequest.builder()
-                .build();
-        }
-
         @Override
         protected DeleteOrganizationResponse getResponse() {
             return null;
@@ -830,12 +824,6 @@ protected InteractionContext getInteractionContext() {
                 .build();
         }
 
-        @Override
-        protected DeleteOrganizationRequest getInvalidRequest() {
-            return DeleteOrganizationRequest.builder()
-                .build();
-        }
-
         @Override
         protected DeleteOrganizationResponse getResponse() {
             return DeleteOrganizationResponse.builder()

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/organizations/AbstractDeleteOrganizationRequest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013-2016 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.v2.organizations;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.cloudfoundry.Nullable;
+import org.cloudfoundry.QueryParameter;
+import org.immutables.value.Value;
+
+/**
+ * The request payload for the Delete a Particular Organization operation
+ */
+@Value.Immutable
+abstract class AbstractDeleteOrganizationRequest {
+
+    /**
+     * Whether to delete asynchronously
+     */
+    @Nullable
+    @QueryParameter("async")
+    abstract Boolean getAsync();
+
+    /**
+     * The organization id
+     */
+    @JsonIgnore
+    abstract String getOrganizationId();
+
+    /**
+     * Whether to delete recursively
+     */
+    @Nullable
+    @QueryParameter("recursive")
+    abstract Boolean getRecursive();
+
+}

cloudfoundry-client/src/main/lombok/org/cloudfoundry/client/v2/organizations/DeleteOrganizationRequest.java

@@ -16,33 +16,21 @@
 
 package org.cloudfoundry.client.v2.organizations;
 
-import org.cloudfoundry.ValidationResult;
 import org.junit.Test;
 
-import static org.cloudfoundry.ValidationResult.Status.INVALID;
-import static org.cloudfoundry.ValidationResult.Status.VALID;
-import static org.junit.Assert.assertEquals;
-
 public final class DeleteOrganizationRequestTest {
 
-    @Test
-    public void isValid() {
-        ValidationResult result = DeleteOrganizationRequest.builder()
-            .organizationId("test-organization-id")
-            .build()
-            .isValid();
-
-        assertEquals(VALID, result.getStatus());
+    @Test(expected = IllegalStateException.class)
+    public void noOrganizationId() {
+        DeleteOrganizationRequest.builder()
+            .build();
     }
 
     @Test
-    public void isValidNoId() {
-        ValidationResult result = DeleteOrganizationRequest.builder()
-            .build()
-            .isValid();
-
-        assertEquals(INVALID, result.getStatus());
-        assertEquals("organization id must be specified", result.getMessages().get(0));
+    public void valid() {
+        DeleteOrganizationRequest.builder()
+            .organizationId("test-organization-id")
+            .build();
     }
 
 }