Merge branch 'v3-spaces' into 3.x

Author: twoseat

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3.java

@@ -20,6 +20,7 @@
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentResponse;
 import org.cloudfoundry.client.v3.spaces.CreateSpaceRequest;
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
+import org.cloudfoundry.client.v3.spaces.DeleteSpaceRequest;
 import org.cloudfoundry.client.v3.spaces.DeleteUnmappedRoutesRequest;
 import org.cloudfoundry.client.v3.spaces.GetSpaceIsolationSegmentRequest;
 import org.cloudfoundry.client.v3.spaces.GetSpaceIsolationSegmentResponse;
@@ -66,6 +67,12 @@ public Mono<CreateSpaceResponse> create(CreateSpaceRequest request) {
             .checkpoint();
     }
 
+    @Override
+    public Mono<String> delete(DeleteSpaceRequest request) {
+        return delete(request, builder -> builder.pathSegment("spaces", request.getSpaceId()))
+            .checkpoint();
+    }
+
     @Override
     public Mono<String> deleteUnmappedRoutes(DeleteUnmappedRoutesRequest request) {
         return delete(request, builder -> builder.pathSegment("spaces", request.getSpaceId(), "routes").query("unmapped=true"))

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/spaces/ReactorSpacesV3Test.java

@@ -25,6 +25,7 @@
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentResponse;
 import org.cloudfoundry.client.v3.spaces.CreateSpaceRequest;
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
+import org.cloudfoundry.client.v3.spaces.DeleteSpaceRequest;
 import org.cloudfoundry.client.v3.spaces.DeleteUnmappedRoutesRequest;
 import org.cloudfoundry.client.v3.spaces.GetSpaceIsolationSegmentRequest;
 import org.cloudfoundry.client.v3.spaces.GetSpaceIsolationSegmentResponse;
@@ -141,6 +142,28 @@ public void create() {
             .verify(Duration.ofSeconds(5));
     }
 
+    @Test
+    public void delete() {
+        mockRequest(InteractionContext.builder()
+            .request(TestRequest.builder()
+                .method(DELETE).path("/spaces/test-space-id")
+                .build())
+            .response(TestResponse.builder()
+                .status(ACCEPTED)
+                .header("Location", "https://api.example.org/v3/jobs/test-job-id")
+                .build())
+            .build());
+
+        this.spaces
+            .delete(DeleteSpaceRequest.builder()
+                .spaceId("test-space-id")
+                .build())
+            .as(StepVerifier::create)
+            .expectNext("test-job-id")
+            .expectComplete()
+            .verify(Duration.ofSeconds(5));
+    }
+
     @Test
     public void deleteUnmappedRoutes() {
         mockRequest(InteractionContext.builder()
@@ -149,7 +172,7 @@ public void deleteUnmappedRoutes() {
                 .build())
             .response(TestResponse.builder()
                 .status(ACCEPTED)
-                .header("Location", "https://api.example.org/v3/jobs/test-space-id")
+                .header("Location", "https://api.example.org/v3/jobs/test-job-id")
                 .build())
             .build());
 
@@ -158,7 +181,7 @@ public void deleteUnmappedRoutes() {
                 .spaceId("test-space-id")
                 .build())
             .as(StepVerifier::create)
-            .expectNext("test-space-id")
+            .expectNext("test-job-id")
             .expectComplete()
             .verify(Duration.ofSeconds(5));
     }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/spaces/SpacesV3.java

@@ -39,6 +39,14 @@ public interface SpacesV3 {
      */
     Mono<CreateSpaceResponse> create(CreateSpaceRequest request);
 
+    /**
+     * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.87.0/index.html#delete-a-space">Delete Space</a> request
+     *
+     * @param request the Delete Space request
+     * @return the response from the Delete Space request
+     */
+    Mono<String> delete(DeleteSpaceRequest request);
+
     /**
      * Makes the <a href="https://v3-apidocs.cloudfoundry.org/version/3.77.0/index.html#delete-unmapped-routes-for-a-space">Delete Unmapped Routes</a> request
      *

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/spaces/_DeleteSpaceRequest.java

@@ -0,0 +1,18 @@
+package org.cloudfoundry.client.v3.spaces;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.immutables.value.Value;
+
+/**
+ * The request payload for the Delete Unmapped Routes operation
+ */
+@Value.Immutable
+abstract class _DeleteSpaceRequest {
+
+    /**
+     * The space id
+     */
+    @JsonIgnore
+    abstract String getSpaceId();
+
+}

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteSpaceRequestTest.java

@@ -0,0 +1,36 @@
+/*
+ * 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.spaces;
+
+import org.junit.Test;
+
+public class DeleteSpaceRequestTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void noSpaceId() {
+        DeleteSpaceRequest.builder()
+            .build();
+    }
+
+    @Test
+    public void valid() {
+        DeleteSpaceRequest.builder()
+            .spaceId("test-space-id")
+            .build();
+    }
+
+}

integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java

@@ -36,6 +36,7 @@
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentResponse;
 import org.cloudfoundry.client.v3.spaces.CreateSpaceRequest;
 import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse;
+import org.cloudfoundry.client.v3.spaces.DeleteSpaceRequest;
 import org.cloudfoundry.client.v3.spaces.DeleteUnmappedRoutesRequest;
 import org.cloudfoundry.client.v3.spaces.GetSpaceIsolationSegmentRequest;
 import org.cloudfoundry.client.v3.spaces.ListSpacesRequest;
@@ -115,6 +116,24 @@ public void create() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @Test
+    public void delete() {
+        String spaceName = this.nameFactory.getSpaceName();
+
+        this.organizationId
+            .flatMap(organizationId -> createSpaceId(this.cloudFoundryClient, organizationId, spaceName))
+            .flatMap(spaceId -> this.cloudFoundryClient.spacesV3()
+                .delete(DeleteSpaceRequest.builder()
+                    .spaceId(spaceId)
+                    .build())
+                .flatMap(job -> JobUtils.waitForCompletion(this.cloudFoundryClient, Duration.ofMinutes(5), job)))
+            .thenMany(requestListSpaces(this.cloudFoundryClient, spaceName))
+            .as(StepVerifier::create)
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
+    }
+
     //TODO: Test has not been validated
     @IfCloudFoundryVersion(greaterThan = CloudFoundryVersion.PCF_2_9)
     @Test