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

Progress for project reconciling

Browse Source
This commit is contained in:
aboyko
2023-02-27 17:43:20 -05:00
parent 71f87227f5
commit 2f743fe9a8
16 changed files with 263 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2022 VMware, Inc.
* Copyright (c) 2022, 2023 VMware, 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
@@ -11,10 +11,11 @@
package org.springframework.ide.vscode.boot.common;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.languageserver.ProgressService;
public interface IJavaProjectReconcileEngine {
void reconcile(IJavaProject project);
void reconcile(IJavaProject project, ProgressService progressService);
void clear(IJavaProject project);

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

@@ -77,7 +77,7 @@ public abstract class ProjectReconcileScheduler {
if (projectReconcileRequests.remove(uri) != null) {
projectFinder.find(new TextDocumentIdentifier(uri.toASCIIString())).ifPresent(p -> {
reconciler.clear(project);
reconciler.reconcile(p);
reconciler.reconcile(p, getServer().getProgressService());
});
}
})

20
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReconcileEngine.java
View File

@@ -28,6 +28,8 @@ import org.springframework.ide.vscode.boot.common.IJavaProjectReconcileEngine;
import org.springframework.ide.vscode.boot.java.reconcilers.JavaReconciler;
import org.springframework.ide.vscode.commons.java.IClasspathUtil;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.languageserver.PercentageProgressTask;
import org.springframework.ide.vscode.commons.languageserver.ProgressService;
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine;
@@ -114,7 +116,7 @@ public class BootJavaReconcileEngine implements IReconcileEngine, IJavaProjectRe
}
@Override
public void reconcile(IJavaProject project) {
public void reconcile(IJavaProject project, ProgressService progressService) {
Stream<Path> files = IClasspathUtil.getProjectJavaSourceFolders(project.getClasspath()).flatMap(folder -> {
try {
return Files.walk(folder.toPath()).filter(Files::isRegularFile);
@@ -134,10 +136,21 @@ public class BootJavaReconcileEngine implements IReconcileEngine, IJavaProjectRe
.collect(Collectors.toMap(d -> d, d -> server.createProblemCollector(d)));
problemCollectors.values().forEach(c -> c.beginCollecting());
int totalWork = 0;
for (JavaReconciler jr : javaReconcilers) {
totalWork += jr.getTotalWorkUnits(docs);
}
PercentageProgressTask progressTask = progressService.createPercentageProgressTask(
"reconcile-java-" + project.getElementName(),
totalWork,
"Reconciling Spring Java for '" + project.getElementName() + "'"
);
for (JavaReconciler jr : javaReconcilers) {
try {
Map<IDocument, Collection<ReconcileProblem>> problems = jr.reconcile(project, docs);
Map<IDocument, Collection<ReconcileProblem>> problems = jr.reconcile(project, docs, () -> progressTask.increment());
problems.entrySet().forEach(e -> {
IProblemCollector collector = problemCollectors.get(e.getKey());
e.getValue().forEach(p -> collector.accept(p));
@@ -147,6 +160,7 @@ public class BootJavaReconcileEngine implements IReconcileEngine, IJavaProjectRe
}
}
progressTask.done();
problemCollectors.values().forEach(c -> c.endCollecting());
}

45
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorService.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2022 Pivotal, Inc.
* Copyright (c) 2019, 2023 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
@@ -19,8 +19,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.boot.app.BootJavaConfig;
import org.springframework.ide.vscode.commons.languageserver.DiagnosticService;
import org.springframework.ide.vscode.commons.languageserver.IndefiniteProgressTask;
import org.springframework.ide.vscode.commons.languageserver.ProgressService;
import org.springframework.ide.vscode.commons.languageserver.ProgressTask;
import org.springframework.ide.vscode.commons.languageserver.util.ShowMessageException;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
@@ -93,11 +93,8 @@ public class SpringProcessConnectorService {
connector.addConnectorChangeListener(connectorListener);
try {
final ProgressTask progressTask = getProgressTask(
"spring-process-connector-service-connect-" + processKey);
progressTask.progressBegin("Connect", null);
final IndefiniteProgressTask progressTask = getProgressTask(
"spring-process-connector-service-connect-" + processKey, "Connect", null);
scheduleConnect(progressTask, processKey, connector, 0, TimeUnit.SECONDS, 0);
}
catch (Exception e) {
@@ -110,10 +107,8 @@ public class SpringProcessConnectorService {
SpringProcessConnector connector = this.connectors.get(springProcessParams.getProcessKey());
if (connector != null) {
final ProgressTask progressTask = getProgressTask(
"spring-process-connector-service-refresh-data-" + springProcessParams.getProcessKey());
progressTask.progressBegin("Refresh", null);
final IndefiniteProgressTask progressTask = getProgressTask(
"spring-process-connector-service-refresh-data-" + springProcessParams.getProcessKey(), "Refresh", null);
scheduleRefresh(progressTask, springProcessParams, connector, 0, TimeUnit.SECONDS, 0);
}
@@ -140,11 +135,9 @@ public class SpringProcessConnectorService {
this.connectedSuccess.put(processKey, false);
if (connector != null) {
final ProgressTask progressTask = getProgressTask(
"spring-process-connector-service-disconnect-" + processKey);
final IndefiniteProgressTask progressTask = getProgressTask(
"spring-process-connector-service-disconnect-" + processKey, "Disconnect", null);
progressTask.progressBegin("Disconnect", null);
scheduleDisconnect(progressTask, processKey, connector, 0, TimeUnit.SECONDS, 0);
}
}
@@ -165,7 +158,7 @@ public class SpringProcessConnectorService {
return processID;
}
private void scheduleConnect(ProgressTask progressTask, String processKey, SpringProcessConnector connector, long delay, TimeUnit unit, int retryNo) {
private void scheduleConnect(IndefiniteProgressTask progressTask, String processKey, SpringProcessConnector connector, long delay, TimeUnit unit, int retryNo) {
String progressMessage = "Connecting to process: " + processKey + " - retry no: " + retryNo;
log.info(progressMessage);
@@ -174,7 +167,7 @@ public class SpringProcessConnectorService {
try {
progressTask.progressEvent(progressMessage);
connector.connect();
progressTask.progressDone();
progressTask.done();
refreshProcess(new SpringProcessParams(processKey, "", "", ""));
refreshProcess(new SpringProcessParams(processKey, METRICS, MEMORY, ""));
@@ -186,7 +179,7 @@ public class SpringProcessConnectorService {
if (retryNo < maxRetryCount && isKnownProcessKey(processKey)) {
scheduleConnect(progressTask, processKey, connector, retryDelayInSeconds, TimeUnit.SECONDS, retryNo + 1);
} else {
progressTask.progressDone();
progressTask.done();
// Send message to client if maximum retries reached on error
if (isKnownProcessKey(processKey)) {
@@ -198,7 +191,7 @@ public class SpringProcessConnectorService {
}, delay, unit);
}
private void scheduleDisconnect(ProgressTask progressTask, String processKey, SpringProcessConnector connector, long delay, TimeUnit unit, int retryNo) {
private void scheduleDisconnect(IndefiniteProgressTask progressTask, String processKey, SpringProcessConnector connector, long delay, TimeUnit unit, int retryNo) {
String message = "Disconnect from process: " + processKey + " - retry no: " + retryNo;
log.info(message);
@@ -207,7 +200,7 @@ public class SpringProcessConnectorService {
try {
progressTask.progressEvent(message);
connector.disconnect();
progressTask.progressDone();
progressTask.done();
}
catch (Exception e) {
log.info("problem occured during process disconnect", e);
@@ -215,7 +208,7 @@ public class SpringProcessConnectorService {
if (retryNo < maxRetryCount) {
scheduleDisconnect(progressTask, processKey, connector, retryDelayInSeconds, TimeUnit.SECONDS, retryNo + 1);
} else {
progressTask.progressDone();
progressTask.done();
// Send message to client if maximum retries reached on error
diagnosticService.diagnosticEvent(ShowMessageException
@@ -226,7 +219,7 @@ public class SpringProcessConnectorService {
}, delay, unit);
}
private void scheduleRefresh(ProgressTask progressTask, SpringProcessParams springProcessParams, SpringProcessConnector connector, long delay, TimeUnit unit, int retryNo) {
private void scheduleRefresh(IndefiniteProgressTask progressTask, SpringProcessParams springProcessParams, SpringProcessConnector connector, long delay, TimeUnit unit, int retryNo) {
String processKey = springProcessParams.getProcessKey();
String endpoint = springProcessParams.getEndpoint();
String metricName = springProcessParams.getMetricName();
@@ -271,7 +264,7 @@ public class SpringProcessConnectorService {
this.connectedSuccess.put(processKey, true);
}
}
progressTask.progressDone();
progressTask.done();
}
catch (Exception e) {
@@ -282,7 +275,7 @@ public class SpringProcessConnectorService {
retryNo + 1);
}
else {
progressTask.progressDone();
progressTask.done();
// Send message to client if maximum retries reached on error
if (isKnownProcessKey(processKey)) {
@@ -298,7 +291,7 @@ public class SpringProcessConnectorService {
}, delay, unit);
}
private ProgressTask getProgressTask(String prefixId) {
return this.progressService.createProgressTask(prefixId + progressIdKey++);
private IndefiniteProgressTask getProgressTask(String prefixId, String title, String message) {
return this.progressService.createIndefiniteProgressTask(prefixId + progressIdKey++, title, message);
}
}

6
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/JavaReconciler.java
View File

@@ -24,6 +24,10 @@ public interface JavaReconciler {
void reconcile(IJavaProject project, IDocument doc, IProblemCollector problemCollector);
Map<IDocument, Collection<ReconcileProblem>> reconcile(IJavaProject project, List<TextDocument> docs);
Map<IDocument, Collection<ReconcileProblem>> reconcile(IJavaProject project, List<TextDocument> docs, Runnable incrementProgress);
default int getTotalWorkUnits(List<TextDocument> docs) {
return 0;
}
}

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

@@ -156,7 +156,7 @@ public class JdtReconciler implements JavaReconciler {
}
@Override
public Map<IDocument, Collection<ReconcileProblem>> reconcile(IJavaProject project, List<TextDocument> docs) {
public Map<IDocument, Collection<ReconcileProblem>> reconcile(IJavaProject project, List<TextDocument> docs, Runnable incrementProgress) {
if (config.isRewriteReconcileEnabled()) {
}

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteCompilationUnitCache.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2022 VMware, Inc.
* Copyright (c) 2022, 2023 VMware, 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
@@ -238,7 +238,7 @@ public class RewriteCompilationUnitCache implements DocumentContentProvider, Dis
throw new IllegalStateException("Unexpected error fetching document content");
}
});
List<CompilationUnit> cus = ORAstUtils.parseInputs(javaParser, List.of(input));
List<CompilationUnit> cus = ORAstUtils.parseInputs(javaParser, List.of(input), null);
CompilationUnit cu = cus.get(0);
if (cu != null) {

19
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteReconciler.java
View File

@@ -136,7 +136,7 @@ public class RewriteReconciler implements JavaReconciler {
}
@Override
public Map<IDocument, Collection<ReconcileProblem>> reconcile(IJavaProject project, List<TextDocument> docs) {
public Map<IDocument, Collection<ReconcileProblem>> reconcile(IJavaProject project, List<TextDocument> docs, Runnable incrementProgress) {
if (!config.isRewriteReconcileEnabled()) {
return Collections.emptyMap();
@@ -156,11 +156,12 @@ public class RewriteReconciler implements JavaReconciler {
mainSources.add(d);
}
}
JavaParser javaParser = ORAstUtils.createJavaParser(project);
javaParser.setSourceSet(MavenProjectParser.MAIN);
allProblems.putAll(doReconcile(project, mainSources, javaParser));
allProblems.putAll(doReconcile(project, mainSources, javaParser, incrementProgress));
javaParser.setSourceSet(MavenProjectParser.TEST);
allProblems.putAll(doReconcile(project, testSources, javaParser));
allProblems.putAll(doReconcile(project, testSources, javaParser, incrementProgress));
long end = System.currentTimeMillis();
log.info("reconciling project (OpenRewrite): " + project.getElementName() + " - " + docs.size() + " done in " + (end - start) + "ms");
@@ -168,6 +169,7 @@ public class RewriteReconciler implements JavaReconciler {
return allProblems;
}
// Parse all at once
// private Map<IDocument, Collection<ReconcileProblem>> doReconcile(IJavaProject project, List<TextDocument> docs,
// Function<TextDocument, IProblemCollector> problemCollectorFactory, JavaParser javaParser) {
@@ -240,7 +242,7 @@ public class RewriteReconciler implements JavaReconciler {
private static final int BATCH = 50;
// Parse in batches and share the parser
private Map<IDocument, Collection<ReconcileProblem>> doReconcile(IJavaProject project, List<TextDocument> docs, JavaParser javaParser) {
private Map<IDocument, Collection<ReconcileProblem>> doReconcile(IJavaProject project, List<TextDocument> docs, JavaParser javaParser, Runnable incrementProgress) {
Map<IDocument, Collection<ReconcileProblem>> allProblems = new HashMap<>();
if (javaParser != null && config.isRewriteReconcileEnabled()) {
try {
@@ -255,7 +257,7 @@ public class RewriteReconciler implements JavaReconciler {
List<CompilationUnit> cus = ORAstUtils.parseInputs(javaParser,
batchList.stream().map(d -> new Parser.Input(Paths.get(URI.create(d.getUri())), () -> {
return new ByteArrayInputStream(d.get().getBytes());
})).collect(Collectors.toList()));
})).collect(Collectors.toList()), source -> incrementProgress.run());
/*
* If exception occurs during parsing inputs the list of inputs would become shorter than the list of corresponding documents
@@ -275,6 +277,7 @@ public class RewriteReconciler implements JavaReconciler {
} else {
log.warn("(OpenRewrite) Failed to parse source for " + sourcePath);
}
incrementProgress.run();
}
}
@@ -327,5 +330,9 @@ public class RewriteReconciler implements JavaReconciler {
}.visit(cu, new InMemoryExecutionContext(e -> log.error("", e)));
}
}
public int getTotalWorkUnits(List<TextDocument> docs) {
return docs.size() * 2;
}
}

3
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRefactorings.java
View File

@@ -140,7 +140,8 @@ public class RewriteRefactorings implements CodeActionResolver, QuickfixHandler
boolean projectWide = data.getRecipeScope() == RecipeScope.PROJECT;
Recipe r = createRecipe(data);
if (projectWide) {
return applyRecipe(r, project.get(), ORAstUtils.parse(documents, project.get()));
//TODO: progress here as well.
return applyRecipe(r, project.get(), ORAstUtils.parse(documents, project.get(), null));
} else {
List<CompilationUnit> cus = data.getDocUris().stream().map(docUri -> cuCache.getCU(project.get(), URI.create(docUri))).filter(Objects::nonNull).collect(Collectors.toList());
return applyRecipe(r, project.get(), cus);

3
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/BootVersionValidationEngine.java
View File

@@ -20,6 +20,7 @@ import org.springframework.ide.vscode.boot.common.IJavaProjectReconcileEngine;
import org.springframework.ide.vscode.boot.validation.generations.ProjectVersionDiagnosticProvider;
import org.springframework.ide.vscode.boot.validation.generations.ProjectVersionDiagnosticProvider.DiagnosticResult;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.languageserver.ProgressService;
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
@@ -39,7 +40,7 @@ public class BootVersionValidationEngine implements IJavaProjectReconcileEngine
this.diagnosticProvider = diagnosticProvider;
}
public void reconcile(IJavaProject project) {
public void reconcile(IJavaProject project, ProgressService progressService) {
if (config.isBootVersionValidationEnabled()) {
log.debug("validating Spring Boot version on project: " + project.getElementName());
long start = System.currentTimeMillis();