Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring of CF targets in vscode

Browse Source
This commit is contained in:
nsingh
2017-01-09 10:18:07 -08:00
parent 8349540175
commit 2a623811ec
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientTargets.java
View File

@@ -15,7 +15,12 @@ import java.util.List;
import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.ClientRequests;
import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.CloudFoundryClientFactory;
import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.DefaultCloudFoundryClientFactoryV2;
/**
* Creates targets given a client parameters factory and a client factory.
*
*/
public class CFClientTargets {
private final CFClientParamsFactory paramsFactory;
@@ -54,4 +59,10 @@ public class CFClientTargets {
}
}
public static CFClientTargets createDefaultV2ClientTargets() {
CFClientParamsFactory paramsFactory = CFClientParamsFactory.INSTANCE;
CloudFoundryClientFactory clientFactory = DefaultCloudFoundryClientFactoryV2.INSTANCE;
return new CFClientTargets(paramsFactory, clientFactory);
}
}

2
vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
View File

@@ -51,6 +51,7 @@ public class CfCliParamsProvider implements Provider<List<CFClientParams>> {
Map<String, Object> userData = mapper.readValue(file, Map.class);
if (userData != null) {
String refreshToken = (String) userData.get(REFRESH_TOKEN);
// Only support connecting to CF via refresh token for now
if (refreshToken == null) {
return null;
}
@@ -76,6 +77,7 @@ public class CfCliParamsProvider implements Provider<List<CFClientParams>> {
}
private File getConfigJsonFile() throws IOException, InterruptedException {
// Support Unix systems for now
if (!System.getProperty("os.name").toLowerCase().startsWith("win")) {
String homeDir = getUnixHomeDir();
if (homeDir != null) {

6
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java
View File

@@ -90,11 +90,9 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer {
documents.onHover(hoverEngine ::getHover);
}
private CFClientTargets getCFTargets() {
private CFClientTargets getCFTargets() {
if (cfClientTargets == null) {
CFClientParamsFactory paramsFactory = CFClientParamsFactory.INSTANCE;
CloudFoundryClientFactory clientFactory = DefaultCloudFoundryClientFactoryV2.INSTANCE;
cfClientTargets = new CFClientTargets(paramsFactory, clientFactory);
cfClientTargets = CFClientTargets.createDefaultV2ClientTargets();
}
return cfClientTargets;
}