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

Fix race condition in SpringIndexer initialization

Browse Source
This commit is contained in:
Kris De Volder
2018-03-26 17:05:35 -07:00
parent 3d9752cbdb
commit 0c70f4200e
5 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java
View File

@@ -83,7 +83,7 @@ public class BootLanguageServerParams {
public static LSFactory<BootLanguageServerParams> createDefault() {
return (SimpleLanguageServer server) -> {
// Initialize project finders, project caches and project observers
JdtLsProjectCache jdtProjectCache = new JdtLsProjectCache(server, createFallbackProjectCache(server));
JdtLsProjectCache jdtProjectCache = new JdtLsProjectCache(server, () -> createFallbackProjectCache(server));
DefaultSpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(jdtProjectCache, jdtProjectCache);
indexProvider.setProgressService(server.getProgressService());

5
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
View File

@@ -150,10 +150,7 @@ public class SpringIndexer {
}
}
}, "Spring Annotation Index Update Worker");
server.onInitialized(() -> {
log.debug("onServerInitialized {}", this);
updateWorker.start();
});
server.onInitialized(updateWorker::start);
getWorkspaceService().onDidChangeWorkspaceFolders(evt -> {
log.debug("workspace roots have changed event arrived - added: " + evt.getEvent().getAdded() + " - removed: " + evt.getEvent().getRemoved());
refresh();

21
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JdtLsProjectCache.java
View File

@@ -38,6 +38,8 @@ import org.springframework.ide.vscode.commons.util.CollectorUtil;
import org.springframework.ide.vscode.commons.util.ExceptionUtil;
import org.springframework.ide.vscode.commons.util.UriUtil;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableList;
import reactor.core.Disposable;
@@ -45,17 +47,17 @@ import reactor.core.Disposable;
public class JdtLsProjectCache implements JavaProjectsService {
private CompletableFuture<Void> initialized = new CompletableFuture<Void>();
private SimpleLanguageServer server;
private Map<String, JdtLsProject> table = new HashMap<String, JdtLsProject>();
private Logger log = LoggerFactory.getLogger(JdtLsProjectCache.class);
private List<Listener> listeners = new ArrayList<>();
private final JavaProjectsService fallback;
private final Supplier<JavaProjectsService> fallback;
public JdtLsProjectCache(SimpleLanguageServer server, JavaProjectsService fallback) {
public JdtLsProjectCache(SimpleLanguageServer server, Supplier<JavaProjectsService> fallback) {
Assert.isNotNull(fallback);
this.fallback = fallback;
this.fallback = Suppliers.memoize(fallback);
this.server = server;
CompletableFuture<Disposable> disposable = new CompletableFuture<Disposable>();
this.server.onInitialized(() -> {
@@ -110,7 +112,7 @@ public class JdtLsProjectCache implements JavaProjectsService {
public void addListener(Listener listener) {
initialized.handle((success, failed) -> {
if (failed!=null) {
fallback.addListener(listener);
fallback.get().addListener(listener);
} else {
synchronized (listeners) {
listeners.add(listener);
@@ -124,7 +126,7 @@ public class JdtLsProjectCache implements JavaProjectsService {
public void removeListener(Listener listener) {
initialized.handle((success, failed) -> {
if (failed!=null) {
fallback.removeListener(listener);
fallback.get().removeListener(listener);
} else {
synchronized (listeners) {
listeners.remove(listener);
@@ -171,9 +173,13 @@ public class JdtLsProjectCache implements JavaProjectsService {
@Override
public Optional<IJavaProject> find(TextDocumentIdentifier doc) {
log.info("find {} ",doc.getUri());
if (initialized.isDone()) {
if (initialized.isCompletedExceptionally()) {
return fallback.find(doc);
log.info("find {} delegating to fallback", doc.getUri());
Optional<IJavaProject> result = fallback.get().find(doc);
log.info("find => {}", result);
return result;
}
String uri = UriUtil.normalize(doc.getUri());
@@ -186,6 +192,7 @@ public class JdtLsProjectCache implements JavaProjectsService {
}
}
}
log.info("find => NOT INITIALIZED YET");
return Optional.empty();
}