Merge 124537911-check-route-no-host to master

Steve Powell · Steve Powell · commit 072ca8db49b6 · 2016-07-20T16:07:46.000+01:00
[Completes #124537911]
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v2/routes/ReactorRoutes.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v2/routes/ReactorRoutes.java
@@ -39,6 +39,8 @@
 import org.cloudfoundry.util.ExceptionUtils;
 import reactor.core.publisher.Mono;
 
+import java.util.Optional;
+
 /**
  * The Reactor-based implementation of {@link Routes}
  */
@@ -74,7 +76,12 @@ public Mono<DeleteRouteResponse> delete(DeleteRouteRequest request) {
 
     @Override
     public Mono<Boolean> exists(RouteExistsRequest request) {
-        return get(request, Boolean.class, builder -> builder.pathSegment("v2", "routes", "reserved", "domain", request.getDomainId(), "host", request.getHost()))
+        return get(request, Boolean.class,
+            builder -> {
+                builder.pathSegment("v2", "routes", "reserved", "domain", request.getDomainId());
+                Optional.ofNullable(request.getHost()).ifPresent(host -> builder.pathSegment("host", host));
+                return builder;
+            })
             .defaultIfEmpty(true)
             .otherwise(ExceptionUtils.statusCode(CF_NOT_FOUND), t -> Mono.just(false));
     }
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/routes/_RouteExistsRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/routes/_RouteExistsRequest.java
@@ -36,6 +36,7 @@ abstract class _RouteExistsRequest {
     /**
      * The host
      */
+    @Nullable
     @JsonIgnore
     abstract String getHost();
 
diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RouteExistsRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/routes/RouteExistsRequestTest.java
@@ -23,22 +23,13 @@ public final class RouteExistsRequestTest {
     @Test(expected = IllegalStateException.class)
     public void noDomainId() {
         RouteExistsRequest.builder()
-            .host("test-host")
-            .build();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void noHost() {
-        RouteExistsRequest.builder()
-            .domainId("test-domain-id")
             .build();
     }
 
     @Test
     public void valid() {
         RouteExistsRequest.builder()
             .domainId("test-domain-id")
-            .host("test-host")
             .build();
     }
 
diff --git a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/routes/_CheckRouteRequest.java b/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/routes/_CheckRouteRequest.java
@@ -33,6 +33,7 @@ abstract class _CheckRouteRequest {
     /**
      * The host of the route
      */
+    @Nullable
     abstract String getHost();
 
     /**
diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CheckRouteRequestTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/CheckRouteRequestTest.java
@@ -23,22 +23,13 @@ public final class CheckRouteRequestTest {
     @Test(expected = IllegalStateException.class)
     public void noDomain() {
         CheckRouteRequest.builder()
-            .host("test-host")
-            .build();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void noHost() {
-        CheckRouteRequest.builder()
-            .domain("test-domain")
             .build();
     }
 
     @Test
     public void valid() {
         CheckRouteRequest.builder()
             .domain("test-domain")
-            .host("test-host")
             .build();
     }
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java
@@ -20,13 +20,15 @@
 import org.cloudfoundry.operations.applications.ApplicationHealthCheck;
 import org.cloudfoundry.operations.applications.PushApplicationRequest;
 import org.cloudfoundry.operations.domains.CreateDomainRequest;
+import org.cloudfoundry.operations.domains.CreateSharedDomainRequest;
 import org.cloudfoundry.operations.routes.CheckRouteRequest;
 import org.cloudfoundry.operations.routes.CreateRouteRequest;
 import org.cloudfoundry.operations.routes.DeleteRouteRequest;
 import org.cloudfoundry.operations.routes.ListRoutesRequest;
 import org.cloudfoundry.operations.routes.MapRouteRequest;
 import org.cloudfoundry.operations.routes.Route;
 import org.cloudfoundry.operations.routes.UnmapRouteRequest;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
@@ -68,13 +70,30 @@ public void checkFalse() {
                 .assertEquals(false));
     }
 
+    @Ignore("Awaiting resolution of https://github.com/cloudfoundry/cloud_controller_ng/issues/650")
     @Test
-    public void checkTrue() {
+    public void checkTruePrivateDomainNoHost() {
         String domainName = getDomainName();
         String hostName = getHostName();
         String path = getPath();
 
-        createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
+        createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
+            .then(this.cloudFoundryOperations.routes()
+                .check(CheckRouteRequest.builder()
+                    .domain(domainName)
+                    .path(path)
+                    .build()))
+            .subscribe(testSubscriber()
+                .assertEquals(true));
+    }
+
+    @Test
+    public void checkTrueSharedDomain() {
+        String domainName = getDomainName();
+        String hostName = getHostName();
+        String path = getPath();
+
+        createSharedDomainAndRoute(this.cloudFoundryOperations, this.spaceName, domainName, hostName, path)
             .then(this.cloudFoundryOperations.routes()
                 .check(CheckRouteRequest.builder()
                     .domain(domainName)
@@ -91,7 +110,7 @@ public void create() {
         String hostName = getHostName();
         String path = getPath();
 
-        createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
+        createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
             .then(this.cloudFoundryOperations.routes()
                 .check(CheckRouteRequest.builder()
                     .domain(domainName)
@@ -125,7 +144,7 @@ public void delete() {
         String hostName = getHostName();
         String path = getPath();
 
-        createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
+        createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
             .then(this.cloudFoundryOperations.routes()
                 .delete(DeleteRouteRequest.builder()
                     .domain(domainName)
@@ -164,7 +183,7 @@ public void deleteOrphanedRoutes() {
         String hostName = getHostName();
         String path = getPath();
 
-        createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
+        createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
             .then(this.cloudFoundryOperations.routes()
                 .deleteOrphanedRoutes())
             .then(this.cloudFoundryOperations.routes()
@@ -183,7 +202,7 @@ public void listWithOrganizationLevel() {
         String hostName = getHostName();
         String path = getPath();
 
-        createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
+        createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
             .thenMany(this.cloudFoundryOperations.routes()
                 .list(ListRoutesRequest.builder()
                     .level(ORGANIZATION)
@@ -199,7 +218,7 @@ public void listWithSpaceLevel() {
         String hostName = getHostName();
         String path = getPath();
 
-        createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
+        createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path)
             .thenMany(this.cloudFoundryOperations.routes()
                 .list(ListRoutesRequest.builder()
                     .level(SPACE)
@@ -218,7 +237,7 @@ public void map() {
 
         Mono
             .when(
-                createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
+                createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
                 createApplication(this.cloudFoundryOperations, getApplicationBits(), applicationName, true)
             )
             .then(this.cloudFoundryOperations.routes()
@@ -246,7 +265,7 @@ public void mapNoHost() {
 
         Mono
             .when(
-                createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
+                createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
                 createApplication(this.cloudFoundryOperations, getApplicationBits(), applicationName, true)
             )
             .then(this.cloudFoundryOperations.routes()
@@ -274,7 +293,7 @@ public void mapNoPath() {
 
         Mono
             .when(
-                createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
+                createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
                 createApplication(this.cloudFoundryOperations, getApplicationBits(), applicationName, true)
             )
             .then(this.cloudFoundryOperations.routes()
@@ -302,7 +321,7 @@ public void unmap() {
 
         Mono
             .when(
-                createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
+                createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
                 createApplication(this.cloudFoundryOperations, getApplicationBits(), applicationName, true)
             )
             .then(this.cloudFoundryOperations.routes()
@@ -336,7 +355,7 @@ public void unmapNoPath() {
 
         Mono
             .when(
-                createRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
+                createDomainAndRoute(this.cloudFoundryOperations, this.organizationName, this.spaceName, domainName, hostName, path),
                 createApplication(this.cloudFoundryOperations, getApplicationBits(), applicationName, true)
             )
             .then(this.cloudFoundryOperations.routes()
@@ -374,19 +393,39 @@ private static Mono<Void> createApplication(CloudFoundryOperations cloudFoundryO
                 .build());
     }
 
-    private static Mono<Void> createRoute(CloudFoundryOperations cloudFoundryOperations, String organizationName, String spaceName, String domainName, String hostName, String path) {
+    private static Mono<Void> createDomain(CloudFoundryOperations cloudFoundryOperations, String organizationName, String domainName) {
         return cloudFoundryOperations.domains()
             .create(CreateDomainRequest.builder()
                 .domain(domainName)
                 .organization(organizationName)
-                .build())
-            .then(cloudFoundryOperations.routes()
-                .create(CreateRouteRequest.builder()
-                    .domain(domainName)
-                    .host(hostName)
-                    .path(path)
-                    .space(spaceName)
-                    .build()));
+                .build());
+    }
+
+    private static Mono<Void> createSharedDomain(CloudFoundryOperations cloudFoundryOperations, String domainName) {
+        return cloudFoundryOperations.domains()
+            .createShared(CreateSharedDomainRequest.builder()
+                .domain(domainName)
+                .build());
+    }
+
+    private static Mono<Void> createDomainAndRoute(CloudFoundryOperations cloudFoundryOperations, String organizationName, String spaceName, String domainName, String hostName, String path) {
+        return createDomain(cloudFoundryOperations, organizationName, domainName)
+            .then(createRoute(cloudFoundryOperations, spaceName, domainName, hostName, path));
+    }
+
+    private static Mono<Void> createSharedDomainAndRoute(CloudFoundryOperations cloudFoundryOperations, String spaceName, String domainName, String hostName, String path) {
+        return createSharedDomain(cloudFoundryOperations, domainName)
+            .then(createRoute(cloudFoundryOperations, spaceName, domainName, hostName, path));
+    }
+
+    private static Mono<Void> createRoute(CloudFoundryOperations cloudFoundryOperations, String spaceName, String domainName, String hostName, String path) {
+        return cloudFoundryOperations.routes()
+            .create(CreateRouteRequest.builder()
+                .domain(domainName)
+                .host(hostName)
+                .path(path)
+                .space(spaceName)
+                .build());
     }
 
     private static Predicate<Route> filterRoutes(String domainName, String host, String path, String applicationName) {
