Support Multiple TCP Route Mappings

Previously requesting a second tcp route mapping would fail when a random port was
requested, due to a failed match against a port that hadn't yet been generated. This
commit solves the problem, and adds tests in two different areas to guard against this.

[resolves #770]

Author: twoseat

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/routes/DefaultRoutes.java

@@ -269,6 +269,11 @@ private static Mono<String> getOptionalDomainId(CloudFoundryClient cloudFoundryC
 
     private static Mono<AbstractRouteResource> getOrCreateRoute(CloudFoundryClient cloudFoundryClient, String organizationId, String spaceId, String domain, String host, String path, Integer port,
                                                                 Boolean randomPort) {
+        if (randomPort != null) {
+            return getDomainId(cloudFoundryClient, organizationId, domain)
+                .then(domainId -> requestCreateRoute(cloudFoundryClient, domainId, host, path, port, randomPort, spaceId));
+        }
+
         return getDomainId(cloudFoundryClient, organizationId, domain)
             .then(domainId -> getRoute(cloudFoundryClient, domainId, host, path, port)
                 .cast(AbstractRouteResource.class)

integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java

@@ -235,7 +235,7 @@ public void getTcp() throws TimeoutException, InterruptedException, IOException
                 .get(GetApplicationRequest.builder()
                     .name(applicationName)
                     .build()))
-                .map(applicationDetail -> applicationDetail.getUrls().get(0))
+            .map(applicationDetail -> applicationDetail.getUrls().get(0))
             .as(StepVerifier::create)
             .consumeNextWith(route -> assertThat(route).matches(domainName + "+?:\\d+$"))
             .expectComplete()
@@ -626,6 +626,59 @@ public void pushUpdateRoute() throws TimeoutException, InterruptedException, IOE
             .verify(Duration.ofMinutes(5));
     }
 
+    @Test
+    public void pushUpdateTcpRoute() throws TimeoutException, InterruptedException, IOException {
+        String applicationName = this.nameFactory.getApplicationName();
+        String domainName = this.nameFactory.getDomainName();
+
+        requestCreateTcpDomain(this.cloudFoundryOperations, domainName, DEFAULT_ROUTER_GROUP)
+            .then(this.cloudFoundryOperations.applications()
+                .pushManifest(PushApplicationManifestRequest.builder()
+                    .manifest(ApplicationManifest.builder()
+                        .path(new ClassPathResource("test-application.zip").getFile().toPath())
+                        .buildpack("staticfile_buildpack")
+                        .disk(512)
+                        .healthCheckType(ApplicationHealthCheck.PROCESS)
+                        .memory(64)
+                        .name(applicationName)
+                        .randomRoute(true)
+                        .route(Route.builder()
+                            .route(domainName)
+                            .build())
+                        .build())
+                    .noStart(true)
+                    .build()))
+            .then(this.cloudFoundryOperations.applications()
+                .pushManifest(PushApplicationManifestRequest.builder()
+                    .manifest(ApplicationManifest.builder()
+                        .path(new ClassPathResource("test-application.zip").getFile().toPath())
+                        .buildpack("staticfile_buildpack")
+                        .disk(512)
+                        .healthCheckType(ApplicationHealthCheck.PROCESS)
+                        .memory(64)
+                        .name(applicationName)
+                        .randomRoute(true)
+                        .route(Route.builder()
+                            .route(domainName)
+                            .build())
+                        .build())
+                    .noStart(true)
+                    .build()))
+            .then(this.cloudFoundryOperations.applications()
+                .get(GetApplicationRequest.builder()
+                    .name(applicationName)
+                    .build()))
+            .map(ApplicationDetail::getUrls)
+            .as(StepVerifier::create)
+            .consumeNextWith(routes -> {
+                assertThat(routes.get(0).matches(domainName + "+?:\\d+$"));
+                assertThat(routes.get(1).matches(domainName + "+?:\\d+$"));
+                assertThat(!routes.get(0).matches(routes.get(1)));
+            })
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
+    }
+
     @Test
     public void pushWithHost() throws TimeoutException, InterruptedException, IOException {
         String applicationName = this.nameFactory.getApplicationName();

integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java

@@ -407,6 +407,36 @@ public void mapTcpRoute() throws TimeoutException, InterruptedException, IOExcep
             .verify(Duration.ofMinutes(5));
     }
 
+    @Test
+    public void mapTcpRouteTwice() throws TimeoutException, InterruptedException, IOException {
+        String applicationName = this.nameFactory.getApplicationName();
+        String domainName = this.nameFactory.getDomainName();
+
+        Mono
+            .when(
+                requestCreateSharedDomain(this.cloudFoundryOperations, domainName, DEFAULT_ROUTER_GROUP),
+                requestCreateApplication(this.cloudFoundryOperations, new ClassPathResource("test-application.zip").getFile().toPath(), applicationName, true)
+            )
+            .then(this.cloudFoundryOperations.routes()
+                .map(MapRouteRequest.builder()
+                    .applicationName(applicationName)
+                    .domain(domainName)
+                    .randomPort(true)
+                    .build()))
+            .then(this.cloudFoundryOperations.routes()
+                .map(MapRouteRequest.builder()
+                    .applicationName(applicationName)
+                    .domain(domainName)
+                    .randomPort(true)
+                    .build()))
+            .thenMany(requestListRoutes(this.cloudFoundryOperations))
+            .filter(response -> domainName.equals(response.getDomain()))
+            .as(StepVerifier::create)
+            .expectNextCount(2)
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
+    }
+
     @Test
     public void unmap() throws TimeoutException, InterruptedException, IOException {
         String applicationName = this.nameFactory.getApplicationName();