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

Merge branch 'master' of https://github.com/spring-projects/sts4

Browse Source
This commit is contained in:
BoykoAlex
2017-06-30 18:03:36 -04:00
parent f522a39047 8d570e748e
commit e8fd00784a
7 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
View File

@@ -30,9 +30,12 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
@Override
public Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
if (targets==null || targets.isEmpty()) {
//no targets... means we don't know anything. Indicate this by returning null...
// this "don't know" value will suppress bogus warnings in the reconciler.
return null;
}
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFBuildpack> buildpacks = cfTarget.getBuildpacks();
@@ -51,12 +54,7 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
}
}
}
// Contract for the reconciler: return null if values cannot be
// resolved. Otherwise
// return non-empty list of buildpacks. For CF targets, a non-empty list
// of buildpacks is
// typically expected.
return !hints.isEmpty() ? hints : null;
return hints;
}
protected String getBuildpackLabel(CFTarget target, CFBuildpack buildpack) {

12
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFDomainsProvider.java
View File

@@ -29,9 +29,12 @@ public class ManifestYamlCFDomainsProvider extends AbstractCFHintsProvider {
@Override
public Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
if (targets==null || targets.isEmpty()) {
//no targets... means we don't know anything. Indicate this by returning null...
// this "don't know" value will suppress bogus warnings in the reconciler.
return null;
}
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFDomain> domains = cfTarget.getDomains();
@@ -48,10 +51,7 @@ public class ManifestYamlCFDomainsProvider extends AbstractCFHintsProvider {
}
}
}
// Contract for the reconciler: return null if values cannot be
// resolved. Otherwise
// return non-empty list
return !hints.isEmpty() ? hints : null;
return hints;
}
protected String getLabel(CFTarget target, CFDomain domain) {

13
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFServicesProvider.java
View File

@@ -30,14 +30,12 @@ public class ManifestYamlCFServicesProvider extends AbstractCFHintsProvider {
@Override
public Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
// NOTE: empty list of services is a VALID result. A CF target may have
// no service instances
// created, so if empty list is returned from the client, then RETURN empty list. don't
// return null
// for empty services cases
if (targets==null || targets.isEmpty()) {
//no targets... means we don't know anything. Indicate this by returning null...
// this "don't know" value will suppress bogus warnings in the reconciler.
return null;
}
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFServiceInstance> services = cfTarget.getServices();
Renderable targetLabel = Renderables.text(cfTarget.getLabel());
@@ -54,7 +52,6 @@ public class ManifestYamlCFServicesProvider extends AbstractCFHintsProvider {
}
}
}
return hints;
}

12
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlStacksProvider.java
View File

@@ -35,13 +35,12 @@ public class ManifestYamlStacksProvider extends AbstractCFHintsProvider {
@Override
protected Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
// NOTE: empty list of services is a VALID result. A CF target may have
// no service instances
// created, so if empty list is returned from the client, then RETURN empty list. don't
// return null
// for empty services cases
if (targets==null || targets.isEmpty()) {
//no targets... means we don't know anything. Indicate this by returning null...
// this "don't know" value will suppress bogus warnings in the reconciler.
return null;
}
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFStack> stacks = cfTarget.getStacks();
Renderable targetLabel = Renderables.text(cfTarget.getLabel());
@@ -57,7 +56,6 @@ public class ManifestYamlStacksProvider extends AbstractCFHintsProvider {
}
}
}
return hints;
}

2
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
View File

@@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableSet;
/**
* @author Kris De Volder
*/
public class ManifestYmlSchema implements YamlSchema {
public final class ManifestYmlSchema implements YamlSchema {
private static final String HEALTH_CHECK_HTTP_ENDPOINT_PROP = "health-check-http-endpoint";
private static final String HEALTH_CHECK_TYPE_PROP = "health-check-type";

26
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/RouteValueParser.java
View File

@@ -13,28 +13,32 @@ import org.springframework.ide.vscode.commons.util.RegexpParser;
import org.springframework.ide.vscode.commons.util.ValueParseException;
public class RouteValueParser extends RegexpParser {
private static final String ROUTE_REGEX = "^([\\da-z\\.-]+)(:\\d{1,5})?((\\/[\\dA-Za-z\\.-]+)*\\/?)?$";
private static final String ROUTE_TYPE_NAME = "Route";
private static final String ROUTE_DESCRIPTION = "HTTP or TCP application root route";
private static final int MAX_PORT_NUMBER = 65535;
private Callable<Collection<String>> domains;
public RouteValueParser(Callable<Collection<String>> domains) {
super(ROUTE_REGEX, ROUTE_TYPE_NAME, ROUTE_DESCRIPTION);
this.domains = domains;
}
private Matcher staticValidation(String str) throws Exception {
return (Matcher) super.parse(str);
}
private Object dynamicValidation(String str, Matcher matcher) throws Exception {
if (domains==null) {
// If domains is unknown we can't do the dynamic checks, so bail out.
return str;
}
try {
Collection<String> cloudDomains = Collections.emptyList();
try {
cloudDomains = domains == null ? Collections.emptyList() : domains.call();
cloudDomains = domains.call();
} catch (ValueParseException e) {
/*
* If domains hint provider throws exception it is
@@ -43,9 +47,9 @@ public class RouteValueParser extends RegexpParser {
*/
return matcher;
}
// Ensure cloud domains is empty list instead of null
if (cloudDomains == null) {
cloudDomains = Collections.emptyList();
// If domains is unknown we can't do the dynamic checks, so bail out.
return str;
}
CFRoute route = CFRoute.builder().from(str, cloudDomains).build();
if (route.getDomain() == null || route.getDomain().isEmpty()) {
@@ -65,13 +69,13 @@ public class RouteValueParser extends RegexpParser {
String hostDomain = matcher.group(1);
throw new ReconcileException("Unknown 'Domain'. Valid domains are: "+cloudDomains, ManifestYamlSchemaProblemsTypes.UNKNOWN_DOMAIN_PROBLEM, hostDomain.lastIndexOf(route.getDomain()), hostDomain.length());
}
return route;
return str;
} catch (ConnectionException | NoTargetsException e) {
// No connection to CF? Abort dynamic validation
return matcher;
return str;
}
}
@Override
public Object parse(String str) throws Exception {
Matcher matcher = staticValidation(str);
@@ -80,5 +84,5 @@ public class RouteValueParser extends RegexpParser {
}
return null;
}
}

37
headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
View File

@@ -24,6 +24,7 @@ import org.eclipse.lsp4j.CompletionItem;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.DiagnosticSeverity;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.ide.vscode.commons.cloudfoundry.client.CFBuildpack;
@@ -997,6 +998,33 @@ public class ManifestYamlEditorTest {
);
}
@Test public void noReconcileErrorsWhenNoTargets() throws Exception {
Editor editor;
cloudfoundry.reset();
when(cloudfoundry.defaultParamsProvider.getParams()).thenReturn(ImmutableList.of());
editor = harness.newEditor(
"applications:\n" +
"- name: foo\n" +
" buildpack: bad-buildpack\n" +
" stack: blah\n" +
" domain: something-domain.com\n" +
" services:\n" +
" - bad-service\n" +
" bogus: bad" //a token error to make sure reconciler is actually running!
);
editor.assertProblems("bogus|Unknown property");
editor = harness.newEditor(
"applications:\n" +
"- name: foo-foo\n" +
" buildpack: java_buildpack\n" +
" routes:\n" +
" - route: foo.blah/fooo\n"
);
editor.assertProblems(/*NONE*/);
}
@Test
public void noReconcileErrorsWhenCFFactoryThrows() throws Exception {
reset(cloudfoundry.factory);
@@ -1010,6 +1038,15 @@ public class ManifestYamlEditorTest {
" bogus: bad" //a token error to make sure reconciler is actually running!
);
editor.assertProblems("bogus|Unknown property");
editor = harness.newEditor(
"applications:\n" +
"- name: foo-foo\n" +
" buildpack: java_buildpack\n" +
" routes:\n" +
" - route: foo.blah/fooo\n"
);
editor.assertProblems(/*NONE*/);
}
@Test