From dd0d69355a7cb035bcefd6627adb3b601aea0fc4 Mon Sep 17 00:00:00 2001 From: nsingh Date: Wed, 11 Jan 2017 10:26:39 -0800 Subject: [PATCH] Disable application push in the CF vscode requests --- .../client/v2/DefaultClientRequestsV2.java | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java index c5029df97..49ddefe6a 100644 --- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java +++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java @@ -626,28 +626,30 @@ public class DefaultClientRequestsV2 implements ClientRequests { } private Mono pushExisting(ApplicationDetail app, CFPushArguments params) { - String appName = params.getAppName(); - UUID appId = UUID.fromString(app.getId()); - return updateApp(appId, params) - .then(getApplicationDetail(appName)) - .then((appDetail) -> { - return Flux.merge( - setRoutes(appDetail, params.getRoutes()), - bindAndUnbindServices(appName, params.getServices()) - ).then(); - }) - .then(mono_debug("Uploading[1]...")) - .then(Mono.fromCallable(() -> { - debug("Uploading[2]..."); + // TODO: push is using v1 below which was not ported to vscode CF support. +// String appName = params.getAppName(); +// UUID appId = UUID.fromString(app.getId()); +// return updateApp(appId, params) +// .then(getApplicationDetail(appName)) +// .then((appDetail) -> { +// return Flux.merge( +// setRoutes(appDetail, params.getRoutes()), +// bindAndUnbindServices(appName, params.getServices()) +// ).then(); +// }) +// .then(mono_debug("Uploading[1]...")) +// .then(Mono.fromCallable(() -> { +// debug("Uploading[2]..."); // v1().uploadApplication(appName, params.getApplicationData()); - debug("Uploading[2] DONE"); - return "who cares"; - })) - .then(mono_debug("Uploading[1] DONE")) - .then(params.isNoStart() - ? stopApp(appName) - : restartApp(appName) - ); +// debug("Uploading[2] DONE"); +// return "who cares"; +// })) +// .then(mono_debug("Uploading[1] DONE")) +// .then(params.isNoStart() +// ? stopApp(appName) +// : restartApp(appName) +// ); + throw new Error("Application push not currently supported in CF vscode"); } // private DefaultClientRequestsV1 v1() throws Exception {