- * Usage: just call the 'start()' method once, at the first time the information is desired.
- */
-@SuppressWarnings("rawtypes")
-public class BootDashTargetInfoSynchronizer {
-
- private static AtomicBoolean started = new AtomicBoolean(false);
-
- public static void start() {
- if (started.compareAndSet(false, true)) {
- model().getRunTargets().addListener(targetsListener);
- }
- }
-
- public static void stop() {
- if (started.compareAndSet(true, false)) {
- updateCloudTargetsInManifestEditor(ImmutableSet.of());
- }
- }
-
- private static final ValueListener> targetsListener = (e, v) -> {
- // On target changes, add the client listener in each target so that when the client changes, a notification is sent
- addClientChangeListeners(e.getValue());
- };
-
- private static final ValueListener clientsChangedListener = (exp, client) -> {
- if (client instanceof DefaultClientRequestsV2) {
- addRefreshTokenListener((DefaultClientRequestsV2) client);
- }
- };
-
- /**
- * Add a listener to be notified when the refresh token becomes available OR
- * changes
- */
- static private void addRefreshTokenListener(DefaultClientRequestsV2 client) {
- if (client != null && client.getRefreshTokens() != null && model() != null
- && model().getRunTargets() != null) {
- client.getRefreshTokens().doOnNext((token) ->
- // Although the refresh token change is for ONE client (i.e. one target)
- // compute cloud target information for ALL currently connected targets
- // as the manifest editor is updated with the full up-to-date list of connected
- // boot dash targets
- updateCloudTargetsInManifestEditor(model().getRunTargets().getValue())
- ).subscribe();
- client.getRefreshTokens().doOnComplete(() ->
- updateCloudTargetsInManifestEditor(model().getRunTargets().getValue())
- ).subscribe();
- }
- }
-
- static private void updateCloudTargetsInManifestEditor(ImmutableSet value) {
- Set toUpdate = value == null ? ImmutableSet.of() : value;
-
- CfTargetsInfo targetsInfo = asTargetsInfo(toUpdate);
- CloudFoundryManifestLanguageServer.setCfTargetLoginOptions(targetsInfo);
- }
-
- private static BootDashViewModel model() {
- return BootDashActivator.getDefault().getModel();
- }
-
- private static void addClientChangeListeners(ImmutableSet targets) {
- if (targets != null) {
- for (RunTarget runTarget : targets) {
- if (runTarget instanceof CloudFoundryRunTarget) {
- ((CloudFoundryRunTarget) runTarget).getClientExp().addListener(clientsChangedListener);
- }
- }
- }
- }
-
- private static CfTargetsInfo asTargetsInfo(Collection targets) {
- List collectedTargets = new ArrayList<>();
- for (RunTarget runTarget : targets) {
- if (runTarget instanceof CloudFoundryRunTarget) {
-
- CloudFoundryRunTarget cloudFoundryRunTarget = (CloudFoundryRunTarget) runTarget;
- if (cloudFoundryRunTarget.isConnected()) {
- String token = cloudFoundryRunTarget.getClient().getRefreshToken();
- if (token != null) {
- CloudFoundryTargetProperties properties = cloudFoundryRunTarget.getTargetProperties();
- String target = properties.getUrl();
- String org = properties.getOrganizationName();
- String space = properties.getSpaceName();
- boolean sslDisabled = properties.skipSslValidation();
-
- CfTargetsInfo.Target integrationTarget = new Target();
-
- integrationTarget.setApi(target);
- integrationTarget.setOrg(org);
- integrationTarget.setSpace(space);
- integrationTarget.setSslDisabled(sslDisabled);
- integrationTarget.setRefreshToken(token);
- collectedTargets.add(integrationTarget);
- }
- }
- }
- }
-
- CfTargetsInfo targetsInfo = new CfTargetsInfo();
- targetsInfo.setCfTargets(collectedTargets);
- targetsInfo.setDiagnosticMessages(getDiagnosticMessages());
- return targetsInfo ;
- }
-
- // NOTE: using ':' to separate the "shorter" part of the message from the longer. The longer part may be shown in the UI by expanding the hover info
- private static final String TARGET_SOURCE = "Boot Dashboard";
- private static final String NO_ORG_SPACE = "Boot Dashboard - No org/space selected: Verify Cloud Foundry target connection in Boot Dashboard or login via 'cf' CLI";
- // Make this a "generic" message, instead of using "Boot Dash" prefix as it shows general instructions when there are not targets
- private static final String NO_TARGETS = "No Cloud Foundry targets found: Create a target in Boot Dashboard or login via 'cf' CLI";
- private static final String CONNECTION_ERROR = "Boot Dashboard - Error connecting to Cloud Foundry target: Verify network connection or that existing target has valid credentials.";
-
- private static TargetDiagnosticMessages getDiagnosticMessages() {
- TargetDiagnosticMessages messages = new TargetDiagnosticMessages();
- messages.setConnectionError(CONNECTION_ERROR);
- messages.setNoOrgSpace(NO_ORG_SPACE);
- messages.setNoTargetsFound(NO_TARGETS);
- messages.setTargetSource(TARGET_SOURCE);
- return messages;
- }
-
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/AbstractCloudAppDashElementsAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/AbstractCloudAppDashElementsAction.java
deleted file mode 100644
index 02ba712a9..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/AbstractCloudAppDashElementsAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Pivotal Software, 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudAppDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashElementsAction;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashElementsAction.Params;
-
-/**
- * Action for {@link CloudAppDashElement} elements only
- *
- * @author Alex Boyko
- *
- */
-public class AbstractCloudAppDashElementsAction extends AbstractBootDashElementsAction {
-
- public AbstractCloudAppDashElementsAction(Params params) {
- super(params);
- }
-
- @Override
- public void updateVisibility() {
- boolean visible = false;
- if (!getSelectedElements().isEmpty()) {
- visible = true;
- for (BootDashElement e : getSelectedElements()) {
- if (!(e instanceof CloudAppDashElement)) {
- visible = false;
- break;
- }
- }
- }
- setVisible(visible);
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/AbstractCloudDashModelAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/AbstractCloudDashModelAction.java
deleted file mode 100644
index 245544ad6..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/AbstractCloudDashModelAction.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Pivotal Software, 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudFoundryBootDashModel;
-import org.springframework.ide.eclipse.boot.dash.cf.ui.CfUserInteractions;
-import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashModelAction;
-import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
-
-/**
- * Action for Cloud Foundry dash model element
- *
- * @author Alex Boyko
- *
- */
-public class AbstractCloudDashModelAction extends AbstractBootDashModelAction {
-
- protected AbstractCloudDashModelAction(LiveExpression section, SimpleDIContext ui) {
- super(section, ui);
- }
-
- protected CfUserInteractions cfUi() {
- return context.getBean(CfUserInteractions.class);
- }
-
- @Override
- public void updateVisibility() {
- this.setVisible(sectionSelection.getValue() instanceof CloudFoundryBootDashModel);
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CfBootDashActions.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CfBootDashActions.java
deleted file mode 100644
index 491850acb..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CfBootDashActions.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext;
-import org.springframework.ide.eclipse.boot.dash.liveprocess.LiveProcessCommandsExecutor;
-import org.springframework.ide.eclipse.boot.dash.livexp.MultiSelection;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashViewModel;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashAction;
-import org.springframework.ide.eclipse.boot.dash.views.BootDashActions;
-import org.springframework.ide.eclipse.boot.dash.views.ToggleBootDashModelConnection;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashElementsAction.Params;
-import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
-
-import com.google.common.collect.ImmutableList;
-
-public class CfBootDashActions {
-
- public static BootDashActions.Factory factory = (
- BootDashActions actions,
- BootDashViewModel model,
- MultiSelection selection,
- LiveExpression section,
- SimpleDIContext context,
- LiveProcessCommandsExecutor liveProcessCmds
- ) -> {
-
- Params defaultActionParams = new Params(actions)
- .setModel(model)
- .setSelection(selection)
- .setContext(context)
- .setLiveProcessCmds(liveProcessCmds);
-
- ImmutableList.Builder builder = ImmutableList.builder();
- builder.add(new RestartApplicationOnlyAction(defaultActionParams));
- builder.add(new SelectManifestAction(defaultActionParams));
- builder.add(new CloudFoundryRestartWithRemoteDevClientAction(defaultActionParams));
- builder.add(new EnableJmxSshTunnelAction(defaultActionParams));
- builder.add(new ReconnectCloudConsoleAction(defaultActionParams));
- if (section!=null) {
- builder.add(new UpdatePasswordAction(section, context));
- builder.add(new OpenCloudAdminConsoleAction(section, context));
- builder.add(new CustmomizeTargetAppManagerURLAction(section, context));
- }
- return builder.build();
- };
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CloudFoundryRestartWithRemoteDevClientAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CloudFoundryRestartWithRemoteDevClientAction.java
deleted file mode 100644
index 8954a87b8..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CloudFoundryRestartWithRemoteDevClientAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2017 Pivotal Software, 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.PlatformUI;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudAppDashElement;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudFoundryBootDashModel;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel.ElementStateListener;
-
-/**
- * Action for starting/restarting Remove DevTools Client application
- *
- * @author Alex Boyko
- *
- */
-public class CloudFoundryRestartWithRemoteDevClientAction extends AbstractCloudAppDashElementsAction {
-
- private ElementStateListener stateListener;
-
- public CloudFoundryRestartWithRemoteDevClientAction(Params params) {
- super(params);
- this.setText("(Re)start Remote DevTools Client");
- this.setToolTipText("Restarts application with the Remote DevTools Client attched.");
- URL url = FileLocator.find(Platform.getBundle("org.springframework.ide.eclipse.boot"), new Path("resources/icons/boot-devtools-icon.png"), null);
- if (url != null) {
- this.setImageDescriptor(ImageDescriptor.createFromURL(url));
- }
- if (model != null) {
- model.addElementStateListener(stateListener = new ElementStateListener() {
- public void stateChanged(BootDashElement e) {
- if (getSelectedElements().contains(e) && !PlatformUI.getWorkbench().isClosing()) {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- updateEnablement();
- }
- });
- }
- }
- });
- }
- }
-
- @Override
- public void updateEnablement() {
- boolean enable = false;
- if (!getSelectedElements().isEmpty()) {
- enable = true;
- for (BootDashElement e : getSelectedElements()) {
- if (!(e instanceof CloudAppDashElement) || e.getProject() == null) {
- enable = false;
- }
- }
- }
- this.setEnabled(enable);
- }
-
- @Override
- public void run() {
- for (BootDashElement _e : getSelectedElements()) {
- if (_e instanceof CloudAppDashElement && _e.getBootDashModel() instanceof CloudFoundryBootDashModel && _e.getProject() != null) {
- CloudAppDashElement e = (CloudAppDashElement) _e;
- e.restartWithRemoteClient(ui(), e.createCancelationToken());
- }
- }
- }
-
- @Override
- public void dispose() {
- if (model != null && stateListener != null) {
- model.removeElementStateListener(stateListener);
- stateListener = null;
- }
- super.dispose();
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CustmomizeTargetAppManagerURLAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CustmomizeTargetAppManagerURLAction.java
deleted file mode 100644
index 04e053d7c..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/CustmomizeTargetAppManagerURLAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Pivotal Software, 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import java.util.EnumSet;
-
-import org.springframework.ide.eclipse.boot.dash.cf.dialogs.CustomizeAppsManagerURLDialogModel;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudFoundryBootDashModel;
-import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel;
-import org.springsource.ide.eclipse.commons.core.pstore.PropertyStoreApi;
-import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
-
-public class CustmomizeTargetAppManagerURLAction extends AbstractCloudDashModelAction{
-
- protected CustmomizeTargetAppManagerURLAction(LiveExpression section, SimpleDIContext context) {
- super(section, context);
- setText("Customize Cloud Admin Console URL...");
- }
-
- @Override
- public void updateEnablement() {
- this.setEnabled(isApplicable(sectionSelection.getValue()));
- }
-
- @Override
- public void updateVisibility() {
- this.setVisible(isApplicable(sectionSelection.getValue()));
- }
-
- private boolean isApplicable(BootDashModel section) {
- if (section != null && section instanceof CloudFoundryBootDashModel) {
- PropertyStoreApi props = section.getRunTarget().getType().getPersistentProperties();
- return props != null;
- }
- return false;
- }
-
- @Override
- public void run() {
- final BootDashModel section = sectionSelection.getValue();
- if (isApplicable(section)) {
- CustomizeAppsManagerURLDialogModel model = new CustomizeAppsManagerURLDialogModel((CloudFoundryBootDashModel)section);
- cfUi().openEditAppsManagerURLDialog(model);
- }
- }
-
- @Override
- public EnumSet showIn() {
- return EnumSet.of(Location.CUSTOMIZE_MENU);
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/EnableJmxSshTunnelAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/EnableJmxSshTunnelAction.java
deleted file mode 100644
index 424506789..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/EnableJmxSshTunnelAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.PlatformUI;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudAppDashElement;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudFoundryBootDashModel;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel.ElementStateListener;
-import org.springframework.ide.eclipse.boot.dash.model.RunState;
-import org.springsource.ide.eclipse.commons.livexp.util.Log;
-
-public class EnableJmxSshTunnelAction extends AbstractCloudAppDashElementsAction {
-
- private ElementStateListener stateListener;
-
- public EnableJmxSshTunnelAction(Params params) {
- super(params);
- this.setText("Enable JMX Ssh Tunneling");
- this.setToolTipText("Enables JMX on this app and creates an SSH Tunnel the next time the app is started.");
- URL url = FileLocator.find(Platform.getBundle("org.springframework.ide.eclipse.boot.dash"), new Path("icons/link_to_editor.png"), null);
- if (url != null) {
- this.setImageDescriptor(ImageDescriptor.createFromURL(url));
- }
- if (model != null) {
- model.addElementStateListener(stateListener = new ElementStateListener() {
- @Override
- public void stateChanged(BootDashElement e) {
- if (getSelectedElements().contains(e) && !PlatformUI.getWorkbench().isClosing()) {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- @Override
- public void run() {
- updateEnablement();
- }
- });
- }
- }
- });
- }
- }
-
- @Override
- public void updateEnablement() {
- boolean enable = false;
- boolean enableTunnel = false;
- if (getSelectedElements().size()==1) {
- BootDashElement e = getSelectedElements().iterator().next();
- if (e instanceof CloudAppDashElement && e.getProject() != null) {
- CloudAppDashElement cde = (CloudAppDashElement) e;
- enable = true;
- enableTunnel = !cde.getEnableJmxSshTunnel();
- }
- }
- this.setEnabled(enable);
- if (enable) {
- setText((enableTunnel ? "Enable" : "Disable")+" JMX Ssh Tunnelling");
- } else {
- setText("Toggle JMX Ssh Tunnelling");
- }
- }
-
- @Override
- public void run() {
- try {
- for (BootDashElement _e : getSelectedElements()) {
- if (_e instanceof CloudAppDashElement && _e.getBootDashModel() instanceof CloudFoundryBootDashModel && _e.getProject() != null) {
- CloudAppDashElement e = (CloudAppDashElement) _e;
- boolean enable = !e.getEnableJmxSshTunnel();
- e.setEnableJmxSshTunnel(enable);
- RunState runstate = e.getRunState();
- if (runstate!=RunState.INACTIVE) {
- int answer = ui().confirmOperation((enable ? "Enabling" : "Disabling") +" JMX Requires Restart",
- "Enabling JMX is done by setting environment parameters on startup. For this setting to take effect the app needs to be restarted.\n\n" +
- "Do you want to restart now?",
- new String[] {
- "Yes, Restart NOW",
- "No, I'll restart MANUALLY later"
- },
- 0
- );
- if (answer==0) {
- RunState runningOrDebugging = runstate==RunState.DEBUGGING ? RunState.DEBUGGING : RunState.RUNNING;
- e.restart(runningOrDebugging, ui());
- }
- }
- }
- }
- } catch (Exception e) {
- Log.log(e);
- }
- }
-
- @Override
- public void dispose() {
- if (model != null && stateListener != null) {
- model.removeElementStateListener(stateListener);
- stateListener = null;
- }
- super.dispose();
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/OpenCloudAdminConsoleAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/OpenCloudAdminConsoleAction.java
deleted file mode 100644
index 9eff60721..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/OpenCloudAdminConsoleAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 Pivotal Software, 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudFoundryBootDashModel;
-import org.springframework.ide.eclipse.boot.dash.cf.runtarget.CloudFoundryRunTarget;
-import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel;
-import org.springframework.ide.eclipse.boot.dash.model.RunTarget;
-import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
-
-/**
- * @author Martin Lippert
- */
-public class OpenCloudAdminConsoleAction extends AbstractCloudDashModelAction {
-
- public OpenCloudAdminConsoleAction(LiveExpression sectionSelection, SimpleDIContext ui) {
- super(sectionSelection, ui);
- this.setText("Open Cloud Admin Console");
- this.setToolTipText("Opens the Cloud Administration Console for this Cloud Foundry Space and Organisation");
- this.setImageDescriptor(BootDashActivator.getImageDescriptor("icons/cloud_obj.png"));
- }
-
- @Override
- public void run() {
- final BootDashModel targetModel = sectionSelection.getValue();
- if (targetModel != null) {
- RunTarget target = targetModel.getRunTarget();
- if (target instanceof CloudFoundryRunTarget) {
- ((CloudFoundryRunTarget) target).openCloudAdminConsole(ui());
- }
- }
- }
-
- @Override
- public void updateEnablement() {
- final BootDashModel targetModel = sectionSelection.getValue();
- if (targetModel != null) {
- RunTarget runTarget = targetModel.getRunTarget();
- this.setEnabled(runTarget instanceof CloudFoundryRunTarget);
- } else {
- this.setEnabled(false);
- }
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/ReconnectCloudConsoleAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/ReconnectCloudConsoleAction.java
deleted file mode 100644
index c84af7442..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/ReconnectCloudConsoleAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudAppDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashElementsAction;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashElementsAction.Params;
-
-public class ReconnectCloudConsoleAction extends AbstractCloudAppDashElementsAction {
-
- public ReconnectCloudConsoleAction(Params params) {
- super(params);
- this.setText("Reconnect Console");
- this.setToolTipText("Reconnect Console");
- this.setImageDescriptor(BootDashActivator.getImageDescriptor("icons/open_console.png"));
- this.setDisabledImageDescriptor(BootDashActivator.getImageDescriptor("icons/open_console_disabled.png"));
- }
-
- @Override
- public void run() {
- final Collection selecteds = getSelectedElements();
-
- Job job = new Job("Reconnecting console") {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- doShowConsoles(selecteds);
- return Status.OK_STATUS;
- }
-
- };
- job.schedule();
- }
-
- protected void doShowConsoles(Collection selectedElements) {
-
- if (selectedElements != null) {
-
- Iterator it = selectedElements.iterator();
-
- // Show first element only for now
- if (it.hasNext()) {
- BootDashElement element = selectedElements.iterator().next();
- BootDashModel model = element.getBootDashModel();
- try {
- if (model.getElementConsoleManager() != null) {
- model.getElementConsoleManager().reconnect(element);
- }
- } catch (Exception e) {
- ui().errorPopup("Reconnect Console Failure", e.getMessage());
- }
- }
- }
- }
-
- @Override
- public void updateEnablement() {
- boolean enable = false;
- if (!getSelectedElements().isEmpty()) {
- enable = true;
- for (BootDashElement e : getSelectedElements()) {
- if (!(e instanceof CloudAppDashElement)) {
- enable = false;
- break;
- }
- }
- }
-
- this.setEnabled(enable);
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/RestartApplicationOnlyAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/RestartApplicationOnlyAction.java
deleted file mode 100644
index 184fcca11..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/RestartApplicationOnlyAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2017 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudAppDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashElementsAction;
-import org.springframework.ide.eclipse.boot.dash.views.AbstractBootDashElementsAction.Params;
-
-public class RestartApplicationOnlyAction extends AbstractCloudAppDashElementsAction {
-
- public RestartApplicationOnlyAction(Params params) {
- super(params);
- this.setText("Restart Only");
- this.setToolTipText("Restarts the application without uploading changes.");
- this.setImageDescriptor(BootDashActivator.getImageDescriptor("icons/restart.png"));
- this.setDisabledImageDescriptor(BootDashActivator.getImageDescriptor("icons/restart_disabled.png"));
- }
-
- @Override
- public void run() {
- Job job = new Job("Restarting apps") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- for (BootDashElement el : getSelectedElements()) {
-
- if (el instanceof CloudAppDashElement) {
- try {
- CloudAppDashElement cloudAppDashElement = (CloudAppDashElement) el;
- cloudAppDashElement.restartOnlyAsynch(ui(), cloudAppDashElement.createCancelationToken());
- } catch (Exception e) {
- ui().errorPopup("Error restarting application", e.getMessage());
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- };
- job.schedule();
- }
-
- @Override
- public void updateEnablement() {
- boolean enable = false;
- if (!getSelectedElements().isEmpty()) {
- enable = true;
- for (BootDashElement e : getSelectedElements()) {
- if (!(e instanceof CloudAppDashElement)) {
- enable = false;
- break;
- }
- }
- }
-
- this.setEnabled(enable);
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/SelectManifestAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/SelectManifestAction.java
deleted file mode 100644
index fab71e1aa..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/SelectManifestAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudAppDashElement;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudFoundryBootDashModel;
-import org.springframework.ide.eclipse.boot.dash.cf.ops.SelectManifestOp;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashElement;
-import org.springframework.ide.eclipse.boot.dash.model.UserInteractions;
-
-public class SelectManifestAction extends AbstractCloudAppDashElementsAction {
-
- public SelectManifestAction(Params params) {
- super(params);
- params.getContext().assertDefinitionFor(UserInteractions.class);
- this.setText("Select Manifest");
- this.setToolTipText("Selects a manifest YAML file to use during application restart.");
- this.setImageDescriptor(BootDashActivator.getImageDescriptor("icons/selectmanifest.gif"));
- }
-
- @Override
- public void run() {
- CloudAppDashElement element = getSelectedCloudElementWithProject();
- if (element != null) {
- CloudFoundryBootDashModel model = element.getBootDashModel();
- model.runAsynch(new SelectManifestOp(element), ui());
- }
- }
-
- @Override
- public void updateEnablement() {
- this.setEnabled(getSelectedCloudElementWithProject() != null);
- }
-
- protected CloudAppDashElement getSelectedCloudElementWithProject() {
- if (getSelectedElements().size() == 1) {
-
- for (BootDashElement e : getSelectedElements()) {
- if (e instanceof CloudAppDashElement) {
- CloudAppDashElement cde = (CloudAppDashElement) e;
- if (cde.getProject() != null && cde.getProject().isAccessible()) {
- return cde;
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/UpdatePasswordAction.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/UpdatePasswordAction.java
deleted file mode 100644
index d7d215c9d..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/actions/UpdatePasswordAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.actions;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-import org.eclipse.core.runtime.Status;
-import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
-import org.springframework.ide.eclipse.boot.dash.cf.model.CloudFoundryBootDashModel;
-import org.springframework.ide.eclipse.boot.dash.cf.runtarget.CloudFoundryRunTarget;
-import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext;
-import org.springframework.ide.eclipse.boot.dash.model.BootDashModel;
-import org.springframework.ide.eclipse.boot.dash.model.RunTarget;
-import org.springframework.ide.eclipse.boot.dash.model.RunTargetWithProperties;
-import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
-import org.springsource.ide.eclipse.commons.livexp.util.Log;
-
-public class UpdatePasswordAction extends AbstractCloudDashModelAction {
-
- public UpdatePasswordAction(LiveExpression sectionSelection, SimpleDIContext context) {
- super(sectionSelection, context);
- this.setText("Update Password");
- this.setToolTipText("Update password locally for the selected target.");
- this.setImageDescriptor(BootDashActivator.getImageDescriptor("icons/update_password.png"));
- }
-
- CompletableFuture lastRunCompletion = null;
-
- /**
- * This is meant for test-code only, so that test can we wait for the action (part f which is executed in
- * a job) to complete.
- */
- public void waitFor() throws InterruptedException, ExecutionException {
- if (lastRunCompletion!=null) {
- lastRunCompletion.get();
- }
- }
-
- @Override
- public void run() {
- CompletableFuture lastRunCompletion = this.lastRunCompletion = new CompletableFuture<>();
- try {
- final CloudFoundryBootDashModel targetModel = (CloudFoundryBootDashModel) sectionSelection.getValue();
- final CloudFoundryRunTarget runTarget = targetModel.getRunTarget();
- if (runTarget!=null) {
- targetModel.refreshTracker.callAsync("Updating password...", () -> {
- runTarget.updatePasswordAndConnect();
- lastRunCompletion.complete(null);
- return Status.OK_STATUS;
- });
- }
- } catch (Exception e) {
- Log.log(e);
- }
- }
-
- @Override
- public void updateEnablement() {
- this.setEnabled(getCredentialsHolder(sectionSelection.getValue())!=null);
- }
-
- @Override
- public void updateVisibility() {
- setVisible(getCredentialsHolder(sectionSelection.getValue()) != null);
- }
-
- private RunTargetWithProperties getCredentialsHolder(BootDashModel section) {
- if (section!=null) {
- RunTarget target = section.getRunTarget();
- if (target instanceof RunTargetWithProperties) {
- RunTargetWithProperties targetWithProps = (RunTargetWithProperties) target;
- if (targetWithProps.requiresCredentials()) {
- return targetWithProps;
- }
- }
- }
- return null;
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFAppState.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFAppState.java
deleted file mode 100644
index 5b8ead367..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFAppState.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public enum CFAppState {
-
- STOPPED,
- STARTED,
- UNKNOWN
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplication.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplication.java
deleted file mode 100644
index 341ea5819..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplication.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-public interface CFApplication extends CFEntity {
- //TODO: lots of this infos should be moved to application details
-
- int getInstances();
- int getRunningInstances();
- int getMemory();
- UUID getGuid();
- List getServices();
- String getBuildpackUrl();
- List getUris();
- CFAppState getState();
- int getDiskQuota();
- Integer getTimeout();
- String getCommand();
- String getStack();
-
- Map getEnvAsMap();
- String getHealthCheckType();
- String getHealthCheckHttpEndpoint();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplicationArchive.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplicationArchive.java
deleted file mode 100644
index e91ecf189..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplicationArchive.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public interface CFApplicationArchive {
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplicationDetail.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplicationDetail.java
deleted file mode 100644
index 591dfb285..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFApplicationDetail.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.util.List;
-
-public interface CFApplicationDetail extends CFApplication {
- List getInstanceDetails();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFBuildpack.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFBuildpack.java
deleted file mode 100644
index 40f2704ef..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFBuildpack.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public interface CFBuildpack {
- String getName();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFClientParams.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFClientParams.java
deleted file mode 100644
index 3632d0bef..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFClientParams.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.net.URI;
-
-import org.eclipse.core.runtime.Assert;
-import org.springframework.ide.eclipse.boot.core.BootActivator;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFCredentials.CFCredentialType;
-import org.springframework.ide.eclipse.boot.dash.cf.runtarget.CloudFoundryTargetProperties;
-
-/**
- * All the parameters needed to create a CF client.
- *
- * @author Kris De Volder
- */
-public class CFClientParams {
-
- private final String apiUrl;
- private final String username;
- private CFCredentials credentials;
- private final boolean isSelfSigned;
- private final boolean skipSslValidation;
-
- private String orgName; // optional
- private String spaceName; //optional
-
- public CFClientParams(String apiUrl,
- String username,
- CFCredentials credentials,
- boolean isSelfSigned,
- String orgName,
- String spaceName,
- boolean skipSslValidation
- ) {
- Assert.isNotNull(apiUrl, "apiUrl is required");
- Assert.isNotNull(credentials, "credentials required");
- if (credentials.getType()==CFCredentialType.PASSWORD) {
- Assert.isNotNull(username, "username is required");
- }
- this.apiUrl = apiUrl;
- this.username = username;
- this.credentials = credentials;
- this.isSelfSigned = isSelfSigned;
- this.skipSslValidation = skipSslValidation;
- this.orgName = orgName;
- this.spaceName = spaceName;
- }
-
- public CFClientParams(CloudFoundryTargetProperties targetProperties) throws Exception {
- this(
- targetProperties.getUrl(),
- targetProperties.getUsername(),
- targetProperties.getCredentials(),
- targetProperties.isSelfsigned(),
- targetProperties.getOrganizationName(),
- targetProperties.getSpaceName(),
- targetProperties.skipSslValidation()
- );
- }
-
- public CFCredentials getCredentials() {
- return credentials;
- }
-
- public String getUsername() {
- return username;
- }
-
- public boolean isSelfsigned() {
- return isSelfSigned;
- }
-
- public boolean skipSslValidation() {
- return skipSslValidation;
- }
-
- public String getApiUrl() {
- return apiUrl;
- }
-
- public String getOrgName() {
- return orgName;
- }
-
- public void setOrgName(String orgName) {
- this.orgName = orgName;
- }
-
- public String getSpaceName() {
- return spaceName;
- }
-
- public void setSpaceName(String spaceName) {
- this.spaceName = spaceName;
- }
-
- public String getHost() {
- try {
- URI uri = new URI(getApiUrl());
- return uri.getHost();
- } catch (Exception e) {
- BootActivator.log(e);
- }
- return null;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((apiUrl == null) ? 0 : apiUrl.hashCode());
- result = prime * result + (isSelfSigned ? 1231 : 1237);
- result = prime * result + ((orgName == null) ? 0 : orgName.hashCode());
- result = prime * result + ((credentials == null) ? 0 : credentials.hashCode());
- result = prime * result + ((spaceName == null) ? 0 : spaceName.hashCode());
- result = prime * result + ((username == null) ? 0 : username.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- CFClientParams other = (CFClientParams) obj;
- if (apiUrl == null) {
- if (other.apiUrl != null)
- return false;
- } else if (!apiUrl.equals(other.apiUrl))
- return false;
- if (isSelfSigned != other.isSelfSigned)
- return false;
- if (orgName == null) {
- if (other.orgName != null)
- return false;
- } else if (!orgName.equals(other.orgName))
- return false;
- if (credentials == null) {
- if (other.credentials != null)
- return false;
- } else if (!credentials.equals(other.credentials))
- return false;
- if (spaceName == null) {
- if (other.spaceName != null)
- return false;
- } else if (!spaceName.equals(other.spaceName))
- return false;
- if (username == null) {
- if (other.username != null)
- return false;
- } else if (!username.equals(other.username))
- return false;
- return true;
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFCloudDomain.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFCloudDomain.java
deleted file mode 100644
index 041f81e7b..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFCloudDomain.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import org.springframework.ide.eclipse.boot.dash.cf.client.v2.CFDomainStatus;
-
-public interface CFCloudDomain {
- String getName();
- CFDomainType getType();
- CFDomainStatus getStatus();
-
- /**
- * If the given hostAndDomain is of the form ${host}.${domain} then
- * return the host part. Otherwise return null.
- */
- default String splitHost(String hostAndDomain) {
- String name = getName();
- if (hostAndDomain.endsWith("."+name)) {
- return hostAndDomain.substring(0, hostAndDomain.length()-name.length()-1);
- }
- return null;
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFCredentials.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFCredentials.java
deleted file mode 100644
index 26548feee..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFCredentials.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.core.runtime.Assert;
-import org.springsource.ide.eclipse.commons.livexp.ui.Ilabelable;
-
-public class CFCredentials {
-
- public enum CFCredentialType {
- PASSWORD,
- TEMPORARY_CODE,
- REFRESH_TOKEN;
-
- public LoginMethod toLoginMethod() {
- switch (this) {
- case PASSWORD:
- return LoginMethod.PASSWORD;
- case TEMPORARY_CODE:
- return LoginMethod.TEMPORARY_CODE;
- default:
- return null;
- }
- }
- }
-
- public enum LoginMethod implements Ilabelable {
- PASSWORD,
- TEMPORARY_CODE;
-
- @Override
- public String getLabel() {
- String[] pieces = name().split("_");
- StringBuilder label = new StringBuilder();
- for (int i = 0; i < pieces.length; i++) {
- if (i>0) {
- label.append(" ");
- }
- label.append(StringUtils.capitalize(pieces[i].toLowerCase()));
- }
- return label.toString();
- }
- }
-
- private final CFCredentialType type;
- private final String secret;
-
- /**
- * Deprecated, use fromLogin instead
- */
- @Deprecated
- public static CFCredentials fromPassword(String password) {
- return fromLogin(LoginMethod.PASSWORD, password);
- }
-
-
- public static CFCredentials fromLogin(LoginMethod method, String secret) {
- CFCredentialType type;
- switch (method) {
- case PASSWORD:
- type = CFCredentialType.PASSWORD;
- break;
- case TEMPORARY_CODE:
- type = CFCredentialType.TEMPORARY_CODE;
- break;
- default:
- throw new IllegalStateException("Bug! Missing switch case?");
- }
- return new CFCredentials(type, secret);
- }
-
- public static CFCredentials fromRefreshToken(String refreshToken) {
- Assert.isNotNull(refreshToken);
- return new CFCredentials(CFCredentialType.REFRESH_TOKEN, refreshToken);
- }
-
- public String getSecret() {
- return secret;
- }
-
- /////////////////////////////////////////////////////////////////////////
-
-
- /**
- * Private constuctor, use static `fromXXX` factory methods instead.
- */
- private CFCredentials(CFCredentialType type, String secret) {
- this.type = type;
- this.secret = secret;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((secret == null) ? 0 : secret.hashCode());
- result = prime * result + ((type == null) ? 0 : type.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- CFCredentials other = (CFCredentials) obj;
- if (secret == null) {
- if (other.secret != null)
- return false;
- } else if (!secret.equals(other.secret))
- return false;
- if (type != other.type)
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "CFCredentials [type=" + type + ", secret=" + hidePassword(type, secret) + "]";
- }
-
- private String hidePassword(CFCredentialType type, String password) {
- if (password==null) {
- return null;
- }
- return type==CFCredentialType.PASSWORD
- ? "****"
- : password;
- }
-
-
- public CFCredentialType getType() {
- return type;
- }
-
- public static CFCredentials fromSsoToken(String ssoToken) {
- return CFCredentials.fromLogin(LoginMethod.TEMPORARY_CODE, ssoToken);
- }
-}
\ No newline at end of file
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFDomainType.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFDomainType.java
deleted file mode 100644
index c3045c34a..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFDomainType.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Spring IDE Developers
- * 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Spring IDE Developers - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public enum CFDomainType {
- HTTP, TCP
-}
-
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFEntity.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFEntity.java
deleted file mode 100644
index ff7618bff..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFEntity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public interface CFEntity {
- String getName();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFExceptions.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFExceptions.java
deleted file mode 100644
index 1ababe0a5..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFExceptions.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import org.cloudfoundry.uaa.UaaException;
-import org.springsource.ide.eclipse.commons.livexp.util.ExceptionUtil;
-
-/**
- * Static methods to recognize specific types of exceptions CF client
- * may throw.
- *
- * @author Kris De Volder
- */
-public class CFExceptions {
-
- public static boolean isAuthFailure(Exception e) {
- String msg = ExceptionUtil.getMessage(e);
- return msg.contains("Bad credentials") || ExceptionUtil.getDeepestCause(e) instanceof UaaException;
- }
-
- public static boolean isSSLCertificateFailure(Exception e) {
- Throwable cause = ExceptionUtil.getDeepestCause(e);
- return cause.getClass().getName().equals("sun.security.provider.certpath.SunCertPathBuilderException");
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFInstanceState.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFInstanceState.java
deleted file mode 100644
index cc98f66b6..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFInstanceState.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public enum CFInstanceState {
- RUNNING, CRASHED, FLAPPING, STARTING, DOWN, UNKNOWN
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFInstanceStats.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFInstanceStats.java
deleted file mode 100644
index 6d0953f8f..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFInstanceStats.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public interface CFInstanceStats {
-
- CFInstanceState getState();
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFOrganization.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFOrganization.java
deleted file mode 100644
index a6504fa02..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFOrganization.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.util.UUID;
-
-public interface CFOrganization extends CFEntity {
- UUID getGuid();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFServiceInstance.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFServiceInstance.java
deleted file mode 100644
index fa9f57d8f..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFServiceInstance.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public interface CFServiceInstance extends CFEntity {
-
- String getName();
- String getService();
- String getPlan();
- String getDescription();
- String getDocumentationUrl();
- String getDashboardUrl();
-
- //TODO: last operation info?
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFSpace.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFSpace.java
deleted file mode 100644
index bb5e0b553..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFSpace.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.util.UUID;
-
-public interface CFSpace extends CFEntity {
- CFOrganization getOrganization();
- UUID getGuid();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFStack.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFStack.java
deleted file mode 100644
index 29be393fa..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CFStack.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public interface CFStack extends CFEntity {
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/ClientRequests.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/ClientRequests.java
deleted file mode 100644
index 6389e341c..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/ClientRequests.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.osgi.framework.Version;
-import org.springframework.ide.eclipse.boot.dash.cf.client.v2.CFPushArguments;
-import org.springframework.ide.eclipse.boot.dash.console.IApplicationLogConsole;
-import org.springframework.ide.eclipse.boot.dash.util.CancelationTokens.CancelationToken;
-import org.springsource.ide.eclipse.commons.livexp.ui.Disposable;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface ClientRequests extends Disposable {
-
- /**
- * The actual Rest API version that cloud controller claims to be.
- */
- Version getApiVersion() throws Exception;
-
- /**
- * The minimum version that the CF V2 java client claims to support.
- */
- Version getSupportedApiVersion();
-
- /**
- * Returns null if the application does not exist. Throws some kind of Exception if there's any other kind of problem.
- */
- CFApplicationDetail getApplication(String appName) throws Exception;
-
- //TODO: consider removing the getXXXSupport method and directly adding the apis that these support
- // objects provide.
- SshClientSupport getSshClientSupport() throws Exception;
-
-
- void deleteApplication(String name) throws Exception;
-
- List getApplicationsWithBasicInfo() throws Exception;
- List getBuildpacks() throws Exception;
- List getDomains() throws Exception;
- List getServices() throws Exception;
- List getSpaces() throws Exception;
- List getStacks() throws Exception;
- void restartApplication(String appName, CancelationToken token) throws Exception;
- void stopApplication(String appName) throws Exception;
- reactor.core.Disposable streamLogs(String appName, IApplicationLogConsole logConsole) throws Exception;
- Flux getApplicationDetails(List appsToLookUp) throws Exception;
- String getHealthCheck(UUID appGuid) throws Exception;
- void setHealthCheck(UUID guid, String hcType) throws Exception;
- boolean applicationExists(String appName) throws Exception;
-
- //Added since v2:
- void push(CFPushArguments args, CancelationToken cancelationToken) throws Exception;
- Map getApplicationEnvironment(String appName) throws Exception;
- Mono deleteServiceAsync(String serviceName);
-
- /**
- * Gets current value of the client's refresh token. Note that the token is only set once it is known.
- * Initially, if a client is created via password auth, then the refreshToken won't be known until
- * some operation has been executed.
- *
- * @return Refresh token if it is already known, null otherwise.
- */
- String getRefreshToken();
- Mono getUserName();
-
- /**
- * The returned flux will provide the current token in its onNext immediately, if there is a current
- * token already. Subsequent onNext will be fired whenever the token changes.
- */
- Flux getRefreshTokens();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CloudAppInstances.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CloudAppInstances.java
deleted file mode 100644
index 354b7167b..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CloudAppInstances.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-
-/**
- * A Cloud application with additional stats and instances information
- *
- * This should be removed. Use {@link CFApplicationDetail} instead. It contains
- * all the same infos.
- */
-@Deprecated
-public class CloudAppInstances {
-
- private final CFApplication app;
- private final List stats;
-
- public CloudAppInstances(CFApplication app, List stats) {
- Assert.isNotNull(app);
- this.app = app;
- this.stats = stats;
- }
-
- public CFApplication getApplication() {
- return app;
- }
-
- public List getStats() {
- return stats;
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CloudFoundryClientFactory.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CloudFoundryClientFactory.java
deleted file mode 100644
index 0df2c19fc..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/CloudFoundryClientFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import org.springframework.ide.eclipse.boot.dash.cf.runtarget.CloudFoundryTargetProperties;
-
-public abstract class CloudFoundryClientFactory {
-
- public abstract ClientRequests getClient(CFClientParams params);
-
- /**
- * Get the client for an existing {@link CloudFoundryRunTarget}. Note that
- * this may require the password to be set for that runtarget.
- *
- * @param runTarget
- * @return client if connection was successful.
- * @throws Exception
- * if there was an error connecting, including if password is
- * not set or invalid.
- */
- public final ClientRequests getClient(CloudFoundryTargetProperties targetProperties) throws Exception {
- return getClient(new CFClientParams(targetProperties));
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/HealthChecks.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/HealthChecks.java
deleted file mode 100644
index b531e8b10..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/HealthChecks.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public class HealthChecks {
-
- public static final String HC_PORT = "port";
- public static final String HC_PROCESS = "process";
- public static final String HC_HTTP = "http";
- public static final String[] HC_ALL = {HC_PORT, HC_PROCESS, HC_HTTP};
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/InstanceState.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/InstanceState.java
deleted file mode 100644
index de67ab7c3..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/InstanceState.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009-2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-/**
- * Enum used for the state of an instance
- *
- * Note: copied over from CF V1 client code.
- *
- * @author Thomas Risberg
- */
-public enum InstanceState {
- DOWN, STARTING, RUNNING, CRASHED, FLAPPING, UNKNOWN;
-
- public static InstanceState valueOfWithDefault(String s) {
- try {
- return InstanceState.valueOf(s);
- } catch (IllegalArgumentException e) {
- return InstanceState.UNKNOWN;
- }
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/RequestErrorHandler.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/RequestErrorHandler.java
deleted file mode 100644
index 63c1f2c99..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/RequestErrorHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-public class RequestErrorHandler {
-
- /**
- *
- * @param e
- * @return true if request error should be treated as an error and thrown. False error
- * should be ignored.
- */
- public boolean throwError(Throwable e) {
- return true;
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/SshClientSupport.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/SshClientSupport.java
deleted file mode 100644
index 35cbef140..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/SshClientSupport.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Pivotal Software, 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-import java.util.UUID;
-
-public interface SshClientSupport {
-
- SshHost getSshHost() throws Exception;
- String getSshUser(String appName, int instance) throws Exception;
- String getSshCode() throws Exception;
-
- /**
- * Deprecated because it is not supported with V2. Use the method based on appName instead.
- */
- @Deprecated
- String getSshUser(UUID appGuid, int instance) throws Exception;
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/SshHost.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/SshHost.java
deleted file mode 100644
index f9fcf1975..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/SshHost.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 Pivotal Software, 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client;
-
-/**
- * Info object containing various bits of info about the host to which an ssh
- * client may wish to connect.
- *
- * @author Kris De Volder
- */
-public class SshHost {
-
- final private String host;
-
- final private int port;
-
- final private String fingerPrint;
-
- public SshHost(String host, int port, String fingerPrint) {
- super();
- this.host = host;
- this.port = port;
- this.fingerPrint = fingerPrint;
- }
-
- public String getFingerPrint() {
- return fingerPrint;
- }
-
- public int getPort() {
- return port;
- }
-
- public String getHost() {
- return host;
- }
-
- @Override
- public String toString() {
- return "SshHost [host=" //$NON-NLS-1$
- + host + ", port=" //$NON-NLS-1$
- + port + ", fingerPrint=" //$NON-NLS-1$
- + fingerPrint + "]";//$NON-NLS-1$
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/ApplicationExtras.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/ApplicationExtras.java
deleted file mode 100644
index aaf953e1a..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/ApplicationExtras.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.util.List;
-import java.util.Map;
-
-import reactor.core.publisher.Mono;
-
-/**
- * Extrat bits of info that are 'prefetched' asynchronously to fill
- * out the CFApplication with info that C2 client doesn't initially return.
- *
- * @author Kris De Volder
- */
-public interface ApplicationExtras {
- Mono> getEnv();
- Mono> getServices();
- Mono getBuildpack();
- Mono getStack();
- Mono getTimeout();
- Mono getCommand();
- Mono getHealthCheckType();
- Mono getHealthCheckHttpEndpoint();
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFApplicationDetailData.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFApplicationDetailData.java
deleted file mode 100644
index 66800b1e4..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFApplicationDetailData.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.util.List;
-
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFApplicationDetail;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFInstanceStats;
-
-public class CFApplicationDetailData extends CFApplicationSummaryData implements CFApplicationDetail {
-
- private List instanceDetails;
-
- public CFApplicationDetailData(
- CFApplicationSummaryData app,
- List instanceDetails
- ) {
- super(
- app.getName(),
- app.getInstances(),
- app.getRunningInstances(),
- app.getMemory(),
- app.getGuid(),
- app.getUris(),
- app.getState(),
- app.getDiskQuota(),
- app.extras
- );
- this.instanceDetails = instanceDetails;
- }
-
- @Override
- public List getInstanceDetails() {
- return instanceDetails;
- }
-
- @Override
- public String toString() {
- StringBuilder buf = new StringBuilder();
- buf.append("CFApplicationDetail(\n");
- buf.append(" name = "+getName()+"\n");
- buf.append(" instance = "+getInstances()+"\n");
- buf.append(" runningInstances = "+getRunningInstances()+"\n");
- buf.append(" memory = "+getMemory()+"\n");
- buf.append(" guid = "+getGuid()+"\n");
- buf.append(" uris = "+getUris()+"\n");
- buf.append(" state = "+getState()+"\n");
- buf.append(" diskQuota = "+getDiskQuota()+"\n");
- buf.append(" instanceDetails = "+getInstanceDetails()+"\n");
- buf.append(")\n");
- return buf.toString();
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFApplicationSummaryData.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFApplicationSummaryData.java
deleted file mode 100644
index 4f7cd8dd2..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFApplicationSummaryData.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFAppState;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFApplication;
-
-public class CFApplicationSummaryData implements CFApplication {
-
- private String name;
- private int instances;
- private int runningInstances;
- private int memory;
- private UUID guid;
- private List uris;
- private CFAppState state;
- private int diskQuota;
- protected ApplicationExtras extras;
-
- public CFApplicationSummaryData(
- String name,
- int instances,
- int runningInstances,
- int memory,
- UUID guid,
- List uris,
- CFAppState state,
- int diskQuota,
- ApplicationExtras extras
- ) {
- super();
- this.name = name;
- this.instances = instances;
- this.runningInstances = runningInstances;
- this.memory = memory;
- this.guid = guid;
- this.uris = uris;
- this.state = state;
- this.diskQuota = diskQuota;
- this.extras = extras;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public int getInstances() {
- return instances;
- }
-
- @Override
- public int getRunningInstances() {
- return runningInstances;
- }
-
- @Override
- public int getMemory() {
- return memory;
- }
-
- @Override
- public UUID getGuid() {
- return guid;
- }
-
- @Override
- public List getServices() {
- return extras.getServices().block(DefaultClientRequestsV2.GET_SERVICES_TIMEOUT);
- }
-
- @Override
- public String getBuildpackUrl() {
- return extras.getBuildpack().block(DefaultClientRequestsV2.GET_SMALL_INFO_TIMEOUT);
- }
-
- @Override
- public List getUris() {
- return uris;
- }
-
- @Override
- public CFAppState getState() {
- return state;
- }
-
- @Override
- public int getDiskQuota() {
- return diskQuota;
- }
-
- @Override
- public Integer getTimeout() {
- return extras.getTimeout().block(DefaultClientRequestsV2.GET_SMALL_INFO_TIMEOUT);
- }
-
- @Override
- public String getHealthCheckType() {
- return extras.getHealthCheckType().block(DefaultClientRequestsV2.GET_SMALL_INFO_TIMEOUT);
- }
-
- @Override
- public String getCommand() {
- return extras.getCommand().block(DefaultClientRequestsV2.GET_SMALL_INFO_TIMEOUT);
- }
-
- @Override
- public String getStack() {
- return extras.getStack().block(DefaultClientRequestsV2.GET_SMALL_INFO_TIMEOUT);
- }
-
- @Override
- public Map getEnvAsMap() {
- return extras.getEnv().block(DefaultClientRequestsV2.GET_SMALL_INFO_TIMEOUT);
- }
-
- @Override
- public String getHealthCheckHttpEndpoint() {
- return extras.getHealthCheckHttpEndpoint().block(DefaultClientRequestsV2.GET_SMALL_INFO_TIMEOUT);
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFCloudDomainData.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFCloudDomainData.java
deleted file mode 100644
index c8b4445b1..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFCloudDomainData.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Spring IDE Developers
- * 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Spring IDE Developers - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFCloudDomain;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFDomainType;
-
-public final class CFCloudDomainData implements CFCloudDomain {
- private final String name;
- private final CFDomainType type;
- private final CFDomainStatus status;
-
- public CFCloudDomainData(String name, CFDomainType type, CFDomainStatus status) {
- super();
- this.name = name;
- this.type = type;
- this.status = status;
- }
-
- public CFCloudDomainData(String name) {
- this(name, CFDomainType.HTTP, CFDomainStatus.SHARED);
- }
-
- @Override
- public CFDomainType getType() {
- return type;
- }
-
- @Override
- public CFDomainStatus getStatus() {
- return status;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public String toString() {
- return "CFCloudDomainData [name=" + name + ", type=" + type + ", status=" + status + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((status == null) ? 0 : status.hashCode());
- result = prime * result + ((type == null) ? 0 : type.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- CFCloudDomainData other = (CFCloudDomainData) obj;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- if (status != other.status)
- return false;
- if (type != other.type)
- return false;
- return true;
- }
-
-}
\ No newline at end of file
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFDomainStatus.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFDomainStatus.java
deleted file mode 100644
index 87cd867f0..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFDomainStatus.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Spring IDE Developers
- * 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Spring IDE Developers - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-public enum CFDomainStatus {
- OWNED, SHARED
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFPushArguments.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFPushArguments.java
deleted file mode 100644
index 9e53e63e6..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFPushArguments.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.Assert;
-import org.springframework.ide.eclipse.boot.dash.cloudfoundry.deployment.DeploymentProperties;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Arguments passed to push operation.
- *
- * @author Kris De Volder
- * @author Nieraj Singh
- */
-public class CFPushArguments implements AutoCloseable {
- private List routes = ImmutableList.of();
- private String appName;
- private Integer memory;
- private Integer diskQuota;
- private Integer timeout;
- private String buildpack;
- private String command;
- private String stack;
- private String healthCheckType;
- private Map env = ImmutableMap.of();
- private Integer instances;
- private List services = ImmutableList.of();
- private File applicationDataAsFile;
- private boolean noStart = false;
- private boolean randomRoute = false;
- private String healthCheckHttpEndpoint;
-
- public CFPushArguments() {
- }
-
- public String getAppName() {
- return appName;
- }
- public void setAppName(String appName) {
- this.appName = appName;
- }
- public Integer getMemory() {
- return memory;
- }
- public void setMemory(Integer memory) {
- this.memory = memory;
- }
- public Integer getDiskQuota() {
- return diskQuota;
- }
- public void setDiskQuota(Integer diskQuota) {
- this.diskQuota = diskQuota;
- }
- public Integer getTimeout() {
- return timeout;
- }
- public void setTimeout(Integer timeout) {
- this.timeout = timeout;
- }
- public String getBuildpack() {
- return buildpack;
- }
- public void setBuildpack(String buildpack) {
- this.buildpack = buildpack;
- }
- public String getCommand() {
- return command;
- }
- public void setCommand(String command) {
- this.command = command;
- }
- public String getStack() {
- return stack;
- }
- public void setStack(String stack) {
- this.stack = stack;
- }
- public Map getEnv() {
- return env;
- }
- public void setEnv(Map env) {
- this.env = env;
- }
- public Integer getInstances() {
- return instances;
- }
- public void setInstances(Integer instances) {
- this.instances = instances;
- }
- public List getServices() {
- return services;
- }
- public void setServices(List services) {
- this.services = services;
- }
- public boolean getRandomRoute() {
- return this.randomRoute;
- }
- public void setRandomRoute(boolean randomRoute) {
- this.randomRoute = randomRoute;
- }
- public File getApplicationDataAsFile() {
- return applicationDataAsFile;
- }
- public void setApplicationData(File archive) throws Exception {
- Assert.isLegal(this.applicationDataAsFile==null, "Can only set this once");
- this.applicationDataAsFile=archive;
- }
- public boolean isNoStart() {
- return noStart;
- }
- public void setNoStart(boolean noStart) {
- this.noStart = noStart;
- }
- public String getHealthCheckType() {
- if (healthCheckType==null) {
- return DeploymentProperties.DEFAULT_HEALTH_CHECK_TYPE;
- }
- return healthCheckType;
- }
- public void setHealthCheckType(String healthCheckType) {
- this.healthCheckType = healthCheckType;
- }
- public List getRoutes() {
- return routes;
- }
- public void setRoutes(Collection routes) {
- this.routes = routes == null ? ImmutableList.of() : ImmutableList.copyOf(routes);
- }
- public void setRoutes(String... routes) {
- setRoutes(ImmutableList.copyOf(routes));
- }
- @Override
- public String toString() {
- return "CFPushArguments [appName=" + appName + ", routes=" + routes + ", memory=" + memory + ", diskQuota="
- + diskQuota + ", timeout=" + timeout + ", buildpack=" + buildpack + ", command=" + command + ", stack="
- + stack + ", env=" + env + ", instances=" + instances + ", services=" + services + ", noStart="
- + noStart + ", healthCheckType="+ healthCheckType+ ", randomRoute="+ randomRoute+" ]";
- }
-
- public void setHealthCheckHttpEndpoint(String healthCheckHttpEndpoint) {
- this.healthCheckHttpEndpoint = healthCheckHttpEndpoint;
- }
-
- public String getHealthCheckHttpEndpoint() {
- return this.healthCheckHttpEndpoint;
- }
-
- @Override
- public void close() throws Exception {
- //This used to do something more useful, we kept it for now to avoid having to
- // change a lot of code. But calling `close` is no longer needed and does nothing.
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFRoute.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFRoute.java
deleted file mode 100644
index 5a1a6e686..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFRoute.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2017 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import org.springsource.ide.eclipse.commons.core.util.StringUtil;
-import org.springsource.ide.eclipse.commons.livexp.util.ExceptionUtil;
-
-public class CFRoute {
-
- public static final int NO_PORT = -1;
- public static final String EMPTY_ROUTE = "";
-
- final private String domain;
- final private String host;
- final private String path;
- final private int port;
- final private String fullRoute;
-
- CFRoute(String domain, String host, String path, int port, String fullRoute) {
- super();
- this.domain = domain;
- this.host = host;
- this.path = path;
- this.port = port;
- this.fullRoute = fullRoute;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public String getHost() {
- return host;
- }
-
- public String getPath() {
- return path;
- }
-
- public int getPort() {
- return port;
- }
-
- public String getRoute() {
- return fullRoute;
- }
-
- public void validate() throws Exception {
- if (!StringUtil.hasText(getDomain())) {
- throw ExceptionUtil.coreException("Invalid route: No domain set.");
- }
- }
-
- @Override
- public String toString() {
- return "CFRoute [domain=" + domain + ", host=" + host + ", path=" + path + ", port=" + port +"]";
- }
-
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((domain == null) ? 0 : domain.hashCode());
- result = prime * result + ((fullRoute == null) ? 0 : fullRoute.hashCode());
- result = prime * result + ((host == null) ? 0 : host.hashCode());
- result = prime * result + ((path == null) ? 0 : path.hashCode());
- result = prime * result + port;
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- CFRoute other = (CFRoute) obj;
- if (domain == null) {
- if (other.domain != null)
- return false;
- } else if (!domain.equals(other.domain))
- return false;
- if (fullRoute == null) {
- if (other.fullRoute != null)
- return false;
- } else if (!fullRoute.equals(other.fullRoute))
- return false;
- if (host == null) {
- if (other.host != null)
- return false;
- } else if (!host.equals(other.host))
- return false;
- if (path == null) {
- if (other.path != null)
- return false;
- } else if (!path.equals(other.path))
- return false;
- if (port != other.port)
- return false;
- return true;
- }
-
- public static CFRouteBuilder builder() {
- return new CFRouteBuilder();
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFRouteBuilder.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFRouteBuilder.java
deleted file mode 100644
index 1c081d19d..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFRouteBuilder.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.cloudfoundry.operations.routes.Route;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFCloudDomain;
-import org.springframework.ide.eclipse.boot.util.Log;
-import org.springsource.ide.eclipse.commons.core.util.StringUtil;
-
-public class CFRouteBuilder {
- private String domain;
- private String host;
- private String path;
- private int port = CFRoute.NO_PORT;
- private String fullRoute;
-
- public CFRoute build() {
- return new CFRoute(this.domain, this.host, this.path, this.port, this.fullRoute);
- }
-
- public CFRouteBuilder domain(String domain) {
- this.domain = domain;
- // may seem like the more ideal place is to build the full route when
- // building the route, rather than repeating
- // the process each time a domain, host, path or port value is set
- // but the "from" option should be allowed to overwrite the full route
- // as well since it already
- // has the full value. Therefore re-construct the full value if the
- // route is being built piece by piece, but not in from
- this.fullRoute = buildRouteVal(this.host, this.domain, this.path, this.port);
- return this;
- }
-
- public CFRouteBuilder host(String host) {
- this.host = host;
- this.fullRoute = buildRouteVal(this.host, this.domain, this.path, this.port);
- return this;
- }
-
- public CFRouteBuilder path(String path) {
- this.path = path;
- this.fullRoute = buildRouteVal(this.host, this.domain, this.path, this.port);
- return this;
- }
-
- public CFRouteBuilder port(int port) {
- this.port = port;
- this.fullRoute = buildRouteVal(this.host, this.domain, this.path, this.port);
- return this;
- }
-
- public CFRouteBuilder from(Route route) {
- // Route doesn't seem to have API to get a port
- this.port = CFRoute.NO_PORT;
- this.domain = route.getDomain();
- this.host = route.getHost();
- this.path = route.getPath();
- this.fullRoute = buildRouteVal(this.host, this.domain, this.path, this.port);
- return this;
- }
-
- /**
- * Builds a {@link CFRoute} given a desiredUrl. This does NOT validate, and
- * will attempt to build a route the best way it can given the desiredUrl.
- * External components, like the CF Java client, can then validate the
- * CFRoute.
- *
- * @param desiredUrl
- * @param domains
- * @return this builder
- */
- public CFRouteBuilder from(String desiredUrl, Collection domains) {
-
-
- //If it is empty or null, there is nothing to build. However, be sure that the
- // full route value is non-null, even if the "components" may be null
- if (!StringUtil.hasText(desiredUrl)) {
- this.fullRoute = CFRoute.EMPTY_ROUTE;
- return this;
- } else {
- // Be sure to set the full route.
- this.fullRoute = desiredUrl;
- }
-
- // Based on CLI cf/actors/routes.go and testing CLI directly with
- // different "routes" values:
- // 1. Paths is not allowed in TCP route (valid TCP route:
- // "tcp.spring.io:8888")
- // 2. Ports are not allowed in HTTP route (valid HTTP route:
- // "myapps.cfapps.io/pathToApp/home")
- // 3. Schemes (e.g. "http://") are not allowed in routes values.
- // Anything that has a ":" is assumed to be TCP route followed by a port
- // 4. Route can just be domain, or host and domain
- //
- // Therefore, routes values cannot be treated as URIs or URLs, but a
- // combination of domain, host, path and port
- // NOTE: The validation above doesn't need to take place here. The
- // client or CF will validate correct combinations of routes.
- // However, We may want to implement similar
- // validation to the CF manifest editor though.
-
- String matchedHost = null;
- String hostAndDomain = null;
-
- // Split into hostDomain segment, port and path
- int slashIndex = desiredUrl.indexOf('/');
- if (slashIndex >= 0) {
- hostAndDomain = desiredUrl.substring(0, slashIndex);
- String tempPath = desiredUrl.substring(slashIndex);
- // Do not set empty strings. If there is no path, then it should be
- // null
- if (StringUtil.hasText(tempPath)) {
- this.path = tempPath;
- }
- } else {
- hostAndDomain = desiredUrl;
- }
-
- // CF Route builder does not validate, so don't allow exceptions to
- // prevent parsing of the route. The builder should attempt to build
- // a route the best way it can, even if it may have invalid information.
- // This allows external participants, like the CF Java client, to
- // perform validation
- try {
- String[] portSegments = hostAndDomain.split(":");
- if (portSegments.length == 2) {
- hostAndDomain = portSegments[0];
- this.port = Integer.parseInt(portSegments[1]);
- }
- } catch (NumberFormatException e) {
- Log.log(e);
- }
-
- this.domain = findDomain(hostAndDomain, domains);
-
- if (this.domain != null) {
- matchedHost = hostAndDomain.substring(0, hostAndDomain.length() - this.domain.length());
- if (matchedHost.endsWith(".")) {
- matchedHost = matchedHost.substring(0, matchedHost.length() - 1);
- }
-
- // Don't set empty strings
- if (StringUtil.hasText(matchedHost)) {
- this.host = matchedHost;
- }
- } else {
- // Do a basic split on '.', where first segment is the host, and the
- // rest domain
- int firstDotIndex = hostAndDomain.indexOf('.');
- if (firstDotIndex >= 0) {
- String tempDomain = hostAndDomain.substring(firstDotIndex + 1);
- // Don't set empty strings
- if (StringUtil.hasText(tempDomain)) {
- this.domain = tempDomain;
- }
-
- String tempHost = hostAndDomain.substring(0, firstDotIndex);
- if (StringUtil.hasText(tempHost)) {
- this.host = tempHost;
- }
- } else {
- if (StringUtil.hasText(hostAndDomain)) {
- this.host = hostAndDomain;
- }
- }
- }
-
- return this;
- }
-
- public static String findDomain(String hostDomain, Collection domains) {
- if (hostDomain == null) {
- return null;
- }
- // find exact match
- for (String name : domains) {
- if (hostDomain.equals(name)) {
- return hostDomain;
- }
- }
- // Otherwise split on the first "." and try again
- if (hostDomain.indexOf(".") >= 0 && hostDomain.indexOf(".") + 1 < hostDomain.length()) {
- String remaining = hostDomain.substring(hostDomain.indexOf(".") + 1, hostDomain.length());
- return findDomain(remaining, domains);
- } else {
- return null;
- }
- }
-
- /**
- * A basic building of a full route value. It performs no validation, just
- * builds based on whether the parameter are set
- *
- * @param host
- * @param domain
- * @param path
- * @param port
- * @return Route value build with the given components. Always returns a non-null route. Empty route if no arguments are passed.
- */
- public static String buildRouteVal(String host, String domain, String path, int port) {
-
- StringBuilder builder = new StringBuilder();
- if (StringUtil.hasText(host)) {
- builder.append(host);
- }
-
- if (StringUtil.hasText(domain)) {
- if (StringUtil.hasText(host)) {
- builder.append('.');
- }
- builder.append(domain);
- }
-
- if (port != CFRoute.NO_PORT) {
- builder.append(':');
- builder.append(Integer.toString(port));
- }
-
- if (StringUtil.hasText(path)) {
- if (!path.startsWith("/")) {
- builder.append('/');
- }
- builder.append(path);
- }
-
- return builder.toString();
- }
-
- public CFRouteBuilder from(String desiredUrl, List cloudDomains) {
- List domains = cloudDomains
- .stream()
- .map(CFCloudDomain::getName)
- .collect(Collectors.toList());
- return from(desiredUrl, domains);
- }
-}
\ No newline at end of file
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFWrappingV2.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFWrappingV2.java
deleted file mode 100644
index 0e0c7a00c..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CFWrappingV2.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import org.cloudfoundry.client.v2.buildpacks.BuildpackResource;
-import org.cloudfoundry.operations.applications.ApplicationDetail;
-import org.cloudfoundry.operations.applications.ApplicationSummary;
-import org.cloudfoundry.operations.applications.InstanceDetail;
-import org.cloudfoundry.operations.domains.Domain;
-import org.cloudfoundry.operations.domains.Status;
-import org.cloudfoundry.operations.organizations.OrganizationSummary;
-import org.cloudfoundry.operations.services.ServiceInstance;
-import org.cloudfoundry.operations.services.ServiceInstanceType;
-import org.cloudfoundry.operations.spaces.SpaceSummary;
-import org.cloudfoundry.operations.stacks.Stack;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFAppState;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFApplication;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFApplicationDetail;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFBuildpack;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFCloudDomain;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFDomainType;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFInstanceState;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFInstanceStats;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFOrganization;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFServiceInstance;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFSpace;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFStack;
-import org.springframework.ide.eclipse.boot.util.Log;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Various helper methods to 'wrap' objects returned by CF client into
- * our own types, so that we do not directly expose library types to our
- * code.
- *
- * @author Kris De Volder
- */
-public class CFWrappingV2 {
-
- public static CFBuildpack wrap(BuildpackResource rsrc) {
- String name = rsrc.getEntity().getName();
- return new CFBuildpack() {
- @Override
- public String getName() {
- return name;
- }
- };
- }
-
- public static CFApplicationDetail wrap(ApplicationDetail details, ApplicationExtras extras) {
- if (details!=null) {
- List instances = ImmutableList.copyOf(
- details.getInstanceDetails()
- .stream()
- .map(CFWrappingV2::wrap)
- .collect(Collectors.toList())
- );
- CFApplicationSummaryData summary = wrapSummary(details, extras);
- return new CFApplicationDetailData(
- summary,
- instances
- );
- }
- return null;
- }
-
- public static CFStack wrap(Stack stack) {
- if (stack!=null) {
- String name = stack.getName();
- return new CFStack() {
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public String toString() {
- return "CFStack("+name+")";
- }
- };
- }
- return null;
- }
-
- public static CFApplicationDetail wrap(
- CFApplicationSummaryData summary,
- ApplicationDetail details
- ) {
- List instanceDetails = ImmutableList.copyOf(
- details
- .getInstanceDetails()
- .stream()
- .map(CFWrappingV2::wrap)
- .collect(Collectors.toList())
- );
- return new CFApplicationDetailData(summary, instanceDetails);
- }
-
- public static CFCloudDomain wrap(Domain domain) {
- if (domain!=null) {
- return new CFCloudDomainData(
- domain.getName(),
- CFWrappingV2.wrapDomainType(domain.getType()),
- CFWrappingV2.wrap(domain.getStatus())
- );
- }
- return null;
- }
-
- public static CFDomainStatus wrap(Status status) {
- if (status!=null) {
- return CFDomainStatus.valueOf(status.name());
- }
- return null;
- }
-
- public static CFDomainType wrapDomainType(String type) {
- if (type!=null) {
- return CFDomainType.valueOf(type.toUpperCase());
- }
- return CFDomainType.HTTP;
- }
-
- public static CFInstanceStats wrap(InstanceDetail instanceDetail) {
- return new CFInstanceStats() {
- @Override
- public CFInstanceState getState() {
- try {
- return CFInstanceState.valueOf(instanceDetail.getState());
- } catch (Exception e) {
- Log.log(e);
- return CFInstanceState.UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return ""+getState();
- }
- };
- }
-
- private static CFApplicationSummaryData wrapSummary(ApplicationDetail app, ApplicationExtras extras) {
- CFAppState state;
- try {
- state = CFAppState.valueOf(app.getRequestedState());
- } catch (Exception e) {
- Log.log(e);
- state = CFAppState.UNKNOWN;
- }
-
- return new CFApplicationSummaryData(
- app.getName(),
- app.getInstances(),
- app.getRunningInstances(),
- app.getMemoryLimit(),
- UUID.fromString(app.getId()),
- app.getUrls(),
- state,
- app.getDiskQuota(),
- extras
- );
- }
-
- public static CFApplication wrap(ApplicationSummary app, ApplicationExtras extras) {
- CFAppState state;
- try {
- state = CFAppState.valueOf(app.getRequestedState());
- } catch (Exception e) {
- Log.log(e);
- state = CFAppState.UNKNOWN;
- }
-
- return new CFApplicationSummaryData(
- app.getName(),
- app.getInstances(),
- app.getRunningInstances(),
- app.getMemoryLimit(),
- UUID.fromString(app.getId()),
- app.getUrls(),
- state,
- app.getDiskQuota(),
- extras
- );
- }
-
- public static CFServiceInstance wrap(final ServiceInstance service) {
- return new CFServiceInstance() {
-
- @Override
- public String getName() {
- return service.getName();
- }
-
- @Override
- public String getPlan() {
- return service.getPlan();
- }
-
- @Override
- public String getDashboardUrl() {
- return service.getDashboardUrl();
- }
-
- @Override
- public String getService() {
- if (service.getType()==ServiceInstanceType.USER_PROVIDED) {
- return "user-provided";
- } else {
- return service.getService();
- }
- }
-
- @Override
- public String getDescription() {
- return service.getDescription();
- }
-
- @Override
- public String getDocumentationUrl() {
- return service.getDocumentationUrl();
- }
- };
- }
-
- public static CFAppState wrapAppState(String s) {
- try {
- return CFAppState.valueOf(s);
- } catch (Exception e) {
- Log.log(e);
- return CFAppState.UNKNOWN;
- }
- }
-
- public static CFSpace wrap(OrganizationSummary org, SpaceSummary space) {
- return new CFSpace() {
- @Override
- public String getName() {
- return space.getName();
- }
- @Override
- public CFOrganization getOrganization() {
- return wrap(org);
- }
- @Override
- public UUID getGuid() {
- return UUID.fromString(space.getId());
- }
-
- @Override
- public String toString() {
- return "CFSpace("+org.getName()+" / "+getName()+")";
- }
- };
- }
-
- public static CFOrganization wrap(OrganizationSummary org) {
- return new CFOrganization() {
- @Override
- public String getName() {
- return org.getName();
- }
-
- @Override
- public UUID getGuid() {
- return UUID.fromString(org.getId());
- }
- };
- }
-
- public static CFBuildpack buildpack(String name) {
- return new CFBuildpack() {
- @Override
- public String getName() {
- return name;
- }
- };
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CloudFoundryClientCache.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CloudFoundryClientCache.java
deleted file mode 100644
index f7709bb4e..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/CloudFoundryClientCache.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2018 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.net.URL;
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import org.cloudfoundry.client.CloudFoundryClient;
-import org.cloudfoundry.client.v2.info.GetInfoRequest;
-import org.cloudfoundry.client.v2.info.GetInfoResponse;
-import org.cloudfoundry.reactor.DefaultConnectionContext;
-import org.cloudfoundry.reactor.ProxyConfiguration;
-import org.cloudfoundry.reactor.TokenProvider;
-import org.cloudfoundry.reactor.client.ReactorCloudFoundryClient;
-import org.cloudfoundry.reactor.doppler.ReactorDopplerClient;
-import org.cloudfoundry.reactor.tokenprovider.OneTimePasscodeTokenProvider;
-import org.cloudfoundry.reactor.tokenprovider.PasswordGrantTokenProvider;
-import org.cloudfoundry.reactor.tokenprovider.RefreshTokenGrantTokenProvider;
-import org.cloudfoundry.reactor.uaa.ReactorUaaClient;
-import org.eclipse.core.net.proxy.IProxyData;
-import org.eclipse.core.net.proxy.IProxyService;
-import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFCredentials;
-import org.springframework.ide.eclipse.boot.util.Log;
-import org.springsource.ide.eclipse.commons.frameworks.core.util.StringUtils;
-
-import reactor.core.publisher.Mono;
-
-/**
- * TODO: Remove this class when the 'thread leak bug' in V2 client is fixed.
- *
- * At the moment each time {@link SpringCloudFoundryClient} is create a threadpool
- * is created by the client and it is never cleaned up. The only way we have
- * to mitigate this leak is to try and create as few clients as possible.
- *
- * So we have a permanent cache of clients here that is reused.
- *
- * When the bug is fixed then this should no longer be necessary and we can removed this cache
- * and just create the client as needed.
- *
- * @author Kris De Volder
- */
-public class CloudFoundryClientCache {
-
- public class CFClientProvider {
-
- final DefaultConnectionContext connection;
- final TokenProvider tokenProvider;
-
- //Note: the three client objects below are 'stateless' wrappers and it would be
- // fine to recreate as needed instead of store them
-
- final CloudFoundryClient client;
- final ReactorUaaClient uaaClient;
- final ReactorDopplerClient doppler;
- final Mono info;
-
- private ProxyConfiguration getProxy(String host) {
- try {
- if (StringUtils.hasText(host)) {
- URL url = new URL("https://"+host);
- // In certain cases, the activator would have stopped and the plugin may
- // no longer be available. Usually onl happens on shutdown.
- BootDashActivator plugin = BootDashActivator.getDefault();
- if (plugin != null) {
- IProxyService proxyService = plugin.getProxyService();
- if (proxyService != null) {
- IProxyData[] selectedProxies = proxyService.select(url.toURI());
-
- // No proxy configured or not found
- if (selectedProxies == null || selectedProxies.length == 0) {
- return null;
- }
-
- IProxyData data = selectedProxies[0];
- int proxyPort = data.getPort();
- String proxyHost = data.getHost();
- String user = data.getUserId();
- String password = data.getPassword();
- if (proxyHost!=null) {
- return ProxyConfiguration.builder()
- .host(proxyHost)
- .port(proxyPort==-1?Optional.empty():Optional.of(proxyPort))
- .username(Optional.ofNullable(user))
- .password(Optional.ofNullable(password))
- .build();
-// return proxyHost != null ? new HttpProxyConfiguration(proxyHost, proxyPort,
-// data.isRequiresAuthentication(), user, password) : null;
- }
- }
- }
- }
- } catch (Exception e) {
- Log.log(e);
- }
- return null;
- }
-
- public CFClientProvider(Params params) {
- long sslTimeout = Long.getLong("sts.bootdash.cf.client.ssl.handshake.timeout", 60); //TODO: make a preference for this?
- Optional keepAlive = getBooleanSystemProp("http.keepAlive");
- debug("cf client keepAlive = "+keepAlive);
- connection = DefaultConnectionContext.builder()
- .proxyConfiguration(Optional.ofNullable(getProxy(params.host)))
- .apiHost(params.host)
- .sslHandshakeTimeout(Duration.ofSeconds(sslTimeout))
- .keepAlive(keepAlive)
- .skipSslValidation(params.skipSsl)
- .build();
-
- tokenProvider = createTokenProvider(params);
-
- client = ReactorCloudFoundryClient.builder()
- .connectionContext(connection)
- .tokenProvider(tokenProvider)
- .build();
-
- uaaClient = ReactorUaaClient.builder()
- .connectionContext(connection)
- .tokenProvider(tokenProvider)
- .build();
-
- doppler = ReactorDopplerClient.builder()
- .connectionContext(connection)
- .tokenProvider(tokenProvider)
- .build();
-
- // Cache CF client info - workaround for https://www.pivotaltracker.com/story/show/158741609
- info = client.info().get(GetInfoRequest.builder().build()).cache();
- }
-
- private TokenProvider createTokenProvider(Params params) {
- CFCredentials creds = params.credentials;
- switch (creds.getType()) {
- case PASSWORD:
- return PasswordGrantTokenProvider.builder()
- .username(params.username)
- .password(creds.getSecret())
- .build();
- case REFRESH_TOKEN:
- return RefreshTokenGrantTokenProvider.builder()
- .token(creds.getSecret())
- .build();
- case TEMPORARY_CODE:
- return OneTimePasscodeTokenProvider.builder()
- .passcode(creds.getSecret())
- .build();
- default:
- throw new IllegalStateException("BUG! Missing switch case?");
- }
- }
-
- private Optional getBooleanSystemProp(String name) {
- String str = System.getProperty(name);
- if (str!=null) {
- return Optional.of(Boolean.valueOf(str));
- }
- return Optional.empty();
- }
- }
-
- private static final boolean DEBUG = true;
-
- private static void debug(String string) {
- if (DEBUG) {
- System.out.println(string);
- }
- }
-
- public static class Params {
- public final String username;
- public final CFCredentials credentials;
- public final String host;
- public final boolean skipSsl;
- public Params(String username, CFCredentials credentials, String host, boolean skipSsl) {
- super();
- this.username = username;
- this.credentials = credentials;
- this.host = host;
- this.skipSsl = skipSsl;
- }
-
- @Override
- public String toString() {
- return "Params [username=" + username + ", host=" + host + ", skipSsl=" + skipSsl
- + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((host == null) ? 0 : host.hashCode());
- result = prime * result + ((credentials == null) ? 0 : credentials.hashCode());
- result = prime * result + (skipSsl ? 1231 : 1237);
- result = prime * result + ((username == null) ? 0 : username.hashCode());
- return result;
- }
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Params other = (Params) obj;
- if (host == null) {
- if (other.host != null)
- return false;
- } else if (!host.equals(other.host))
- return false;
- if (credentials == null) {
- if (other.credentials != null)
- return false;
- } else if (!credentials.equals(other.credentials))
- return false;
- if (skipSsl != other.skipSsl)
- return false;
- if (username == null) {
- if (other.username != null)
- return false;
- } else if (!username.equals(other.username))
- return false;
- return true;
- }
- }
-
- private Map cache = new HashMap<>();
-
- private int clientCount = 0;
-
- public synchronized CFClientProvider getOrCreate(String username, CFCredentials credentials, String host, boolean skipSsl) {
- Params params = new Params(username, credentials, host, skipSsl);
- CFClientProvider client = cache.get(params);
- if (client==null) {
- clientCount++;
- debug("Creating client ["+clientCount+"]: "+params);
- cache.put(params, client = create(params));
- } else {
- debug("Reusing client ["+clientCount+"]: "+params);
- }
- return client;
- }
-
- protected CFClientProvider create(Params params) {
- return new CFClientProvider(params);
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/DefaultClientRequestsV2.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/DefaultClientRequestsV2.java
deleted file mode 100644
index edae43a2d..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/DefaultClientRequestsV2.java
+++ /dev/null
@@ -1,1376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2018 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.cloudfoundry.client.CloudFoundryClient;
-import org.cloudfoundry.client.v2.applications.ApplicationEntity;
-import org.cloudfoundry.client.v2.applications.GetApplicationResponse;
-import org.cloudfoundry.client.v2.applications.UpdateApplicationRequest;
-import org.cloudfoundry.client.v2.applications.UpdateApplicationResponse;
-import org.cloudfoundry.client.v2.buildpacks.ListBuildpacksRequest;
-import org.cloudfoundry.client.v2.buildpacks.ListBuildpacksResponse;
-import org.cloudfoundry.client.v2.info.GetInfoRequest;
-import org.cloudfoundry.client.v2.info.GetInfoResponse;
-import org.cloudfoundry.client.v2.serviceinstances.DeleteServiceInstanceRequest;
-import org.cloudfoundry.client.v2.stacks.GetStackRequest;
-import org.cloudfoundry.client.v2.stacks.GetStackResponse;
-import org.cloudfoundry.client.v2.userprovidedserviceinstances.DeleteUserProvidedServiceInstanceRequest;
-import org.cloudfoundry.client.v2.users.GetUserRequest;
-import org.cloudfoundry.doppler.LogMessage;
-import org.cloudfoundry.doppler.MessageType;
-import org.cloudfoundry.operations.CloudFoundryOperations;
-import org.cloudfoundry.operations.DefaultCloudFoundryOperations;
-import org.cloudfoundry.operations.applications.ApplicationDetail;
-import org.cloudfoundry.operations.applications.ApplicationHealthCheck;
-import org.cloudfoundry.operations.applications.ApplicationManifest;
-import org.cloudfoundry.operations.applications.DeleteApplicationRequest;
-import org.cloudfoundry.operations.applications.GetApplicationEnvironmentsRequest;
-import org.cloudfoundry.operations.applications.GetApplicationRequest;
-import org.cloudfoundry.operations.applications.LogsRequest;
-import org.cloudfoundry.operations.applications.PushApplicationManifestRequest;
-import org.cloudfoundry.operations.applications.RestartApplicationRequest;
-import org.cloudfoundry.operations.applications.StartApplicationRequest;
-import org.cloudfoundry.operations.applications.StopApplicationRequest;
-import org.cloudfoundry.operations.domains.Domain;
-import org.cloudfoundry.operations.organizations.OrganizationDetail;
-import org.cloudfoundry.operations.organizations.OrganizationInfoRequest;
-import org.cloudfoundry.operations.organizations.OrganizationSummary;
-import org.cloudfoundry.operations.routes.Level;
-import org.cloudfoundry.operations.routes.ListRoutesRequest;
-import org.cloudfoundry.operations.routes.MapRouteRequest;
-import org.cloudfoundry.operations.routes.UnmapRouteRequest;
-import org.cloudfoundry.operations.services.BindServiceInstanceRequest;
-import org.cloudfoundry.operations.services.CreateServiceInstanceRequest;
-import org.cloudfoundry.operations.services.CreateUserProvidedServiceInstanceRequest;
-import org.cloudfoundry.operations.services.GetServiceInstanceRequest;
-import org.cloudfoundry.operations.services.ServiceInstance;
-import org.cloudfoundry.operations.services.ServiceInstanceSummary;
-import org.cloudfoundry.operations.services.UnbindServiceInstanceRequest;
-import org.cloudfoundry.reactor.DefaultConnectionContext;
-import org.cloudfoundry.reactor.tokenprovider.AbstractUaaTokenProvider;
-import org.cloudfoundry.uaa.UaaClient;
-import org.cloudfoundry.util.PaginationUtils;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Version;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFApplication;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFApplicationDetail;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFBuildpack;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFClientParams;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFCloudDomain;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFDomainType;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFServiceInstance;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFSpace;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFStack;
-import org.springframework.ide.eclipse.boot.dash.cf.client.ClientRequests;
-import org.springframework.ide.eclipse.boot.dash.cf.client.SshClientSupport;
-import org.springframework.ide.eclipse.boot.dash.cf.client.SshHost;
-import org.springframework.ide.eclipse.boot.dash.cf.client.v2.CloudFoundryClientCache.CFClientProvider;
-import org.springframework.ide.eclipse.boot.dash.console.IApplicationLogConsole;
-import org.springframework.ide.eclipse.boot.dash.console.LogType;
-import org.springframework.ide.eclipse.boot.dash.util.CancelationTokens;
-import org.springframework.ide.eclipse.boot.dash.util.CancelationTokens.CancelationToken;
-import org.springframework.ide.eclipse.boot.util.Log;
-import org.springsource.ide.eclipse.commons.core.util.StringUtil;
-import org.springsource.ide.eclipse.commons.livexp.util.ExceptionUtil;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-import reactor.core.Disposable;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * @author Kris De Volder
- * @author Nieraj Singh
- */
-public class DefaultClientRequestsV2 implements ClientRequests {
-
- private static AtomicLong instances = new AtomicLong(0);
-
- public static final Duration APP_START_TIMEOUT = Duration.ofMinutes(10);
- public static final Duration GET_SERVICES_TIMEOUT = Duration.ofSeconds(60);
- public static final Duration GET_SPACES_TIMEOUT = Duration.ofSeconds(20);
- public static final Duration GET_USERNAME_TIMEOUT = Duration.ofSeconds(5);
- public static final Duration GET_SMALL_INFO_TIMEOUT = Duration.ofSeconds(20);
-
- private static final boolean DEBUG = (""+Platform.getLocation()).contains("kdvolder") || (""+Platform.getLocation()).contains("bamboo");
-// private static final boolean DEBUG_REACTOR = (""+Platform.getLocation()).contains("kdvolder");
- //|| (""+Platform.getLocation()).contains("bamboo");
-
-
- private static void debug(String string) {
- if (DEBUG) {
- System.out.println(string);
- }
- }
-
-// static {
-// if (DEBUG_REACTOR) {
-// Loggers.enableExtension(new Extension() {
-// @Override
-// public void log(String category, java.util.logging.Level level, String msg, Object... arguments) {
-// debug(category +"["+level + "] : "+MessageFormatter.format(msg, arguments).getMessage());
-// }
-// });
-// }
-// }
-
-
- private CFClientParams params;
- private CloudFoundryClient _client ;
- private UaaClient _uaa;
- private CloudFoundryOperations _operations;
-
- private Mono orgId;
- private Mono info;
- private AbstractUaaTokenProvider _tokenProvider;
- private DefaultConnectionContext _connection;
- private String refreshToken = null;
- private Flux refreshTokensFlux;
-
- private CompletableFuture _disposed = new CompletableFuture<>();
-
- public DefaultClientRequestsV2(CloudFoundryClientCache clients, CFClientParams params) {
- this.params = params;
- CFClientProvider provider = clients.getOrCreate(params.getUsername(), params.getCredentials(), params.getHost(), params.skipSslValidation());
- this._client = provider.client;
- this._uaa = provider.uaaClient;
- this._tokenProvider = (AbstractUaaTokenProvider) provider.tokenProvider;
- this._connection = provider.connection;
- refreshTokensFlux = _tokenProvider.getRefreshTokens(_connection).takeUntilOther(Mono.fromFuture(_disposed));
- refreshTokensFlux.doOnNext((t) -> {
- this.refreshToken = t;
- }).subscribe();
-
- debug(">>> creating cf operations");
- this._operations = DefaultCloudFoundryOperations.builder()
- .cloudFoundryClient(_client)
- .dopplerClient(provider.doppler)
- .uaaClient(provider.uaaClient)
- .organization(params.getOrgName())
- .space(params.getSpaceName())
- .build();
- debug("<<< creating cf operations");
- this.orgId = getOrgId();
- // Use cached info, workaround for https://www.pivotaltracker.com/story/show/158741609
- this.info = provider.info;
- debug("DefaultClientRequestsV2 created: "+instances.incrementAndGet());
- }
-
- private Mono client_createOperations(OrganizationSummary org) {
- return log("client.createOperations(org="+org.getName()+")",
- Mono.fromCallable(() -> DefaultCloudFoundryOperations.builder()
- .cloudFoundryClient(_client)
- .organization(org.getName())
- .build()
- )
- );
- }
-
- private Mono getOrgId() {
- String orgName = params.getOrgName();
- if (orgName==null) {
- return Mono.error(new IOException("No organization targetted"));
- } else {
- return operations_getOrgId().cache();
- }
- }
-
- @Override
- public List getApplicationsWithBasicInfo() throws Exception {
- return ReactorUtils.get(operations_listApps());
- }
-
- private ApplicationExtras getApplicationExtras(String appName) {
- //Stuff used in computing the 'extras'...
- Mono appIdMono = getApplicationId(appName);
- Mono entity = appIdMono
- .flatMap((appId) ->
- client_getApplication(appId)
- )
- .map((appResource) -> appResource.getEntity())
- .cache();
-
- //The stuff returned from the getters of 'extras'...
- Mono> services = prefetch("services", getBoundServicesList(appName));
- Mono> env = prefetch("env",
- DefaultClientRequestsV2.this.getEnv(appName)
- );
- Mono buildpack = prefetch("buildpack",
- entity.flatMap((e) -> Mono.justOrEmpty(e.getBuildpack()))
- );
-
- Mono stack = prefetch("stack",
- entity.flatMap((e) -> Mono.justOrEmpty(e.getStackId()))
- .flatMap((stackId) -> {
- return client_getStack(stackId);
- }).map((response) -> {
- return response.getEntity().getName();
- })
- );
- Mono timeout = prefetch("timeout",
- entity
- .flatMap((v) -> Mono.justOrEmpty(v.getHealthCheckTimeout()))
- );
-
- Mono command = prefetch("command",
- entity.flatMap((e) -> Mono.justOrEmpty(e.getCommand()))
- );
-
- Mono healthCheckType = prefetch("healthCheckType",
- entity.flatMap((e) -> Mono.justOrEmpty(e.getHealthCheckType()))
- );
-
- Mono healthCheckHttpEndpoint = prefetch("healthCheckHttpEndpoint",
- entity.flatMap((e) -> Mono.justOrEmpty(e.getHealthCheckHttpEndpoint()))
- );
-
- return new ApplicationExtras() {
- @Override
- public Mono> getServices() {
- return services;
- }
-
- @Override
- public Mono> getEnv() {
- return env;
- }
-
- @Override
- public Mono getBuildpack() {
- return buildpack;
- }
-
- @Override
- public Mono getStack() {
- return stack;
- }
-
- @Override
- public Mono getTimeout() {
- return timeout;
- }
-
- @Override
- public Mono getCommand() {
- return command;
- }
-
- @Override
- public Mono getHealthCheckType() {
- return healthCheckType;
- }
-
- @Override
- public Mono getHealthCheckHttpEndpoint() {
- return healthCheckHttpEndpoint;
- }
- };
- }
-
- private Mono prefetch(String id, Mono toFetch) {
- return toFetch
-// .log(id + " before error handler")
- .onErrorResume((error) -> {
- Log.log(new IOException("Failed prefetch '"+id+"'", error));
- return Mono.empty();
- })
-// .log(id + " after error handler")
- .cache()
-// .log(id + "after cache")
- ;
- }
-
-// private Mono prefetch(Mono toFetch) {
-// Mono result = toFetch
-// .cache(); // It should only be fetched once.
-//
-// //We must ensure the 'result' is being consumed by something to force its execution:
-// result
-// .publishOn(SCHEDULER_GROUP) //Ensure the consume is truly async or it may block here.
-// .consume((dont_care) -> {});
-//
-// return result;
-// }
-
- @Override
- public List getServices() throws Exception {
- return ReactorUtils.get(GET_SERVICES_TIMEOUT, CancelationTokens.NULL,
- log("operations.services.listInstances()",
- _operations
- .services()
- .listInstances()
- .flatMap(this::getServiceDetails)
- .map(CFWrappingV2::wrap)
- .collectList()
- .map(ImmutableList::copyOf)
- )
- );
- }
-
-
- private Mono getServiceDetails(ServiceInstanceSummary summary) {
- return log("operations.service.getServiceInstance",
- _operations.services().getInstance(GetServiceInstanceRequest.builder()
- .name(summary.getName())
- .build()
- )
- );
- }
- /**
- * Get details for a given list of applications. This does a 'best' effort getting the details for
- * as many apps as possible but it does not guarantee that it will return details for each app in the
- * list. This is to avoid one 'bad apple' from spoiling the whole batch. (I.e if failing to fetch details for
- * some apps we can still return details for the others rather than throw an exception).
- */
- @Override
- public Flux getApplicationDetails(List appsToLookUp) throws Exception {
- return Flux.fromIterable(appsToLookUp)
- .flatMap((CFApplication appSummary) -> {
- return getApplicationDetail(appSummary.getName())
- .onErrorResume((error) -> {
- Log.log(ExceptionUtil.coreException("getting application details for '"+appSummary.getName()+"' failed", error));
- return Mono.empty();
- })
- .map((ApplicationDetail appDetails) -> CFWrappingV2.wrap((CFApplicationSummaryData)appSummary, appDetails));
- });
- }
-
- @Override
- public Disposable streamLogs(String appName, IApplicationLogConsole logConsole) throws Exception {
- Flux stream = log("operations.applications.logs()",
- _operations.applications()
- .logs(LogsRequest.builder()
- .name(appName)
- // BUG: show recent appears to throw exception with PWS. May be fixed in the future, but now only "pure" streaming is supported
- .recent(false)
- .build()
- )
- )
- .retryWhen(retryInterval(Duration.ofMillis(500), Duration.ofMinutes(1)))
- ;
-
- Disposable cancellation = ReactorUtils.sort(
- stream,
- (m1, m2) -> Long.compare(m1.getTimestamp(), m2.getTimestamp()),
- Duration.ofSeconds(1)
- )
- .map(this::convertMessageFromDoppler)
- .subscribe(logConsole::onMessage, logConsole::onError);
-
- return cancellation;
- }
-
-
- private org.springframework.ide.eclipse.boot.dash.console.LogMessage convertMessageFromDoppler(LogMessage msg) {
- return new org.springframework.ide.eclipse.boot.dash.console.LogMessage(
- convertMessageTypeFromDoppler(msg.getMessageType()),
- msg.getMessage()
- );
- }
-
- private LogType convertMessageTypeFromDoppler(MessageType mt) {
- switch (mt) {
- case OUT:
- return LogType.APP_OUT;
- case ERR:
- return LogType.APP_ERROR;
- default:
- return LogType.APP_OUT;
- }
- }
- /**
- * Creates a retry 'signal factory' to be used with Flux.retryWhen.
- *
- * @param timeBetween How much time to wait before retrying after a failure
- * @param duration If this much time has elapsed when the error happens there will be no further retries.
- * @return Functon that can be passed to retryWhen.
- */
- private Function, Flux> retryInterval(Duration timeBetween, Duration duration) {
- Predicate falseAfterDuration = falseAfter(duration);
- return (errors) -> {
- return errors.flatMap((error) -> {
- if (falseAfterDuration.test(error)) {
- return Mono.delay(timeBetween);
- } else {
- return Mono.error(error);
- }
- });
- };
- }
-
- private Predicate falseAfter(Duration timeToWait) {
- return new Predicate() {
-
- private Long firstCalledAt;
-
- @Override
- public boolean test(Throwable t) {
- if (firstCalledAt==null) {
- firstCalledAt = System.currentTimeMillis();
- }
- long waitedTime = System.currentTimeMillis() - firstCalledAt;
- //debug("falseAfter: remaining = "+(timeToWait.toMillis() - waitedTime));
- return waitedTime < timeToWait.toMillis();
- }
-
- };
- }
-
- @Override
- public void stopApplication(String appName) throws Exception {
- ReactorUtils.get(
- stopApp(appName)
- );
- }
-
- private Mono stopApp(String appName) {
- return log("operations.applications.stop(name="+appName+")",
- _operations.applications().stop(StopApplicationRequest.builder()
- .name(appName)
- .build()
- )
- );
- }
-
- @Override
- public void restartApplication(String appName, CancelationToken cancelationToken) throws Exception {
- ReactorUtils.get(APP_START_TIMEOUT, cancelationToken,
- restartApp(appName)
- );
- }
-
- private Mono restartApp(String appName) {
- return log("operations.applications().restart(name="+appName+")",
- _operations.applications().restart(RestartApplicationRequest.builder()
- .name(appName)
- .build())
- );
- }
-
- @Override
- public void dispose() {
- synchronized (this) {
- if (_client!=null) {
- _client = null;
- _connection = null;
- _operations = null;
- _disposed.complete(true);
- debug("DefaultClientRequestsV2.logout: "+instances.decrementAndGet());
- }
- }
- }
-
- public boolean isLoggedOut() {
- return _client==null;
- }
-
- @Override
- public List getStacks() throws Exception {
- return ReactorUtils.get(
- log("operations.stacks().list()",
- _operations.stacks()
- .list()
- .map(CFWrappingV2::wrap)
- .collectList()
- )
- );
- }
-
- @Override
- public SshClientSupport getSshClientSupport() throws Exception {
- return new SshClientSupport() {
-
- @Override
- public String getSshUser(UUID appGuid, int instance) {
- return "cf:"+appGuid+"/" + instance;
- }
-
- @Override
- public String getSshUser(String appName, int instance) throws Exception {
- return ReactorUtils.get(
- getApplicationId(appName)
- .map((guid) -> getSshUser(guid, instance))
- );
- }
-
- @Override
- public SshHost getSshHost() throws Exception {
- return ReactorUtils.get(
- info.flatMap((i) -> {
- String fingerPrint = i.getApplicationSshHostKeyFingerprint();
- String host = i.getApplicationSshEndpoint();
- int port = 22; //Default ssh port
- if (host!=null) {
- if (host.contains(":")) {
- String[] pieces = host.split(":");
- host = pieces[0];
- port = Integer.parseInt(pieces[1]);
- }
- }
- if (host!=null) {
- return Mono.just(new SshHost(host, port, fingerPrint));
- }
- // Workaround for bug in Eclipse Neon.1 JDT cannot properly infer type SshHost.
- // Works in Mars. Returning Mono.empty() results in compilation error in Neon.1
- return Mono.empty();
- })
- );
- }
-
- @Override
- public String getSshCode() throws Exception {
- return ReactorUtils.get(
- log("operations.advanced.sshCode()",
- _operations.advanced().sshCode()
- )
- );
- }
- };
- }
-
- private Mono operationsFor(OrganizationSummary org) {
- return client_createOperations(org);
- }
-
- @Override
- public List getSpaces() throws Exception {
- Object it = ReactorUtils.get(GET_SPACES_TIMEOUT, log("operations.organizations().list()",
- _operations.organizations()
- .list()
- )
- .flatMap((OrganizationSummary org) -> {
- return operationsFor(org).flatMapMany((operations) ->
- log("operations.spaces.list(org="+org.getId()+")",
- operations
- .spaces()
- .list()
- .map((space) -> CFWrappingV2.wrap(org, space))
- )
- );
- })
- .collectList()
- );
- //workaround eclipse jdt bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=501949
- return (List) it;
- }
-
- @Override
- public String getHealthCheck(UUID appGuid) throws Exception {
- //XXX CF V2: getHealthcheck (via operations API)
- // See: https://www.pivotaltracker.com/story/show/116462215
- return ReactorUtils.get(
- client_getApplication(appGuid)
- .map((response) -> response.getEntity().getHealthCheckType())
- );
- }
-
- @Override
- public void setHealthCheck(UUID guid, String hcType) throws Exception {
- //XXX CF V2: setHealthCheck (via operations API)
- // See: https://www.pivotaltracker.com/story/show/116462369
- ReactorUtils.get(
- client_setHealthCheck(guid, hcType)
- );
- }
-
- @Override
- public List getDomains() throws Exception {
- return getDomainsOracle()
- .getDomainsList();
- }
-
- private DomainsOracle getDomainsOracle() {
- return new DomainsOracle();
- }
-
- /**
- * DomainsOracle answers questions about domains. It only reads the domain information from
- * CF once. (However, every newly created instance of DomainsOracle will read the info the
- * first time it needs it.
- */
- private class DomainsOracle {
- private Mono> domains = orgId
- .flatMapMany(this::requestDomains)
- .map(CFWrappingV2::wrap)
- .collectList()
- .cache();
-
- private Mono> domainsByName = domains
- .map(allDomains -> {
- ImmutableMap.Builder builder = ImmutableMap.builder();
- for (CFCloudDomain d : allDomains) {
- builder.put(d.getName(), d);
- }
- return (Map)builder.build();
- })
- .cache();
-
- public Mono> getDomainsMono() {
- return domains;
- }
-
- public List getDomainsList() throws Exception {
- return ReactorUtils.get(domains);
- }
-
- private Flux requestDomains(String orgId) {
- return log("operations.domains.list",
- _operations.domains().list()
- );
- }
-
- public Mono isTcp(String domainName) {
- return domainsByName.flatMap(dmap -> {
- CFCloudDomain domain = dmap.get(domainName);
- return Mono.just(domain!=null && domain.getType()==CFDomainType.TCP);
- });
- }
- }
-
- @Override
- public List getBuildpacks() throws Exception {
- //XXX CF V2: getBuilpacks using 'operations' API.
- return ReactorUtils.get(
- PaginationUtils.requestClientV2Resources((page) -> {
- return client_listBuildpacks(page);
- })
- .map(CFWrappingV2::wrap)
- .collectList()
- );
- }
-
- @Override
- public CFApplicationDetail getApplication(String appName) throws Exception {
- return ReactorUtils.get(
- getApplicationMono(appName)
- // .log("getApplication("+appName+")")
- );
- }
-
- private Mono getApplicationMono(String appName) {
- return getApplicationDetail(appName)
- .map((appDetail) -> {
- //TODO: we have 'real' appdetails now so we could get most of the 'application extras' info from that.
- return CFWrappingV2.wrap(appDetail, getApplicationExtras(appName));
- })
- .onErrorResume(ReactorUtils.suppressException(IllegalArgumentException.class));
- }
-
- @Override
- public Version getApiVersion() throws Exception {
- return ReactorUtils.get(info
- .map((i) -> new Version(i.getApiVersion()))
- );
- }
-
- @Override
- public Version getSupportedApiVersion() {
- return new Version(CloudFoundryClient.SUPPORTED_API_VERSION);
- }
-
- @Override
- public void deleteApplication(String appName) throws Exception {
- ReactorUtils.get(
- log("operations.applications().delete(name="+appName+")",
- _operations.applications().delete(DeleteApplicationRequest
- .builder()
- .name(appName)
- .build()
- )
- )
- );
- }
-
- @Override
- public boolean applicationExists(String appName) throws Exception {
- return ReactorUtils.get(
- getApplicationMono(appName)
- .map((app) -> true)
- .switchIfEmpty(Mono.just(false))
- );
- }
-
- public Mono ifApplicationExists(String appName, Function> then, Mono els) throws Exception {
- return getApplicationDetail(appName)
- .map((app) -> Optional.of(app))
- .switchIfEmpty(Mono.just(Optional.empty()))
- .onErrorResume((error) -> Mono.just(Optional.empty()))
- .flatMap((Optional app) -> {
- if (app.isPresent()) {
- return then.apply(app.get());
- } else {
- return els;
- }
- });
- }
-
- @Override
- public void push(CFPushArguments params, CancelationToken cancelationToken) throws Exception {
- ReactorUtils.get(APP_START_TIMEOUT, cancelationToken,
- v2Push(params)
- );
- }
-
- private Mono v2Push(CFPushArguments params) {
- String appName = params.getAppName();
-
- // Routes are set AFTER push, so for initial push, make sure no route is set
- boolean noRoute = true;
-
- // Environment variables require app start, so for initial push, do not start app.
- // This will happen afterwards
- boolean noStart = true;
- PushApplicationManifestRequest req = PushApplicationManifestRequest.builder()
- .manifest(ApplicationManifest.builder()
- .name(appName)
- // resource matching occurs under the hood in the push operation
- .path(params.getApplicationDataAsFile().toPath())
- .memory(params.getMemory())
- .disk(params.getDiskQuota())
- .timeout(params.getTimeout())
- .healthCheckType(resolveHealthCheckType(params.getHealthCheckType()).orElse(null))
- .healthCheckHttpEndpoint(params.getHealthCheckHttpEndpoint()==null?"/":params.getHealthCheckHttpEndpoint())
- .buildpack(params.getBuildpack())
- .command(params.getCommand())
- .stack(params.getStack())
- .noRoute(noRoute)
- .instances(params.getInstances())
- .build()
- )
- .noStart(noStart)
- .build();
-
- return log("client.applications.pushManifest("+req+")",
- _operations.applications().pushManifest(req)
- )
- .then(mono_debug("Updating routes, bound services, and environment variables..."))
- .then(getApplicationDetail(appName))
- .flatMap((appDetail) -> {
- return Flux.merge(
- setRoutes(appDetail, params.getRoutes(), params.getRandomRoute()),
- bindAndUnbindServices(appName, params.getServices()),
- // This requires app restart
- setEnvVars(appDetail, params.getEnv())
- ).then();
- })
- // Start app only after environment variables are set
- .then(params.isNoStart()
- ? stopApp(appName)
- : restartApp(appName)
- )
- .then(Mono.empty());
- }
-
- private Mono mono_debug(String string) {
- return Mono.fromRunnable(() -> debug(string));
- }
-
- private Mono> getStackId(CFPushArguments params) {
- String stackName = params.getStack();
- if (stackName==null) {
- return Mono.just(Optional.empty());
- } else {
- return log("operations.stacks.get("+stackName+")",
- _operations.stacks().get(org.cloudfoundry.operations.stacks.GetStackRequest.builder()
- .name(stackName)
- .build()
- )
- .map((stack) -> Optional.of(stack.getId()))
- );
- }
- }
-
- private Optional resolveHealthCheckType(String type) {
- ApplicationHealthCheck appHealthCheck = null;
- if (type != null) {
- try {
- appHealthCheck = ApplicationHealthCheck.from(type);
- } catch (IllegalArgumentException e) {
- Log.log(e);
- }
- }
- return Optional.ofNullable(appHealthCheck);
- }
-
- private Mono getApplicationDetail(String appName) {
- return log("operations.applications.get(name="+appName+")",
- _operations.applications().get(GetApplicationRequest.builder()
- .name(appName)
- .build()
- )
- );
- }
-
- public Mono setRoutes(ApplicationDetail appDetails, Collection desiredUrls, boolean randomRoute) {
- debug("setting routes for '"+appDetails.getName()+"': "+desiredUrls+", "+randomRoute);
- DomainsOracle domains = new DomainsOracle();
-
- //Carefull! It is not safe map/unnmap multiple routes in parallel. Doing so causes some of the
- // operations to fail, presumably because of some 'optimisitic locking' being used in the database
- // that keeps track of routes.
- //To avoid this problem we must execute all that map / unmap calls in sequence!
- return ReactorUtils.sequence(
- unmapUndesiredRoutes(appDetails.getName(), desiredUrls),
- mapDesiredRoutes(appDetails, domains, desiredUrls, randomRoute)
- );
- }
-
- public Mono setRoutes(String appName, Collection desiredUrls, boolean randomRoute) {
- return getApplicationDetail(appName)
- .flatMap(appDetails -> setRoutes(appDetails, desiredUrls, randomRoute));
- }
-
- private Mono mapDesiredRoutes(ApplicationDetail appDetail, DomainsOracle domains, Collection desiredUrls, boolean randomRoute) {
- Set currentUrls = ImmutableSet.copyOf(appDetail.getUrls());
- String appName = appDetail.getName();
-
- debug("currentUrls = "+currentUrls);
- return Flux.fromIterable(desiredUrls)
- .flatMap((url) -> {
- if (currentUrls.contains(url)) {
- debug("skipping: "+url);
- return Mono.empty();
- } else {
- debug("mapping: "+url);
- return mapRoute(domains, appName, url, randomRoute);
- }
- }, 1) //!!!IN SEQUENCE!!!
- .then();
- }
-
- private Mono mapRoute(DomainsOracle domains, String appName, String desiredUrl, boolean randomRoute) {
- debug("mapRoute: "+appName+" -> "+desiredUrl);
- return toRoute(domains, desiredUrl)
- .flatMap((CFRoute route) -> mapRoute(domains, appName, route, randomRoute))
- .doOnError((e) -> {
- Log.info("mapRoute FAILED!");
- Log.log(e);
- });
- }
-
- private Mono mapRoute(DomainsOracle domains, String appName, CFRoute route, boolean randomRoute) {
- // Let the client validate if any of these combinations are correct.
- // However, only set these values only if they are present as not doing so causes NPE
- Mono _builder = Mono.just(MapRouteRequest.builder()
- .applicationName(appName)
- );
- if (StringUtil.hasText(route.getDomain())) {
- _builder = _builder.map(builder -> builder.domain(route.getDomain()));
- }
- if (randomRoute) {
- _builder = _builder.flatMap((MapRouteRequest.Builder builder) ->
- // Can only set random port to true if route is TCP route
- domains.isTcp(route.getDomain()).map(isTcp -> {
- if (isTcp) {
- builder.randomPort(randomRoute);
- } else {
- if (route.getHost()==null) {
- builder.host(appName+"-"+RandomStringUtils.randomAlphabetic(8).toLowerCase());
- }
- }
- return builder;
- })
- );
- }
- _builder = _builder.map(builder -> {
- if (StringUtil.hasText(route.getHost())) {
- builder.host(route.getHost());
- }
- if (StringUtil.hasText(route.getPath())) {
- builder.path(route.getPath());
- }
- if (route.getPort() != CFRoute.NO_PORT) {
- builder.port(route.getPort());
- }
- return builder;
- });
- return _builder.flatMap(builder -> {
- MapRouteRequest mapRouteReq = builder.build();
- return log("operations.routes.map("+mapRouteReq+")",
- _operations.routes().map(mapRouteReq)
- );
- })
- .then();
- }
-
- private Mono toRoute(DomainsOracle domains, String desiredUrl) {
- return domains.getDomainsMono().flatMap((ds) -> {
- try {
- CFRoute route = CFRoute.builder().from(desiredUrl, ds).build();
- route.validate();
- return Mono.just(route);
- } catch (Exception e) {
- return Mono.error(e);
- }
- });
- }
-
-// private Set getUrls(ApplicationDetail app) {
-// return operations.applications().get(GetApplicationRequest.builder()
-// .name(appName)
-// .build()
-// )
-// .map((app) -> ImmutableSet.copyOf(app.getUrls()));
-// }
-
- private Mono unmapUndesiredRoutes(String appName, Collection desiredUrls) {
- return getExistingRoutes(appName)
- .flatMap((route) -> {
- debug("unmap? "+route);
- if (desiredUrls.contains(getUrl(route))) {
- debug("unmap? "+route+" SKIP");
- return Mono.empty();
- } else {
- debug("unmap? "+route+" UNMAP");
- return unmapRoute(appName, route);
- }
- }, 1) //!!!IN SEQUENCE!!!
- .then();
- }
-
- private String getUrl(CFRoute route) {
-// String url = route.getDomain();
-// if (route.getHost()!=null) {
-// url = route.getHost() + "." + url;
-// }
-// String path = route.getPath();
-// if (path!=null) {
-// while (path.startsWith("/")) {
-// path = path.substring(1);
-// }
-// if (StringUtils.hasText(path)) {
-// url = url +"/" +path;
-// }
-// }
- return route.getRoute();
- }
-
- private Mono unmapRoute(String appName, CFRoute route) {
-// if (!StringUtil.hasText(path)) {
-// //client doesn't like to get 'empty string' it will complain that route doesn't exist.
-// path = null;
-// }
- org.cloudfoundry.operations.routes.UnmapRouteRequest.Builder unmapBuilder = UnmapRouteRequest.builder()
- .applicationName(appName)
- .domain(route.getDomain())
- .host(route.getHost());
-
- // Have to check if port and path are set. Cannot just set them without checking
- // otherwise exception throw, even if these values are "empty/null" in the route
- if (route.getPort() != CFRoute.NO_PORT) {
- unmapBuilder.port(route.getPort());
- }
- if (StringUtil.hasText(route.getPath())) {
- unmapBuilder.path(route.getPath());
- }
- UnmapRouteRequest req = unmapBuilder
- .build();
- return log("operations.routes.unmap("+req+")",
- _operations.routes().unmap(req)
- );
- }
-
- public Flux getExistingRoutes(String appName) {
- return log("operations.routes.list(level=SPACE)",
- _operations.routes().list(ListRoutesRequest.builder()
- .level(Level.SPACE)
- .build()
- )
- )
- .flatMap((route) -> {
- for (String app : route.getApplications()) {
- if (app.equals(appName)) {
- return Mono.just(CFRoute.builder().from(route).build());
- }
- };
- return Mono.empty();
- });
- }
-
- public Mono bindAndUnbindServices(String appName, List _services) {
- debug("bindAndUnbindServices "+_services);
- Set services = ImmutableSet.copyOf(_services);
- return getBoundServicesSet(appName)
- .flatMapMany((boundServices) -> {
- debug("boundServices = "+boundServices);
- Set toUnbind = Sets.difference(boundServices, services);
- Set toBind = Sets.difference(services, boundServices);
- debug("toBind = "+toBind);
- debug("toUnbind = "+toUnbind);
- return Flux.merge(
- bindServices(appName, toBind),
- unbindServices(appName, toUnbind)
- );
- })
- .then();
- }
-
- public Flux getBoundServices(String appName) {
- return log("operations.services.listInstances()",
- _operations.services().listInstances()
- )
- .filter((service) -> isBoundTo(service, appName))
- .map(ServiceInstanceSummary::getName);
- }
-
- public Mono> getBoundServicesSet(String appName) {
- return getBoundServices(appName)
- .collectList()
- .map(ImmutableSet::copyOf);
- }
-
- public Mono> getBoundServicesList(String appName) {
- return getBoundServices(appName)
- .collectList()
- .map(ImmutableList::copyOf);
- }
-
- private boolean isBoundTo(ServiceInstanceSummary service, String appName) {
- return service.getApplications().stream()
- .anyMatch((boundAppName) -> boundAppName.equals(appName));
- }
-
- private Flux bindServices(String appName, Set services) {
- return Flux.fromIterable(services)
- .flatMap((service) -> {
- return log("operations.services().bind(appName="+appName+", services="+services+")",
- _operations.services().bind(BindServiceInstanceRequest.builder()
- .applicationName(appName)
- .serviceInstanceName(service)
- .build()
- )
- );
- });
- }
-
- private Flux unbindServices(String appName, Set toUnbind) {
- return Flux.fromIterable(toUnbind)
- .flatMap((service) -> {
- return log("operations.services.unbind(appName="+appName+", serviceInstanceName="+service+")",
- _operations.services().unbind(UnbindServiceInstanceRequest.builder()
- .applicationName(appName)
- .serviceInstanceName(service)
- .build()
- )
- );
- });
- }
-
-
- protected Mono startApp(String appName) {
- return log("operations.applications.start(name="+appName+")",
- _operations.applications()
- .start(StartApplicationRequest.builder()
- .name(appName)
- .build()
- )
- );
- }
-
- private Mono getApplicationId(String appName) {
- return log("operations.applications.get(name="+appName+")",
- _operations.applications().get(GetApplicationRequest.builder()
- .name(appName)
- .build()
- )
- ).map((app) -> UUID.fromString(app.getId()));
- }
-
- public Mono setEnvVars(ApplicationDetail appDetail, Map environment) {
- return setEnvVars(UUID.fromString(appDetail.getId()), environment);
- }
-
- public Mono setEnvVars(UUID appId, Map environment) {
- return client_setEnv(appId, environment);
- }
-
- public Mono setEnvVars(String appName, Map environment) {
- return getApplicationId(appName)
- .flatMap((applicationId) -> setEnvVars(applicationId, environment));
- }
-
-// protected Publisher setEnvVar(String appName, String var, String value) {
-// System.out.println("Set var starting: "+var +" = "+value);
-// return operations.applications()
-// .setEnvironmentVariable(SetEnvironmentVariableApplicationRequest.builder()
-// .name(appName)
-// .variableName(var)
-// .variableValue(value)
-// .build()
-// )
-// .after(() -> {
-// System.out.println("Set var complete: "+var +" = "+value);
-// return Mono.empty();
-// });
-// }
-
- public Mono createService(String name, String service, String plan) {
- return log("operations.services.createInstance(instanceName="+name+",serviceName="+service+",planName="+plan+")",
- _operations.services().createInstance(CreateServiceInstanceRequest.builder()
- .serviceInstanceName(name)
- .serviceName(service)
- .planName(plan)
- .build()
- )
- );
- }
-
- public Mono createUserProvidedService(String name, Map credentials) {
- return log("operations.services.createUserProvidedInstance(name="+name+")",
- _operations.services().createUserProvidedInstance(CreateUserProvidedServiceInstanceRequest.builder()
- .name(name)
- .credentials(credentials)
- .build()
- )
- );
- }
-
-// @Override
-// public void deleteService(String serviceName) {
-// deleteServiceMono(serviceName).get();
-// }
-
- @Override
- public Mono deleteServiceAsync(String serviceName) {
- return getService(serviceName)
- .flatMap(this::deleteServiceInstance);
- }
-
- protected Mono deleteServiceInstance(ServiceInstance s) {
- switch (s.getType()) {
- case MANAGED:
- return client_deleteServiceInstance(s);
- case USER_PROVIDED:
- return client_deleteUserProvidedService(s);
- default:
- return Mono.error(new IllegalStateException("Unknown service type: "+s.getType()));
- }
- }
-
- protected Mono getService(String serviceName) {
- return log("operations.services.getInstance(name="+serviceName+")",
- _operations.services().getInstance(GetServiceInstanceRequest.builder()
- .name(serviceName)
- .build()
- )
- );
- }
-
- public Mono> getEnv(String appName) {
- return log("operations.applications.getEnvironments(appName="+appName+")",
- _operations.applications().getEnvironments(GetApplicationEnvironmentsRequest.builder()
- .name(appName)
- .build()
- )
- )
- .map((envs) -> envs.getUserProvided())
- .map(this::dropObjectsFromMap);
- }
-
- @Override
- public Map getApplicationEnvironment(String appName) throws Exception {
- return ReactorUtils.get(getEnv(appName));
- }
-
- private Map dropObjectsFromMap(Map map) {
- Builder builder = ImmutableMap.builder();
- for (Entry entry : map.entrySet()) {
- try {
- builder.put(entry.getKey(), (String) entry.getValue());
- } catch (ClassCastException e) {
- Log.log(e);
- }
- }
- return builder.build();
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////
- //// calls to client and operations with 'logging'.
-
- private Flux log(String msg, Flux flux) {
- if (DEBUG) {
- return flux
- .doOnSubscribe((sub) -> debug(">>> "+msg))
- .doOnComplete(() -> {
- debug("<<< "+msg+" OK");
- })
- .doOnCancel(() -> {
- debug("<<< "+msg+" CANCEL");
- })
- .doOnError((error) -> {
- debug("<<< "+msg+" ERROR: "+ExceptionUtil.getMessage(error));
- });
- } else {
- return flux;
- }
- }
-
- private Mono log(String msg, Mono mono) {
- if (DEBUG) {
- return mono
- .doOnSubscribe((sub) -> debug(">>> "+msg))
- .doOnCancel(() -> debug("<<< "+msg+" CANCEL"))
- .doOnSuccess((data) -> {
- debug("<<< "+msg+" OK");
- })
- .doOnError((error) -> {
- debug("<<< "+msg+" ERROR: "+ExceptionUtil.getMessage(error));
- });
- } else {
- return mono;
- }
- }
-
- private Mono client_getInfo() {
- return log("client.info().get()",
- _client.info().get(GetInfoRequest.builder().build())
- );
- }
-
- private Mono operations_getOrgId() {
- return log("operations.organizations.get(name="+params.getOrgName()+")",
- _operations.organizations().get(OrganizationInfoRequest.builder()
- .name(params.getOrgName())
- .build()
- )
- .map(OrganizationDetail::getId)
- );
- }
-
- private Mono> operations_listApps() {
- return log("operations.applications.list()",
- _operations.applications()
- .list()
- .map((appSummary) ->
- CFWrappingV2.wrap(appSummary, getApplicationExtras(appSummary.getName()))
- )
- .collectList()
- .map(ImmutableList::copyOf)
- );
- }
-
- private Mono client_getApplication(UUID appId) {
- return log("client.applicationsV2.get(id="+appId+")",
- _client.applicationsV2()
- .get(org.cloudfoundry.client.v2.applications.GetApplicationRequest.builder()
- .applicationId(appId.toString())
- .build()
- )
- );
- }
-
- private Mono client_getStack(String stackId) {
- return log("client.stacks.get(id="+stackId+")",
- _client.stacks().get(GetStackRequest.builder()
- .stackId(stackId)
- .build()
- )
- );
- }
-
- private Mono client_setHealthCheck(UUID guid, String hcType) {
- return log("client.applicationsV2.update(id="+guid+", hcType="+hcType+")",
- _client.applicationsV2()
- .update(UpdateApplicationRequest.builder()
- .applicationId(guid.toString())
- .healthCheckType(hcType)
- .build()
- )
- );
- }
-
- private Mono client_listBuildpacks(Integer page) {
- return log("client.buildpacks.list(page="+page+")",
- _client.buildpacks()
- .list(ListBuildpacksRequest.builder()
- .page(page)
- .build()
- )
- );
- }
-
- private Mono client_setEnv(UUID appId, Map environment) {
- return log("client.applicationsV2.update(id="+appId+", env=...)",
- _client.applicationsV2()
- .update(UpdateApplicationRequest.builder()
- .applicationId(appId.toString())
- .environmentJsons(environment)
- .build())
- .then()
- );
- }
-
- private Mono client_deleteServiceInstance(ServiceInstance s) {
- return log("client.serviceInstances.delete(id="+s.getId()+")",
- _client.serviceInstances().delete(DeleteServiceInstanceRequest.builder()
- .serviceInstanceId(s.getId())
- .build()
- )
- .then()
- );
- }
-
- private Mono client_deleteUserProvidedService(ServiceInstance s) {
- return log("client.userProvidedServiceInstances.delete(id="+s.getId()+")",
- _client.userProvidedServiceInstances().delete(DeleteUserProvidedServiceInstanceRequest.builder()
- .userProvidedServiceInstanceId(s.getId())
- .build()
- )
- );
- }
-
- @Override
- public Mono getUserName() {
- return log("uaa.getUsername",
- /*
- * UAA times out at start until the client is cached. Needs ~2 mins to fetch the user.
- * Instead get userID from client info and then fetch the user complete data from id to get the user name. This works and bypasses UAA
- */
-// _uaa.getUsername()
- info
- .flatMap(info -> _client
- .users()
- .get(GetUserRequest.builder().userId(info.getUser()).build())
- .map(response -> response.getEntity().getUsername()))
- ).timeout(GET_USERNAME_TIMEOUT);
- }
-
- @Override
- public String getRefreshToken() {
- return refreshToken;
- }
-
- @Override
- public Flux getRefreshTokens() {
- return refreshTokensFlux;
- }
-
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/DefaultCloudFoundryClientFactoryV2.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/DefaultCloudFoundryClientFactoryV2.java
deleted file mode 100644
index f288f9631..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/DefaultCloudFoundryClientFactoryV2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import org.springframework.ide.eclipse.boot.dash.cf.client.CFClientParams;
-import org.springframework.ide.eclipse.boot.dash.cf.client.ClientRequests;
-import org.springframework.ide.eclipse.boot.dash.cf.client.CloudFoundryClientFactory;
-
-public class DefaultCloudFoundryClientFactoryV2 extends CloudFoundryClientFactory {
-
- public static final DefaultCloudFoundryClientFactoryV2 INSTANCE = new DefaultCloudFoundryClientFactoryV2();
-
- /**
- * Use 'INSTANCE' constant instead. This class is a singleton.
- */
- private DefaultCloudFoundryClientFactoryV2() {}
-
- private CloudFoundryClientCache clientFactory = new CloudFoundryClientCache();
-
- @Override
- public ClientRequests getClient(CFClientParams params) {
- return new DefaultClientRequestsV2(clientFactory, params);
- }
-}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/ReactorUtils.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/ReactorUtils.java
deleted file mode 100644
index 1a25e4dd0..000000000
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.cf/src/org/springframework/ide/eclipse/boot/dash/cf/client/v2/ReactorUtils.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2018 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
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.eclipse.boot.dash.cf.client.v2;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.PriorityQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.reactivestreams.Publisher;
-import org.springframework.ide.eclipse.boot.dash.util.CancelationTokens.CancelationToken;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
-import reactor.util.function.Tuple2;
-import reactor.util.function.Tuples;
-
-/**
- * @author Kris De Volder
- */
-public class ReactorUtils {
-
- private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(45); // reflects default timeout of Mono.block in reactor 2.x.
- public static boolean DUMP_STACK_ON_TIMEOUT = false;
-
- /**
- * Convert a {@link CancelationToken} into a Mono that raises
- * an {@link OperationCanceledException} when the token is canceled.
- */
- public static Mono toMono(CancelationToken cancelToken) {
- return Mono.delay(Duration.ofSeconds(1))
- .flatMap((ping) ->
- cancelToken.isCanceled()
- ? Mono.error(new OperationCanceledException())
- : Mono.empty()
- )
- .repeatWhenEmpty((x) -> x);
- }
-
- /**
- * Similar to Mono.get but logs a more traceable version of the exception to Eclipse's error
- * log before 'rethrowing' it.
- *
- * This is useful because the actual exception is pretty hard to trace. It doesn't even 'point'
- * to the line where 'get' was called.
- */
- public static T get(Mono mono) throws Exception {
- try {
- return mono.block(DEFAULT_TIMEOUT);
- } catch (Exception e) {
- dumpStacks();
- throw new IOException(e);
- }
- }
-
- /**
- * Similar to Mono.get but logs a more traceable version of the exception to Eclipse's error
- * log before 'rethrowing' it.
- *
- * This is useful because the actual exception is pretty hard to trace. It doesn't even 'point'
- * to the line where 'get' was called.
- */
- public static T get(Duration timeout, CancelationToken cancelationToken, Mono mono) throws Exception {
- try {
- return Mono.first(mono, toMono(cancelationToken))
- .onErrorResume(errorFilter(cancelationToken))
- .block(timeout);
- } catch (Exception e) {
- //dumpStacks();
- throw new IOException(e);
- }
- }
-
-
- public static List get(Duration t, Mono> m) throws IOException {
- try {
- return m.block(t);
- } catch (Exception e) {
- dumpStacks();
- throw new IOException(e);
- }
- }
-
- private static void dumpStacks() {
- if (DUMP_STACK_ON_TIMEOUT) {
- System.out.println(getStackDumps().toString());
- }
- }
-
- /**
- * A 'filter' to use as a Mono.otherwise hanlder. It transforms any exception into {@link OperationCanceledException}
- * when cancelationToken has been canceled.
- */
- private static Function> errorFilter(CancelationToken cancelationToken) {
- return (Throwable e) -> cancelationToken.isCanceled()?Mono.error(new OperationCanceledException()):Mono.error(e);
- }
-
- /**
- * Deprecated because this is really the same as Mono.justOrEmpty, so use that instead.
- */
- @Deprecated
- public static Mono just(T it) {
- return it == null ? Mono.empty() : Mono.just(it);
- }
-
- /**
- * @return A function that can be passed to Mono.otherwise to convert a specific exception type into
- * Mono.empty().
- */
- public static Function> suppressException(Class exceptionType) {
- return (Throwable caught) -> {
- if (exceptionType.isAssignableFrom(caught.getClass())) {
- return Mono.empty();
- } else {
- return Mono.error(caught);
- }
- };
- }
-
- /**
- * Build a Mono that executes a given number of Mono one after the
- * other.
- */
- @SafeVarargs
- public static Mono sequence(Mono... tasks) {
- Mono seq = Mono.empty();
- for (Mono t : tasks) {
- seq = seq.then(t);
- }
- return seq;
- }
-
- /**
- * Execute a bunch of mono in parallel. All monos are executed to completion (rather than canceled early
- * when one of them fails)
- *
- * When at least one operation has failed then, upon completion or failure of the last Mono we guarantee that at least
- * one of the exceptions is propagated.
- */
- public static Mono safeMerge(Flux> operations, int concurrency) {
- AtomicReference failure = new AtomicReference<>(null);
- return Flux.merge(
- operations
- .map((Mono op) -> {
- return op.onErrorResume((e) -> {
- failure.compareAndSet(null, e);
- return Mono.empty();
- });
- }),
- concurrency //limit concurrency otherwise troubles (flooding/choking request broker?)
- )
- .then(Mono.defer(() -> {
- Throwable error = failure.get();
- if (error!=null) {
- return Mono.error(error);
- } else {
- return Mono.empty();
- }
- }));
- }
-
- /**
- * Attach a timestamp to each element in a Stream
- */
- public static Flux> timestamp(Flux stream) {
- return stream.map((e) -> Tuples.of(e, System.currentTimeMillis()));
- }
-
- /**
- * Sorts the elements in a flux in a moving time window. I.e. this assumes element order may be
- * scrambled but the scrambling has a certain 'time localilty' to it. So we only need to consider
- * sorting of elements that arrive 'close to eachother'.
- *
- * WARNING: The returned flux is intended for a single subscriber. It only maintains a
- * single buffer for sorting stream elements. This buffer is consumed when elements
- * are released to any subscriber. Therefore if one subscriber received a element it is gone
- * from the buffer and will not be delivered to the other subscribers.
- *
- * @param stream The stream to be sorted
- * @param comparator Compare function to sort with
- * @param bufferTime The 'window' of time beyond which we don't need to compare elements.
- */
- public static Flux sort(Flux stream, Comparator comparator, Duration bufferTime) {
-
- class SorterAccumulator {
-
- final PriorityQueue> holdingPen = new PriorityQueue<>((Tuple2