From 8acbb3def266142332f3db7fa14399ba3deedeaf Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 16 Jul 2024 12:20:55 +0200 Subject: [PATCH] cleanup --- .../annotations/AnnotationAttributeCompletionProcessor.java | 1 + .../vscode/boot/index/test/SpringMetamodelIndexingTest.java | 5 +++-- .../java/beans/test/QualifierReferencesProviderTest.java | 1 - .../vscode/boot/java/beans/test/SpringIndexerBeansTest.java | 6 ++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java index 9c2d31b0d..2960737d7 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java @@ -78,6 +78,7 @@ public class AnnotationAttributeCompletionProcessor implements CompletionProvide computeProposalsForStringLiteral(project, node, completions, offset, doc); } } + // case: @Qualifier({"prefix<*>"}) else if (node instanceof StringLiteral && node.getParent() instanceof ArrayInitializer) { if (node.toString().startsWith("\"") && node.toString().endsWith("\"")) { computeProposalsForInsideArrayInitializer(project, node, completions, offset, doc); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java index 9f1802896..c3d956dbf 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java @@ -15,6 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import java.io.File; import java.net.URI; +import java.nio.charset.Charset; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; @@ -119,7 +120,7 @@ public class SpringMetamodelIndexingTest { assertEquals(1, beans.length); assertEquals(0, beans[0].getInjectionPoints().length); - String newContent = FileUtils.readFileToString(new File(new URI(changedDocURI))).replace("beanWithoutInjections()", "beanNowWithOneInjection(BeanClass1 bean1)"); + String newContent = FileUtils.readFileToString(new File(new URI(changedDocURI)), Charset.defaultCharset()).replace("beanWithoutInjections()", "beanNowWithOneInjection(BeanClass1 bean1)"); CompletableFuture updateFuture = indexer.updateDocument(changedDocURI, newContent, "test triggered"); updateFuture.get(5, TimeUnit.SECONDS); @@ -165,7 +166,7 @@ public class SpringMetamodelIndexingTest { + "}\n" + "" + ""; - FileUtils.write(new File(new URI(createdDocURI)), content); + FileUtils.write(new File(new URI(createdDocURI)), content, Charset.defaultCharset()); CompletableFuture createFuture = indexer.createDocument(createdDocURI); createFuture.get(5, TimeUnit.SECONDS); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/QualifierReferencesProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/QualifierReferencesProviderTest.java index bba410989..3f8565c9f 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/QualifierReferencesProviderTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/QualifierReferencesProviderTest.java @@ -18,7 +18,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import org.eclipse.lsp4j.Location; -import org.eclipse.lsp4j.LocationLink; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.TextDocumentIdentifier; diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java index 327edf58d..01064c21f 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java @@ -10,20 +10,19 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot.java.beans.test; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.File; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import org.eclipse.lsp4j.TextDocumentIdentifier; - -import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Import; -import org.springframework.ide.vscode.boot.app.BootLanguageServerInitializer; import org.springframework.ide.vscode.boot.app.SpringSymbolIndex; import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest; import org.springframework.ide.vscode.boot.bootiful.SymbolProviderTestConf; @@ -43,7 +42,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; public class SpringIndexerBeansTest { @Autowired private BootLanguageServerHarness harness; - @Autowired private BootLanguageServerInitializer serverInit; @Autowired private JavaProjectFinder projectFinder; private File directory;