Merge 128443257-diego-flag to master

[Completes #128443257]

Author: twoseat

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java

@@ -603,8 +603,7 @@ private static Mono<String> getApplicationId(CloudFoundryClient cloudFoundryClie
             .then(applicationId -> requestUpdateApplication(cloudFoundryClient, applicationId, request, stackId)
                 .map(ResourceUtils::getId))
             .otherwiseIfEmpty(requestCreateApplication(cloudFoundryClient, request, spaceId, stackId)
-                .map(ResourceUtils::getId)
-            );
+                .map(ResourceUtils::getId));
     }
 
     private static Mono<String> getApplicationIdFromOrgSpace(CloudFoundryClient cloudFoundryClient, String application, String spaceId, String organization, String space) {
@@ -918,20 +917,25 @@ private static Mono<CopyApplicationResponse> requestCopyBits(CloudFoundryClient
     }
 
     private static Mono<CreateApplicationResponse> requestCreateApplication(CloudFoundryClient cloudFoundryClient, PushApplicationRequest request, String spaceId, String stackId) {
+        CreateApplicationRequest.Builder builder = CreateApplicationRequest.builder()
+            .buildpack(request.getBuildpack())
+            .command(request.getCommand())
+            .diskQuota(request.getDiskQuota())
+            .healthCheckTimeout(request.getTimeout())
+            .healthCheckType(Optional.ofNullable(request.getHealthCheckType()).map(ApplicationHealthCheck::getValue).orElse(null))
+            .instances(request.getInstances())
+            .memory(request.getMemory())
+            .name(request.getName())
+            .spaceId(spaceId)
+            .stackId(stackId);
+
+        Optional.ofNullable(request.getDockerImage())
+            .ifPresent(dockerImage -> builder
+                .diego(true)
+                .dockerImage(dockerImage));
+
         return cloudFoundryClient.applicationsV2()
-            .create(CreateApplicationRequest.builder()
-                .buildpack(request.getBuildpack())
-                .command(request.getCommand())
-                .diskQuota(request.getDiskQuota())
-                .dockerImage(request.getDockerImage())
-                .healthCheckTimeout(request.getTimeout())
-                .healthCheckType(Optional.ofNullable(request.getHealthCheckType()).map(ApplicationHealthCheck::getValue).orElse(null))
-                .instances(request.getInstances())
-                .memory(request.getMemory())
-                .name(request.getName())
-                .spaceId(spaceId)
-                .stackId(stackId)
-                .build());
+            .create(builder.build());
     }
 
     private static Mono<CreateRouteResponse> requestCreateRoute(CloudFoundryClient cloudFoundryClient, String domainId, String host, String routePath, String spaceId) {

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java

@@ -497,7 +497,6 @@ private static void requestCreateApplication(CloudFoundryClient cloudFoundryClie
                 .buildpack(request.getBuildpack())
                 .command(request.getCommand())
                 .diskQuota(request.getDiskQuota())
-                .dockerImage(request.getDockerImage())
                 .healthCheckTimeout(request.getTimeout())
                 .healthCheckType(Optional.ofNullable(request.getHealthCheckType()).map(ApplicationHealthCheck::getValue).orElse(null))
                 .instances(request.getInstances())
@@ -512,7 +511,30 @@ private static void requestCreateApplication(CloudFoundryClient cloudFoundryClie
                         .id(applicationId)
                         .build())
                     .build()));
+    }
 
+    private static void requestCreateDockerApplication(CloudFoundryClient cloudFoundryClient, PushApplicationRequest request, String spaceId, String stackId, String applicationId) {
+        when(cloudFoundryClient.applicationsV2()
+            .create(CreateApplicationRequest.builder()
+                .buildpack(request.getBuildpack())
+                .command(request.getCommand())
+                .diego(true)
+                .diskQuota(request.getDiskQuota())
+                .dockerImage(request.getDockerImage())
+                .healthCheckTimeout(request.getTimeout())
+                .healthCheckType(Optional.ofNullable(request.getHealthCheckType()).map(ApplicationHealthCheck::getValue).orElse(null))
+                .instances(request.getInstances())
+                .memory(request.getMemory())
+                .name(request.getName())
+                .spaceId(spaceId)
+                .stackId(stackId)
+                .build()))
+            .thenReturn(Mono
+                .just(fill(CreateApplicationResponse.builder(), "create-")
+                    .metadata(fill(Metadata.builder())
+                        .id(applicationId)
+                        .build())
+                    .build()));
     }
 
     private static void requestCreateRoute(CloudFoundryClient cloudFoundryClient, String domainId, String host, String path, String spaceId, String routeId) {
@@ -2515,7 +2537,7 @@ public static final class PushDocker extends AbstractOperationsApiTest<Void> {
         @Before
         public void setUp() throws Exception {
             requestApplicationsEmpty(this.cloudFoundryClient, "test-name", TEST_SPACE_ID);
-            requestCreateApplication(this.cloudFoundryClient, this.pushApplicationRequest, TEST_SPACE_ID, null, "test-application-id");
+            requestCreateDockerApplication(this.cloudFoundryClient, this.pushApplicationRequest, TEST_SPACE_ID, null, "test-application-id");
             requestSpace(this.cloudFoundryClient, TEST_SPACE_ID, TEST_ORGANIZATION_ID);
             requestPrivateDomain(this.cloudFoundryClient, "test-domain", TEST_ORGANIZATION_ID, "test-domain-id");
             requestRoutesEmpty(this.cloudFoundryClient, "test-domain-id", "test-name", null);