Minor refactoring of params provider constructor

This commit is contained in:
nsingh
2018-04-06 03:43:16 -07:00
parent f8f267e69d
commit c48c206985
2 changed files with 4 additions and 7 deletions

View File

@@ -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)

View File

@@ -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() {