From 618bdddff4a1671964e3c7ce4614d57418f08b37 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Fri, 27 Jan 2017 17:33:38 -0800
Subject: [PATCH] Some tweaks to error messages for services and buildpack when
 failing to fetch them.

---
 .../client/cftarget/CfCliParamsProvider.java    |  2 +-
 .../manifest/yaml/AbstractCFHintsProvider.java  | 17 ++++++++---------
 .../yaml/ManifestYamlCFBuildpacksProvider.java  |  7 ++++++-
 .../yaml/ManifestYamlCFServicesProvider.java    |  5 +++++
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
index 71aa6d1f8..e7961c3f5 100644
--- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
+++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  */
 public class CfCliParamsProvider implements ClientParamsProvider {
 
-	public static final String NO_CLI_TARGETS_FOUND_MESSAGE = "No Cloudfoundry Targets: Please use the cf CLI to login.";
+	public static final String NO_CLI_TARGETS_FOUND_MESSAGE = "No Cloud Foundry targets found: Use CF CLI to login";
 	public static final String TARGET = "Target";
 	public static final String REFRESH_TOKEN = "RefreshToken";
 	public static final String ORGANIZATION_FIELDS = "OrganizationFields";
diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
index 27673b147..63f67f3e2 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
@@ -37,6 +37,12 @@ public abstract class AbstractCFHintsProvider implements Callable<Collection<YVa
 		this.targetCache = targetCache;
 	}
 
+	/**
+	 * Used in error messages. For example "Failed to get ${type-name}s from Cloudfoundry".
+	 * @return
+	 */
+	protected abstract String getTypeName();
+
 	@Override
 	public Collection<YValueHint> call() throws Exception {
 
@@ -63,15 +69,8 @@ public abstract class AbstractCFHintsProvider implements Callable<Collection<YVa
 			} else {
 				// Log any other error
 				logger.log(Level.SEVERE, ExceptionUtil.getMessage(e), e);
-
-				if (ExceptionUtil.getThrowable(e, IOException.class) != null) {
-					throw new ValueParseException(
-							"Connection failure to Cloud Foundry. Please check the log for more details.");
-
-				} else {
-					throw new ValueParseException(
-							"Failed to fetch values from Cloud Foundry. Please check the log for more details.");
-				}
+				throw new ValueParseException(
+						"Failed to get "+getTypeName()+" from Cloud Foundry: "+ExceptionUtil.getMessage(e));
 			}
 		}
 	}
diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
index e6ece237f..77f50cda4 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
@@ -51,11 +51,16 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
 		// resolved. Otherwise
 		// return non-empty list of buildpacks. For CF targets, a non-empty list
 		// of buildpacks is
-		// typically expected. 
+		// typically expected.
 		return !hints.isEmpty() ? hints : null;
 	}
 
 	protected String getBuildpackLabel(CFTarget target, CFBuildpack buildpack) {
 		return buildpack.getName() + " (" + target.getName() + ")";
 	}
+
+	@Override
+	protected String getTypeName() {
+		return "Buildpack";
+	}
 }
diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFServicesProvider.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFServicesProvider.java
index 852e553c2..6be9fc591 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFServicesProvider.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFServicesProvider.java
@@ -59,4 +59,9 @@ public class ManifestYamlCFServicesProvider extends AbstractCFHintsProvider {
 		return service.getName() + " - " + service.getPlan() + " (" + cfClientTarget.getParams().getOrgName() + " - "
 				+ cfClientTarget.getParams().getSpaceName() + ")";
 	}
+
+	@Override
+	protected String getTypeName() {
+		return "Service";
+	}
 }