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

Tolerate missing 'aliases' property in Boot15 bean parser

Browse Source
This commit is contained in:
Kris De Volder
2018-12-04 15:31:18 -08:00
parent 995e60035a
commit 212dc74f83
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java
View File

@@ -27,6 +27,8 @@ import com.google.common.collect.ImmutableListMultimap;
*/
public class LiveBeansModel {
private static final String[] NO_STRINGS = new String[] {};
public static class Builder {
private final ImmutableListMultimap.Builder<String, LiveBean> beansViaName = ImmutableListMultimap.builder();
private final ImmutableListMultimap.Builder<String, LiveBean> beansViaType = ImmutableListMultimap.builder();
@@ -96,10 +98,15 @@ public class LiveBeansModel {
String scope = beansJSON.optString("scope");
String resource = beansJSON.optString("resource");
JSONArray aliasesJSON = beansJSON.getJSONArray("aliases");
String[] aliases = new String[aliasesJSON.length()];
for (int i = 0; i < aliasesJSON.length(); i++) {
aliases[i] = aliasesJSON.optString(i);
JSONArray aliasesJSON = beansJSON.optJSONArray("aliases");
String[] aliases;
if (aliasesJSON!=null) {
aliases = new String[aliasesJSON.length()];
for (int i = 0; i < aliasesJSON.length(); i++) {
aliases[i] = aliasesJSON.optString(i);
}
} else {
aliases = NO_STRINGS;
}
JSONArray dependenciesJSON = beansJSON.getJSONArray("dependencies");
@@ -114,7 +121,6 @@ public class LiveBeansModel {
}
private static class Boot20Parser implements Parser {
private static final String[] NO_STRINGS = new String[] {};
@Override
public LiveBeansModel parse(String json) throws Exception {