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

switched watch dog internals to use ScheduledThreadPoolExecutor and add update of docs to that to avoid blocking the ls altogether

Browse Source
This commit is contained in:
Martin Lippert
2019-01-24 09:59:21 +01:00
parent 343bffe921
commit 2ab97b332d
2 changed files with 53 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -64,8 +64,7 @@ public class SpringLiveChangeDetectionWatchdog {
private final Set<IJavaProject> observedProjects;
private boolean changeDetectionEnabled = false;
private Timer timer;
private ScheduledThreadPoolExecutor timer;
public SpringLiveChangeDetectionWatchdog(
BootJavaLanguageServerComponents bootJavaLanguageServerComponents,
@@ -110,23 +109,15 @@ public class SpringLiveChangeDetectionWatchdog {
public synchronized void start() {
if (changeDetectionEnabled && timer == null) {
logger.debug("Starting SpringLiveChangeDetectionWatchdog");
this.timer = new Timer();
TimerTask task = new TimerTask() {
@Override
public void run() {
update();
}
};
timer.schedule(task, 0, POLLING_INTERVAL_MILLISECONDS);
this.timer = new ScheduledThreadPoolExecutor(1);
this.timer.scheduleWithFixedDelay(() -> this.update(), 0, POLLING_INTERVAL_MILLISECONDS, TimeUnit.MILLISECONDS);
}
}
public synchronized void shutdown() {
if (timer != null) {
logger.info("Shutting down SpringLiveChangeDetectionWatchdog");
timer.cancel();
timer.shutdown();
timer = null;
}
}

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

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017, 2018 Pivotal, Inc.
* Copyright (c) 2017, 2019 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,9 +14,9 @@ import java.time.Duration;
import java.util.Arrays;
import java.util.Collection;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -57,24 +57,11 @@ public class SpringLiveHoverWatchdog {
private boolean highlightsEnabled = true;
private Timer timer;
private ScheduledThreadPoolExecutor timer;
private JavaProjectFinder projectFinder;
private void refreshEnablement() {
boolean shouldEnable = highlightsEnabled && hasInterestingProject(watchedDocs.stream());
if (shouldEnable) {
start();
} else {
shutdown();
}
}
private boolean hasInterestingProject(Stream<String> uris) {
return uris.anyMatch(uri -> projectFinder.find(new TextDocumentIdentifier(uri)).isPresent());
}
public SpringLiveHoverWatchdog(
SimpleLanguageServer server,
BootJavaHoverProvider hoverProvider,
@@ -108,26 +95,32 @@ public class SpringLiveHoverWatchdog {
});
}
public synchronized void enableHighlights() {
if (!highlightsEnabled) {
highlightsEnabled = true;
refreshEnablement();
}
}
public synchronized void disableHighlights() {
if (highlightsEnabled) {
highlightsEnabled = false;
refreshEnablement();
}
}
private synchronized void start() {
if (highlightsEnabled && timer == null) {
logger.debug("Starting SpringLiveHoverWatchdog");
this.timer = new Timer();
TimerTask task = new TimerTask() {
@Override
public void run() {
update();
}
};
timer.schedule(task, 0, POLLING_INTERVAL_MILLISECONDS);
this.timer = new ScheduledThreadPoolExecutor(1);
this.timer.scheduleWithFixedDelay(() -> this.update(), 0, POLLING_INTERVAL_MILLISECONDS, TimeUnit.MILLISECONDS);
}
}
public synchronized void shutdown() {
if (timer != null) {
logger.info("Shutting down SpringLiveHoverWatchdog");
timer.cancel();
timer.shutdown();
timer = null;
watchedDocs.forEach(uri -> cleanupLiveHints(uri));
}
@@ -149,6 +142,16 @@ public class SpringLiveHoverWatchdog {
}
public void update(String docURI) {
ScheduledThreadPoolExecutor scheduler = this.timer;
if (scheduler != null) {
scheduler.execute(() -> {
updateDoc(docURI);
});
}
}
// internal method, need to run on the scheduled executor pool, do not call outside of that
protected void updateDoc(String docURI) {
try {
IJavaProject project = identifyProject(docURI);
SpringBootApp[] runningBootApps = RunningAppMatcher.getAllMatchingApps(runningAppProvider.getAllRunningSpringApps(), project).toArray(new SpringBootApp[0]);
@@ -160,6 +163,7 @@ public class SpringLiveHoverWatchdog {
}
}
// internal method, need to run on the scheduled executor pool, do not call outside of that
protected void update() {
if (this.watchedDocs.size() > 0) {
try {
@@ -180,6 +184,7 @@ public class SpringLiveHoverWatchdog {
}
}
// internal method, need to run on the scheduled executor pool, do not call outside of that
protected void update(String docURI, SpringBootApp[] runningBootApps) {
if (highlightsEnabled) {
try {
@@ -216,6 +221,19 @@ public class SpringLiveHoverWatchdog {
}).filter(app -> app != null).collect(Collectors.toList());
}
private void refreshEnablement() {
boolean shouldEnable = highlightsEnabled && hasInterestingProject(watchedDocs.stream());
if (shouldEnable) {
start();
} else {
shutdown();
}
}
private boolean hasInterestingProject(Stream<String> uris) {
return uris.anyMatch(uri -> projectFinder.find(new TextDocumentIdentifier(uri)).isPresent());
}
private IJavaProject identifyProject(String docURI) {
TextDocument doc = this.server.getTextDocumentService().get(docURI);
if (doc != null) {
@@ -228,8 +246,7 @@ public class SpringLiveHoverWatchdog {
private void publishLiveHints(String docURI, CodeLens[] codeLenses) {
int version = server.getTextDocumentService().get(docURI).getVersion();
VersionedTextDocumentIdentifier id = new VersionedTextDocumentIdentifier(version);
id.setUri(docURI);
VersionedTextDocumentIdentifier id = new VersionedTextDocumentIdentifier(docURI, version);
server.getClient().highlight(new HighlightParams(id, Arrays.asList(codeLenses)));
}
@@ -241,18 +258,4 @@ public class SpringLiveHoverWatchdog {
// TODO: close and cleanup open JMX connections and cached data
}
public synchronized void enableHighlights() {
if (!highlightsEnabled) {
highlightsEnabled = true;
refreshEnablement();
}
}
public synchronized void disableHighlights() {
if (highlightsEnabled) {
highlightsEnabled = false;
refreshEnablement();
}
}
}