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

Fix https://github.com/spring-projects/sts4/issues/80

Browse Source
This commit is contained in:
Kris De Volder
2018-10-16 12:26:52 -07:00
parent fb89da7cee
commit 2365f83e20
4 changed files with 1377 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@
package org.springframework.ide.vscode.commons.boot.app.cli.livebean;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -20,10 +19,7 @@ import org.json.JSONObject;
import org.springframework.ide.vscode.commons.util.Log;
import org.springframework.ide.vscode.commons.util.StringUtil;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableMultiset;
import com.google.common.collect.ImmutableSet;
/**
* @author Martin Lippert
@@ -118,10 +114,14 @@ 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 {
Builder model = LiveBeansModel.builder();
JSONObject mainObject = new JSONObject(json);
System.out.println(mainObject.toString(3));
mainObject = mainObject.getJSONObject("contexts");
for (String contextId : mainObject.keySet()) {
JSONObject contextObject = mainObject.getJSONObject(contextId);
@@ -142,16 +142,26 @@ 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 = NO_STRINGS;
} else {
aliases = new String[aliasesJSON.length()];
for (int i = 0; i < aliasesJSON.length(); i++) {
aliases[i] = aliasesJSON.optString(i);
}
}
JSONArray dependenciesJSON = beansJSON.getJSONArray("dependencies");
String[] dependencies = new String[dependenciesJSON.length()];
for (int i = 0; i < dependenciesJSON.length(); i++) {
dependencies[i] = dependenciesJSON.optString(i);
JSONArray dependenciesJSON = beansJSON.optJSONArray("dependencies");
String[] dependencies;
if (dependenciesJSON==null) {
dependencies = NO_STRINGS;
} else {
dependencies = new String[dependenciesJSON.length()];
for (int i = 0; i < dependenciesJSON.length(); i++) {
dependencies[i] = dependenciesJSON.optString(i);
}
}
return new LiveBean(id, aliases, scope, type, resource, dependencies);

12
headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/LiveBeansModelTest.java
View File

File diff suppressed because one or more lines are too long

1341
headless-services/commons/commons-boot-app-cli/src/test/resources/live-beans-models/custom_object_mapper_NON_DEFAULT_inclusion.json Normal file
View File

File diff suppressed because it is too large Load Diff

5
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java
View File

@@ -25,7 +25,6 @@ import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest;
import org.springframework.ide.vscode.boot.bootiful.HoverTestConf;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.languageserver.testharness.Editor;
import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
import org.springframework.ide.vscode.project.harness.MockRunningAppProvider;
import org.springframework.ide.vscode.project.harness.ProjectsHarness;
@@ -60,8 +59,8 @@ public class ConditionalsLiveHoverTest {
assertTrue("Expected no mock running boot apps, but found: " + mockAppProvider.mockedApps,
mockAppProvider.mockedApps.isEmpty());
Editor editorWithMethodLiveHover = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
editorWithMethodLiveHover.assertNoHover("@ConditionalOnMissingBean");
Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
editor.assertNoHover("@ConditionalOnMissingBean");
}
@Test