From 9ac301350630c41d2dacd72d37af0990a37947a8 Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 9 Mar 2023 18:59:55 -0500 Subject: [PATCH] Limit validation to spring projects. Boot version for boot projects. --- .../ide/vscode/boot/common/ProjectReconcileScheduler.java | 5 +++++ .../vscode/boot/validation/BootVersionValidationEngine.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/ProjectReconcileScheduler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/ProjectReconcileScheduler.java index 3d5a9f408..7f2c0b61f 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/ProjectReconcileScheduler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/ProjectReconcileScheduler.java @@ -17,6 +17,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.eclipse.lsp4j.TextDocumentIdentifier; import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.java.SpringProjectUtil; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; @@ -69,6 +70,10 @@ public abstract class ProjectReconcileScheduler { } protected final void scheduleValidation(IJavaProject project) { + if (!SpringProjectUtil.isSpringProject(project)) { + // Bail out if not a spring project + return; + } URI uri = project.getLocationUri(); Disposable previousRequest = projectReconcileRequests.put(uri, Mono.delay(Duration.ofMillis(debounce)) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/BootVersionValidationEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/BootVersionValidationEngine.java index 359bb8a75..12ad774cb 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/BootVersionValidationEngine.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/BootVersionValidationEngine.java @@ -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.java.SpringProjectUtil; 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; @@ -41,7 +42,7 @@ public class BootVersionValidationEngine implements IJavaProjectReconcileEngine } public void reconcile(IJavaProject project, ProgressService progressService) { - if (config.isBootVersionValidationEnabled()) { + if (config.isBootVersionValidationEnabled() && SpringProjectUtil.isBootProject(project)) { log.debug("validating Spring Boot version on project: " + project.getElementName()); long start = System.currentTimeMillis();