From 430da643a9954a4c2db99ec2567b453f6fae4dd8 Mon Sep 17 00:00:00 2001 From: Nieraj Singh Date: Thu, 8 Oct 2020 16:20:14 -0700 Subject: [PATCH] PT 175164317 - Remove PWS as default URL for boot dash CF target --- .../dash/cf/dialogs/CloudFoundryTargetWizardModel.java | 8 +------- .../boot/dash/cf/runtarget/CloudFoundryRunTarget.java | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/dialogs/CloudFoundryTargetWizardModel.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/dialogs/CloudFoundryTargetWizardModel.java index 3ed74a561..f28af3fb3 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/dialogs/CloudFoundryTargetWizardModel.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/dialogs/CloudFoundryTargetWizardModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2016 Pivotal, Inc. + * Copyright (c) 2015, 2020 Pivotal, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -171,8 +171,6 @@ public class CloudFoundryTargetWizardModel { allPropertiesValidator.addChild(storeCredentialsValidator); allPropertiesValidator.addChild(resolvedSpacesValidator); allPropertiesValidator.addChild(spaceValidator); - - url.setValue(getDefaultTargetUrl()); } public void setUrl(String url) { @@ -219,10 +217,6 @@ public class CloudFoundryTargetWizardModel { return storeCredentials.getValue(); } - protected String getDefaultTargetUrl() { - return "https://api.run.pivotal.io"; - } - public OrgsAndSpaces resolveSpaces(IRunnableContext context) { try { boolean toFetchSpaces = true; diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/runtarget/CloudFoundryRunTarget.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/runtarget/CloudFoundryRunTarget.java index 181ba0589..29bf54a89 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/runtarget/CloudFoundryRunTarget.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/runtarget/CloudFoundryRunTarget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2017 Pivotal, Inc. + * Copyright (c) 2015, 2020 Pivotal, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -283,10 +283,6 @@ implements RunTargetWithProperties, RemoteRunTarge return spaces; } - public boolean isPWS() { - return "https://api.run.pivotal.io".equals(getUrl()); - } - public String getUrl() { String url = targetProperties.getUrl(); while (url.endsWith("/")) {