From d55ba1f8979b4e9d10a73b4d5e5de0f7052700e3 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 27 Jul 2023 16:50:11 +0200 Subject: [PATCH] GH-1068: removed recipe repository from dependencies, not necessary at the moment --- .../ide/vscode/boot/app/BootLanguageServerBootApp.java | 5 ++--- .../ide/vscode/boot/app/SpringSymbolIndex.java | 5 +---- .../java/reconcilers/BeanMethodNotPublicReconciler.java | 7 ++----- .../ide/vscode/boot/java/reconcilers/JdtReconciler.java | 5 ++--- .../java/value/test/ValueSpelExpressionValidationTest.java | 2 +- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java index 99a3e960c..e55d5a5a3 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java @@ -83,7 +83,6 @@ import org.springframework.ide.vscode.commons.languageserver.LanguageServerRunne import org.springframework.ide.vscode.commons.languageserver.java.FutureProjectFinder; 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.quickfix.QuickfixRegistry; import org.springframework.ide.vscode.commons.languageserver.util.DocumentEventListenerManager; import org.springframework.ide.vscode.commons.languageserver.util.LanguageComputer; import org.springframework.ide.vscode.commons.languageserver.util.LspClient; @@ -242,8 +241,8 @@ public class BootLanguageServerBootApp { return new CompilationUnitCache(params.projectFinder, server, params.projectObserver); } - @Bean JdtReconciler jdtReconciler(CompilationUnitCache cuCache, RewriteRecipeRepository recipeRepo, BootJavaConfig config, SimpleLanguageServer server) { - return new JdtReconciler(cuCache, recipeRepo, server.getQuickfixRegistry(), config); + @Bean JdtReconciler jdtReconciler(CompilationUnitCache cuCache, BootJavaConfig config, SimpleLanguageServer server) { + return new JdtReconciler(cuCache, server.getQuickfixRegistry(), config); } @Bean SpringXMLCompletionEngine xmlCompletionEngine(SimpleLanguageServer server, JavaProjectFinder projectFinder, SpringSymbolIndex symbolIndex, BootJavaConfig config) { diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java index adb6dd8e9..81aa84c42 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java @@ -56,7 +56,6 @@ import org.springframework.ide.vscode.boot.java.handlers.SymbolAddOnInformation; import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider; import org.springframework.ide.vscode.boot.java.reconcilers.AnnotationReconciler; import org.springframework.ide.vscode.boot.java.reconcilers.BeanMethodNotPublicReconciler; -import org.springframework.ide.vscode.boot.java.rewrite.RewriteRecipeRepository; import org.springframework.ide.vscode.boot.java.utils.DocumentDescriptor; import org.springframework.ide.vscode.boot.java.utils.SpringFactoriesIndexer; import org.springframework.ide.vscode.boot.java.utils.SpringIndexer; @@ -72,7 +71,6 @@ import org.springframework.ide.vscode.commons.languageserver.java.FutureProjectF 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.java.ProjectObserver.Listener; -import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixRegistry; import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; import org.springframework.ide.vscode.commons.languageserver.util.ListenerList; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; @@ -103,7 +101,6 @@ public class SpringSymbolIndex implements InitializingBean, SpringIndex { @Autowired IndexCache cache; @Autowired FutureProjectFinder futureProjectFinder; @Autowired SpringMetamodelIndex springIndex; - @Autowired RewriteRecipeRepository recipeRepo; private static final String QUERY_PARAM_LOCATION_PREFIX = "locationPrefix:"; @@ -249,7 +246,7 @@ public class SpringSymbolIndex implements InitializingBean, SpringIndex { springIndexerXML = new SpringIndexerXML(handler, namespaceHandler, this.cache, projectFinder()); List reconcilers = new ArrayList<>(); - reconcilers.add(new BeanMethodNotPublicReconciler(recipeRepo, server.getQuickfixRegistry())); + reconcilers.add(new BeanMethodNotPublicReconciler(server.getQuickfixRegistry())); BiFunction, BiConsumer, IProblemCollector> problemCollectorFactory = (docRef, aggregator) -> server.createProblemCollector(docRef, aggregator); springIndexerJava = new SpringIndexerJava(handler, specificProviders, this.cache, projectFinder(), server.getProgressService(), reconcilers, problemCollectorFactory); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java index ea7049f5d..9d8366abf 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.boot.java.Annotations; import org.springframework.ide.vscode.boot.java.Boot2JavaProblemType; -import org.springframework.ide.vscode.boot.java.rewrite.RewriteRecipeRepository; import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.SpringProjectUtil; @@ -48,11 +47,9 @@ public class BeanMethodNotPublicReconciler implements AnnotationReconciler { private static final String ID = BeanMethodsNotPublic.class.getName(); private static final String LABEL = "Remove 'public' from @Bean method"; - private final RewriteRecipeRepository recipeRepo; private final QuickfixRegistry quickfixRegistry; - public BeanMethodNotPublicReconciler(RewriteRecipeRepository recipeRepo, QuickfixRegistry quickfixRegistry) { - this.recipeRepo = recipeRepo; + public BeanMethodNotPublicReconciler(QuickfixRegistry quickfixRegistry) { this.quickfixRegistry = quickfixRegistry; } @@ -106,7 +103,7 @@ public class BeanMethodNotPublicReconciler implements AnnotationReconciler { private void addQuickFixes(IDocument doc, ReconcileProblemImpl problem, MethodDeclaration method) { - if (recipeRepo != null && quickfixRegistry != null) { + if (quickfixRegistry != null) { FixDescriptor fix1 = new FixDescriptor(ID, List.of(doc.getUri()), LABEL) .withRecipeScope(RecipeScope.NODE); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/JdtReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/JdtReconciler.java index 83052aae3..92e95ec90 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/JdtReconciler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/JdtReconciler.java @@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.boot.app.BootJavaConfig; import org.springframework.ide.vscode.boot.java.Annotations; import org.springframework.ide.vscode.boot.java.handlers.SpelExpressionReconciler; -import org.springframework.ide.vscode.boot.java.rewrite.RewriteRecipeRepository; import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixRegistry; @@ -60,7 +59,7 @@ public class JdtReconciler implements JavaReconciler { private BootJavaConfig config; - public JdtReconciler(CompilationUnitCache compilationUnitCache, RewriteRecipeRepository recipeRepo, QuickfixRegistry quickfixRegistry, BootJavaConfig config) { + public JdtReconciler(CompilationUnitCache compilationUnitCache, QuickfixRegistry quickfixRegistry, BootJavaConfig config) { this.compilationUnitCache = compilationUnitCache; this.config = config; config.addListener(evt -> setSpelExpressionSyntaxValidationEnabled(config.isSpelExpressionValidationEnabled())); @@ -92,7 +91,7 @@ public class JdtReconciler implements JavaReconciler { new AnnotationParamReconciler(SPRING_CONDITIONAL_ON_EXPRESSION, null, "", "", spelExpressionReconciler), new AnnotationParamReconciler(SPRING_CONDITIONAL_ON_EXPRESSION, "value", "", "", spelExpressionReconciler), - new BeanMethodNotPublicReconciler(recipeRepo, quickfixRegistry) + new BeanMethodNotPublicReconciler(quickfixRegistry) }; } diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueSpelExpressionValidationTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueSpelExpressionValidationTest.java index 82953d783..925d57852 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueSpelExpressionValidationTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueSpelExpressionValidationTest.java @@ -148,7 +148,7 @@ public class ValueSpelExpressionValidationTest { problemCollector = new TestProblemCollector(); reconcileEngine = new BootJavaReconcileEngine(projectFinder, new JavaReconciler[] { - new JdtReconciler(compilationUnitCache, null, null, config) + new JdtReconciler(compilationUnitCache, null, config) }, server); }