From c48c206985437f2db18b670d9c0f3e5062ffdc20 Mon Sep 17 00:00:00 2001
From: nsingh <nsingh@pivotal.io>
Date: Fri, 6 Apr 2018 03:43:16 -0700
Subject: [PATCH] Minor refactoring of params provider constructor

---
 .../cloudfoundry/client/cftarget/CfJsonParamsProvider.java | 7 +++----
 .../vscode/manifest/yaml/ManifestYamlLanguageServer.java   | 4 +---
 2 files changed, 4 insertions(+), 7 deletions(-)

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/CfJsonParamsProvider.java
index 43ecf0553..5a61b2900 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/CfJsonParamsProvider.java
@@ -11,7 +11,6 @@
 package org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
@@ -45,9 +44,9 @@ public class CfJsonParamsProvider implements ClientParamsProvider {
 	private Supplier<Collection<CFClientParams>> paramsSupplier;
 	private Map<String, String> messages;
 	
-	public CfJsonParamsProvider(List<CfTargetsInfo.Target> targets, Map<String, String> messages) {
-		this.messages = messages;
-		this.paramsSupplier = Suppliers.memoize(() -> targets
+	public CfJsonParamsProvider(CfTargetsInfo targetsInfo) {
+		this.messages = targetsInfo.getCfDiagnosticMessages();
+		this.paramsSupplier = Suppliers.memoize(() -> targetsInfo.getCfTargets()
 				.stream()
 				.map(t -> parseCfClientParams(t))
 				.filter(Objects::nonNull)
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 3ff475f97..2e8aa8d2a 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
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
@@ -178,8 +177,7 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer {
 		List<Target> cfTargets = info.getCfTargets();
 		if (cfTargets != null) {
 
-			CfJsonParamsProvider cfClientParamsProvider = new CfJsonParamsProvider(cfTargets,
-					info.getCfDiagnosticMessages());
+			CfJsonParamsProvider cfClientParamsProvider = new CfJsonParamsProvider(info);
 
 			cfClientConfig.setClientParamsProvider(new ClientParamsProvider() {