cleanup

Author: martinlippert

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java

@@ -78,6 +78,7 @@ else if (node instanceof StringLiteral && node.getParent() instanceof Annotation
 					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);

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java

@@ -15,6 +15,7 @@
 
 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 @@ void testUpdateChangedDocument() throws Exception {
         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<Void> updateFuture = indexer.updateDocument(changedDocURI, newContent, "test triggered");
         updateFuture.get(5, TimeUnit.SECONDS);
 
@@ -165,7 +166,7 @@ void testNewDocumentCreated() throws Exception {
             		+ "}\n"
             		+ "" +
                     "";
-            FileUtils.write(new File(new URI(createdDocURI)), content);
+            FileUtils.write(new File(new URI(createdDocURI)), content, Charset.defaultCharset());
             CompletableFuture<Void> createFuture = indexer.createDocument(createdDocURI);
             createFuture.get(5, TimeUnit.SECONDS);
 

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.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;

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 @@
 public class SpringIndexerBeansTest {
 
 	@Autowired private BootLanguageServerHarness harness;
-	@Autowired private BootLanguageServerInitializer serverInit;
 	@Autowired private JavaProjectFinder projectFinder;
 
 	private File directory;