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

Ensure that null CF hints are returned.

Browse Source 
The parser used by reconciler expects null if values cannot be resolved
by the hints provider.
This commit is contained in:
nsingh
2017-01-20 13:10:29 -08:00
parent ae2a68709a
commit 64b92bab2f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
View File

@@ -28,11 +28,12 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
@Override
public Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFBuildpack> buildpacks = cfTarget.getBuildpacks();
if (buildpacks != null) {
if (buildpacks != null && !buildpacks.isEmpty()) {
List<YValueHint> hints = new ArrayList<>();
for (CFBuildpack buildpack : buildpacks) {
String name = buildpack.getName();
String label = getBuildpackLabel(cfTarget, buildpack);
@@ -41,10 +42,12 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
hints.add(hint);
}
}
return hints;
}
}
return hints;
// Return null if no hints an be resolved rather than empty list (seems to be
// what is expected for parsing for reconciler)
return null;
}
protected String getBuildpackLabel(CFTarget target, CFBuildpack buildpack) {

11
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFServicesProvider.java
View File

@@ -28,11 +28,12 @@ public class ManifestYamlCFServicesProvider extends AbstractCFHintsProvider {
@Override
public Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFServiceInstance> services = cfTarget.getServices();
if (services != null) {
if (services != null && !services.isEmpty()) {
List<YValueHint> hints = new ArrayList<>();
for (CFServiceInstance service : services) {
String name = service.getName();
String label = getServiceLabel(cfTarget, service);
@@ -41,10 +42,12 @@ public class ManifestYamlCFServicesProvider extends AbstractCFHintsProvider {
hints.add(hint);
}
}
return hints;
}
}
return hints;
// Return null if no hints an be resolved rather than empty list (seems to be
// what is expected for parsing for reconciler)
return null;
}
private String getServiceLabel(CFTarget cfClientTarget, CFServiceInstance service) {