From a05971659510ec47e38bfbbf79e619e4e5888f78 Mon Sep 17 00:00:00 2001 From: nsingh Date: Fri, 6 Apr 2018 03:52:03 -0700 Subject: [PATCH] Renamed Json params provider to CF targets info provider --- ...ParamsProvider.java => CfTargetsInfoProvder.java} | 12 ++++++------ .../manifest/yaml/ManifestYamlLanguageServer.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/{CfJsonParamsProvider.java => CfTargetsInfoProvder.java} (88%) diff --git a/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfJsonParamsProvider.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfTargetsInfoProvder.java similarity index 88% rename from headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfJsonParamsProvider.java rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfTargetsInfoProvder.java index 5a61b2900..5049d0ba8 100644 --- a/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfJsonParamsProvider.java +++ b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfTargetsInfoProvder.java @@ -22,15 +22,15 @@ import com.google.common.base.Supplier; import com.google.common.base.Suppliers; /** - * CF Client parameter provider based on the JSON data. the JSON data is - * cosidered to be data from the from config changed message defined in the LSP - * spec - * {@link https://github.com/Microsoft/language-server-protocol/blob/master/protocol.md#workspace_didChangeConfiguration} + * CF Client parameter provider based on CF targets info. These targets info contain + * a list of CF targets that typically already exist and contain connection information + * like refresh token or other type of credentials. For example, it allows external clients + * to integrate with the manifest LS by passing target information from that client to the LS. * * @author Alex Boyko * */ -public class CfJsonParamsProvider implements ClientParamsProvider { +public class CfTargetsInfoProvder implements ClientParamsProvider { private static final String NO_TARGETS_FOUND_MESSAGE = "No targets found"; private static final String NO_NETWORK_CONNECTION = "No connection to Cloud Foundry"; @@ -44,7 +44,7 @@ public class CfJsonParamsProvider implements ClientParamsProvider { private Supplier> paramsSupplier; private Map messages; - public CfJsonParamsProvider(CfTargetsInfo targetsInfo) { + public CfTargetsInfoProvder(CfTargetsInfo targetsInfo) { this.messages = targetsInfo.getCfDiagnosticMessages(); this.paramsSupplier = Suppliers.memoize(() -> targetsInfo.getCfTargets() .stream() diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java index 2e8aa8d2a..826a8d80a 100644 --- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java +++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java @@ -27,7 +27,7 @@ import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFPar import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTargetCache; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CfCliParamsProvider; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CfClientConfig; -import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CfJsonParamsProvider; +import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CfTargetsInfoProvder; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CfTargetsInfo; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CfTargetsInfo.Target; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.ClientParamsProvider; @@ -177,7 +177,7 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer { List cfTargets = info.getCfTargets(); if (cfTargets != null) { - CfJsonParamsProvider cfClientParamsProvider = new CfJsonParamsProvider(info); + CfTargetsInfoProvder cfClientParamsProvider = new CfTargetsInfoProvder(info); cfClientConfig.setClientParamsProvider(new ClientParamsProvider() {