Boot -> 3, JUnit -> 5, Java -> 17

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

@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
@@ -99,7 +100,7 @@ public class BootLanguageServerInitializer implements InitializingBean {
 			
 			@Override
 			public void deleted(IJavaProject project) {
-				doNotValidateProject(project);
+				doNotValidateProject(project, true);
 			}
 			
 			@Override
@@ -182,7 +183,7 @@ public class BootLanguageServerInitializer implements InitializingBean {
 		
 		server.onShutdown(() -> {
 			for (IJavaProject p : projectFinder.all()) {
-				doNotValidateProject(p);
+				doNotValidateProject(p, false);
 			}
 		});
 	}
@@ -215,7 +216,7 @@ public class BootLanguageServerInitializer implements InitializingBean {
 		
 		URI uri = project.getLocationUri();
 		
-		doNotValidateProject(project);
+		doNotValidateProject(project, true);
 		
 		projectReconcileRequests.put(uri, Mono.delay(Duration.ofMillis(100))
 				.publishOn(projectReconcileScheduler)
@@ -228,7 +229,7 @@ public class BootLanguageServerInitializer implements InitializingBean {
 				.subscribe());
 	}
 	
-	private void doNotValidateProject(IJavaProject project) {
+	private void doNotValidateProject(IJavaProject project, boolean asyncClear) {
 		if (configProps.isReconcileOnlyOpenedDocs()) {
 			return;
 		}
@@ -239,7 +240,17 @@ public class BootLanguageServerInitializer implements InitializingBean {
 			request.dispose();
 		}
 		
-		projectReconciler.clear(project);
+		/*
+		 * TODO: Look at LanguageServerHarness to fix the deadlock that occurs every 2 second time maven build is ran
+		 * If #clear(IJavaProject) is synchronous then the locked LanguageServerHarness instance is attempted to call publishDiagnostic()
+		 * which is caused by the #clear(...) call. In the LS reality this will never happen as #publishDiagnsotics() is always a future
+		 */
+		if (asyncClear) {
+			Mono.fromFuture(CompletableFuture.runAsync(() -> projectReconciler.clear(project)))
+					.publishOn(projectReconcileScheduler);
+		} else {
+			projectReconciler.clear(project);
+		}
 	}
 	
 	private void handleFiles(String[] files) {

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

@@ -13,11 +13,13 @@ package org.springframework.ide.vscode.boot.app;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver;
 import org.springframework.stereotype.Component;
 
 @Component
+@ConditionalOnMissingClass("org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness")
 public class BootVersionValidationEngine {
 
 	private final BootVersionValidator bootVersionValidator;

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

@@ -12,8 +12,11 @@ package org.springframework.ide.vscode.boot.bootiful;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.ide.vscode.boot.app.BootVersionValidationEngine;
 import org.springframework.ide.vscode.boot.editor.harness.AdHocPropertyHarness;
+import org.springframework.ide.vscode.boot.java.utils.test.MockProjectObserver;
 import org.springframework.ide.vscode.boot.metadata.ProjectBasedPropertyIndexProvider;
+import org.springframework.ide.vscode.commons.java.IJavaProject;
 
 @Configuration
 public class AdHocPropertyHarnessTestConf {
@@ -24,4 +27,16 @@ public class AdHocPropertyHarnessTestConf {
 	@Bean ProjectBasedPropertyIndexProvider adHocProperties(AdHocPropertyHarness adHocProperties) {
 		return adHocProperties.getIndexProvider();
 	}
+	
+	@Bean BootVersionValidationEngine versionValidator() {
+		return new BootVersionValidationEngine(new MockProjectObserver(), null) {
+
+			@Override
+			public void validate(IJavaProject project) {
+				// do not validate anything
+			}
+			
+		};
+	}
+
 }

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java

@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.editor.harness;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 import org.eclipse.lsp4j.CompletionItem;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ide.vscode.boot.app.BootLanguageServerInitializer;
 import org.springframework.ide.vscode.boot.configurationmetadata.Deprecation.Level;
@@ -54,7 +54,7 @@ public abstract class AbstractPropsEditorTest {
 	@Autowired protected LanguageServerHarness harness;
 	@Autowired BootLanguageServerInitializer serverInit;
 
-	@Before public void setup() throws Exception {
+	@BeforeEach public void setup() throws Exception {
 		serverInit.setMaxCompletions(-1);
 		harness.intialize(null);
 	}

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

@@ -10,17 +10,17 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.beans.test;
 
-import static org.junit.Assert.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 org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+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;
@@ -32,12 +32,12 @@ import org.springframework.ide.vscode.boot.java.handlers.SymbolAddOnInformation;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringIndexerBeansTest {
@@ -49,7 +49,7 @@ public class SpringIndexerBeansTest {
 	private File directory;
 	@Autowired private SpringSymbolIndex indexer;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 
@@ -64,113 +64,114 @@ public class SpringIndexerBeansTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testScanSimpleConfigurationClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleConfiguration.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Configuration", "@+ 'simpleConfiguration' (@Configuration <: @Component) SimpleConfiguration"),
-				SpringIndexerHarness.symbol("@Bean", "@+ 'simpleBean' (@Bean) BeanClass")
-		);
+    @Test
+    void testScanSimpleConfigurationClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleConfiguration.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Configuration", "@+ 'simpleConfiguration' (@Configuration <: @Component) SimpleConfiguration"),
+                SpringIndexerHarness.symbol("@Bean", "@+ 'simpleBean' (@Bean) BeanClass")
+        );
 
-		List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
-		assertEquals(2, addon.size());
+        List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
+        assertEquals(2, addon.size());
 
-		assertEquals(1, addon.stream()
-			.filter(info -> info instanceof BeansSymbolAddOnInformation)
-			.filter(info -> "simpleConfiguration".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-			.count());
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "simpleConfiguration".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
 
-		assertEquals(1, addon.stream()
-				.filter(info -> info instanceof BeansSymbolAddOnInformation)
-				.filter(info -> "simpleBean".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-				.count());
-	}
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "simpleBean".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
+    }
 
-	@Test public void testScanSpecialConfigurationClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SpecialConfiguration.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Configuration", "@+ 'specialConfiguration' (@Configuration <: @Component) SpecialConfiguration"),
+    @Test
+    void testScanSpecialConfigurationClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SpecialConfiguration.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Configuration", "@+ 'specialConfiguration' (@Configuration <: @Component) SpecialConfiguration"),
 
-				// @Bean("implicitNamedBean")
-				SpringIndexerHarness.symbol("implicitNamedBean", "@+ 'implicitNamedBean' (@Bean) BeanClass"),
+                // @Bean("implicitNamedBean")
+                SpringIndexerHarness.symbol("implicitNamedBean", "@+ 'implicitNamedBean' (@Bean) BeanClass"),
 
-				// @Bean(value="valueBean")
-				SpringIndexerHarness.symbol("valueBean", "@+ 'valueBean' (@Bean) BeanClass"),
+                // @Bean(value="valueBean")
+                SpringIndexerHarness.symbol("valueBean", "@+ 'valueBean' (@Bean) BeanClass"),
 
-				// @Bean(value= {"valueBean1", "valueBean2"})
-				SpringIndexerHarness.symbol("valueBean1", "@+ 'valueBean1' (@Bean) BeanClass"),
-				SpringIndexerHarness.symbol("valueBean2", "@+ 'valueBean2' (@Bean) BeanClass"),
+                // @Bean(value= {"valueBean1", "valueBean2"})
+                SpringIndexerHarness.symbol("valueBean1", "@+ 'valueBean1' (@Bean) BeanClass"),
+                SpringIndexerHarness.symbol("valueBean2", "@+ 'valueBean2' (@Bean) BeanClass"),
 
-				// @Bean(name="namedBean")
-				SpringIndexerHarness.symbol("namedBean", "@+ 'namedBean' (@Bean) BeanClass"),
+                // @Bean(name="namedBean")
+                SpringIndexerHarness.symbol("namedBean", "@+ 'namedBean' (@Bean) BeanClass"),
 
-				// @Bean(name= {"namedBean1", "namedBean2"})
-				SpringIndexerHarness.symbol("namedBean1", "@+ 'namedBean1' (@Bean) BeanClass"),
-				SpringIndexerHarness.symbol("namedBean2", "@+ 'namedBean2' (@Bean) BeanClass")
-		);
-	}
+                // @Bean(name= {"namedBean1", "namedBean2"})
+                SpringIndexerHarness.symbol("namedBean1", "@+ 'namedBean1' (@Bean) BeanClass"),
+                SpringIndexerHarness.symbol("namedBean2", "@+ 'namedBean2' (@Bean) BeanClass")
+        );
+    }
 
-	@Test
-	public void testScanConfigurationClassWithConditionals() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/ConfigurationWithConditionals.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Configuration", "@+ 'configurationWithConditionals' (@Configuration <: @Component) ConfigurationWithConditionals"),
-				SpringIndexerHarness.symbol("@Bean", "@+ 'conditionalBean' (@Bean @ConditionalOnJava(JavaVersion.EIGHT)) BeanClass"),
-				SpringIndexerHarness.symbol("@Bean", "@+ 'conditionalBeanDifferentSequence' (@Bean @ConditionalOnJava(JavaVersion.EIGHT)) BeanClass"),
-				SpringIndexerHarness.symbol("@Bean", "@+ 'conditionalBeanWithJavaAndCloud' (@Bean @ConditionalOnJava(JavaVersion.EIGHT) @Profile(\"cloud\")) BeanClass")
-		);
-	}
+    @Test
+    void testScanConfigurationClassWithConditionals() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/ConfigurationWithConditionals.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Configuration", "@+ 'configurationWithConditionals' (@Configuration <: @Component) ConfigurationWithConditionals"),
+                SpringIndexerHarness.symbol("@Bean", "@+ 'conditionalBean' (@Bean @ConditionalOnJava(JavaVersion.EIGHT)) BeanClass"),
+                SpringIndexerHarness.symbol("@Bean", "@+ 'conditionalBeanDifferentSequence' (@Bean @ConditionalOnJava(JavaVersion.EIGHT)) BeanClass"),
+                SpringIndexerHarness.symbol("@Bean", "@+ 'conditionalBeanWithJavaAndCloud' (@Bean @ConditionalOnJava(JavaVersion.EIGHT) @Profile(\"cloud\")) BeanClass")
+        );
+    }
 
-	@Test
-	public void testScanConfigurationClassWithConditionalsDefaultSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/ConfigurationWithConditionalsDefaultSymbols.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Configuration", "@+ 'configurationWithConditionalsDefaultSymbols' (@Configuration <: @Component) ConfigurationWithConditionalsDefaultSymbols"),
-				SpringIndexerHarness.symbol("@ConditionalOnJava(JavaVersion.EIGHT)", "@ConditionalOnJava(JavaVersion.EIGHT)"),
-				SpringIndexerHarness.symbol("@Profile(\"cloud\")", "@Profile(\"cloud\")"),
-				SpringIndexerHarness.symbol("@ConditionalOnJava(JavaVersion.EIGHT)", "@ConditionalOnJava(JavaVersion.EIGHT)"),
-				SpringIndexerHarness.symbol("@Profile(\"cloud\")", "@Profile(\"cloud\")")
-		);
-	}
+    @Test
+    void testScanConfigurationClassWithConditionalsDefaultSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/ConfigurationWithConditionalsDefaultSymbols.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Configuration", "@+ 'configurationWithConditionalsDefaultSymbols' (@Configuration <: @Component) ConfigurationWithConditionalsDefaultSymbols"),
+                SpringIndexerHarness.symbol("@ConditionalOnJava(JavaVersion.EIGHT)", "@ConditionalOnJava(JavaVersion.EIGHT)"),
+                SpringIndexerHarness.symbol("@Profile(\"cloud\")", "@Profile(\"cloud\")"),
+                SpringIndexerHarness.symbol("@ConditionalOnJava(JavaVersion.EIGHT)", "@ConditionalOnJava(JavaVersion.EIGHT)"),
+                SpringIndexerHarness.symbol("@Profile(\"cloud\")", "@Profile(\"cloud\")")
+        );
+    }
 
-	@Test
-	public void testScanAbstractBeanConfiguration() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/AbstractBeanConfiguration.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Configuration", "@+ 'abstractBeanConfiguration' (@Configuration <: @Component) AbstractBeanConfiguration")
-		);
-	}
+    @Test
+    void testScanAbstractBeanConfiguration() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/AbstractBeanConfiguration.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Configuration", "@+ 'abstractBeanConfiguration' (@Configuration <: @Component) AbstractBeanConfiguration")
+        );
+    }
 
-	@Test
-	public void testScanSimpleComponentClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleComponent.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Component", "@+ 'simpleComponent' (@Component) SimpleComponent")
-		);
-	}
+    @Test
+    void testScanSimpleComponentClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleComponent.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Component", "@+ 'simpleComponent' (@Component) SimpleComponent")
+        );
+    }
 
-	@Test
-	public void testScanSimpleControllerClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleController.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Controller", "@+ 'simpleController' (@Controller <: @Component) SimpleController")
-		);
-	}
+    @Test
+    void testScanSimpleControllerClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleController.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Controller", "@+ 'simpleController' (@Controller <: @Component) SimpleController")
+        );
+    }
 
-	@Test
-	public void testScanRestControllerClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleRestController.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@RestController", "@+ 'simpleRestController' (@RestController <: @Controller, @Component) SimpleRestController")
-		);
-	}
+    @Test
+    void testScanRestControllerClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleRestController.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@RestController", "@+ 'simpleRestController' (@RestController <: @Controller, @Component) SimpleRestController")
+        );
+    }
 
-	@Test
-	public void testCustomAnnotationClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/CustomAnnotation.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@AliasFor(annotation = Component.class)", "@AliasFor(annotation=Component.class)")
-		);
-	}
+    @Test
+    void testCustomAnnotationClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/CustomAnnotation.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@AliasFor(annotation = Component.class)", "@AliasFor(annotation=Component.class)")
+        );
+    }
 
 }

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

@@ -10,17 +10,17 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.beans.test;
 
-import static org.junit.Assert.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 org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+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.SpringSymbolIndex;
@@ -31,12 +31,12 @@ import org.springframework.ide.vscode.boot.java.handlers.SymbolAddOnInformation;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringIndexerFunctionBeansTest {
@@ -47,7 +47,7 @@ public class SpringIndexerFunctionBeansTest {
 
 	private File directory;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 
@@ -62,62 +62,62 @@ public class SpringIndexerFunctionBeansTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testScanSimpleFunctionBean() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/FunctionClass.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("@Configuration", "@+ 'functionClass' (@Configuration <: @Component) FunctionClass"),
-				SpringIndexerHarness.symbol("@Bean", "@> 'uppercase' (@Bean) Function<String,String>")
-		);
+    @Test
+    void testScanSimpleFunctionBean() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/FunctionClass.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("@Configuration", "@+ 'functionClass' (@Configuration <: @Component) FunctionClass"),
+                SpringIndexerHarness.symbol("@Bean", "@> 'uppercase' (@Bean) Function<String,String>")
+        );
 
-		List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
-		assertEquals(2, addon.size());
+        List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
+        assertEquals(2, addon.size());
 
-		assertEquals(1, addon.stream()
-			.filter(info -> info instanceof BeansSymbolAddOnInformation)
-			.filter(info -> "functionClass".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-			.count());
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "functionClass".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
 
-		assertEquals(1, addon.stream()
-				.filter(info -> info instanceof BeansSymbolAddOnInformation)
-				.filter(info -> "uppercase".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-				.count());
-	}
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "uppercase".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
+    }
 
-	@Test
-	public void testScanSimpleFunctionClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/ScannedFunctionClass.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("ScannedFunctionClass", "@> 'scannedFunctionClass' Function<String,String>")
-		);
-	}
+    @Test
+    void testScanSimpleFunctionClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/ScannedFunctionClass.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("ScannedFunctionClass", "@> 'scannedFunctionClass' Function<String,String>")
+        );
+    }
 
-	@Test
-	public void testScanSpecializedFunctionClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/FunctionFromSpecializedClass.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("FunctionFromSpecializedClass", "@> 'functionFromSpecializedClass' Function<String,String>")
-		);
-	}
+    @Test
+    void testScanSpecializedFunctionClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/FunctionFromSpecializedClass.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("FunctionFromSpecializedClass", "@> 'functionFromSpecializedClass' Function<String,String>")
+        );
+    }
 
-	@Test
-	public void testScanSpecializedFunctionInterface() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/FunctionFromSpecializedInterface.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
-				SpringIndexerHarness.symbol("FunctionFromSpecializedInterface", "@> 'functionFromSpecializedInterface' Function<String,String>")
-		);
-	}
+    @Test
+    void testScanSpecializedFunctionInterface() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/FunctionFromSpecializedInterface.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("FunctionFromSpecializedInterface", "@> 'functionFromSpecializedInterface' Function<String,String>")
+        );
+    }
 
-	@Test
-	public void testNoSymbolForAbstractClasses() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SpecializedFunctionClass.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri);
-	}
+    @Test
+    void testNoSymbolForAbstractClasses() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SpecializedFunctionClass.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri);
+    }
 
-	@Test
-	public void testNoSymbolForSubInterfaces() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SpecializedFunctionInterface.java").toUri().toString();
-		SpringIndexerHarness.assertDocumentSymbols(indexer, docUri);
-	}
+    @Test
+    void testNoSymbolForSubInterfaces() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SpecializedFunctionInterface.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri);
+    }
 
 }

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

@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.beans.test;
 
-import static org.junit.Assert.assertEquals;
-
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,6 +18,8 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.WorkspaceSymbol;
 import org.springframework.ide.vscode.boot.app.SpringSymbolIndex;

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

@@ -10,15 +10,15 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.conditionals.test;
 
-import static org.junit.Assert.assertFalse;
-
 import java.io.File;
 
 import org.eclipse.lsp4j.Hover;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.AfterEach;
+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.bootiful.BootLanguageServerTest;
@@ -30,9 +30,9 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.ide.vscode.project.harness.SpringProcessLiveDataBuilder;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class ConditionalsLiveHoverTest {
@@ -40,12 +40,12 @@ public class ConditionalsLiveHoverTest {
 	@Autowired private BootLanguageServerHarness harness;
 	@Autowired private SpringProcessLiveDataProvider liveDataProvider;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.useProject(ProjectsHarness.INSTANCE.mavenProject("test-conditionals-live-hover"));
 	}
 	
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		liveDataProvider.remove("processkey");
 		liveDataProvider.remove("processkey1");
@@ -53,382 +53,382 @@ public class ConditionalsLiveHoverTest {
 		liveDataProvider.remove("processkey3");
 	}
 
-	@Test
-	public void testNoLiveHoverNoRunningApp() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnMissingBeanConfig.java").toUri()
-				.toString();
-
-		harness.intialize(directory);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertNoHover("@ConditionalOnMissingBean");
-	}
-
-	@Test
-	public void testLiveHoverConditionalOnBean() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnBeanConfig.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1111")
-				.processID("22022")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"ConditionalOnBeanConfig#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}]}}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHoverContains("@ConditionalOnBean",
-				"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\n" + "\n"
-						+ "Process [PID=22022, name=`test-conditionals-live-hover`]");
-	}
-
-	@Test
-	public void testLiveHoverConditionalOnMissingBean() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnMissingBeanConfig.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1111")
-				.processID("22022")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("proesskey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHoverContains("@ConditionalOnMissingBean",
-				"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n" + "\n"
-						+ "Process [PID=22022, name=`test-conditionals-live-hover`]");
-
-	}
-
-	@Test
-	public void testMultipleLiveHoverContentRealProject() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1111")
-				.processID("22022")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"HelloConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}],\"HelloConfig2#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}],\"MultipleConditionals#hi\":[{\"condition\":\"OnClassCondition\",\"message\":\"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\"},{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"},{\"condition\":\"OnExpressionCondition\",\"message\":\"@ConditionalOnExpression (#{true}) resulted in true\"},{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\"}]}}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("proesskey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-
-		editor.assertHoverContains("@ConditionalOnBean",
-				"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\n" + "\n"
-						+ "Process [PID=22022, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverContains("@ConditionalOnWebApplication",
-				"@ConditionalOnWebApplication (required) found StandardServletEnvironment\n" + "\n"
-						+ "Process [PID=22022, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverContains("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)",
-				"@ConditionalOnJava (1.8 or newer) found 1.8\n" + "\n"
-						+ "Process [PID=22022, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverContains("@ConditionalOnMissingClass",
-				"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\n"
-						+ "\n" + "Process [PID=22022, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverContains("@ConditionalOnExpression", "@ConditionalOnExpression (#{true}) resulted in true\n"
-				+ "\n" + "Process [PID=22022, name=`test-conditionals-live-hover`]");
-	}
-
-	@Test
-	public void testMultipleAppInstances() throws Exception {
-
-		// Test that live hover shows information for multiple app instances
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnMissingBeanConfig.java").toUri()
-				.toString();
-		harness.intialize(directory);
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData1 = new SpringProcessLiveDataBuilder()
-				.port("1000")
-				.processID("70000")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
-				.build();
-		liveDataProvider.add("processkey1", liveData1);
-
-		SpringProcessLiveData liveData2 = new SpringProcessLiveDataBuilder()
-				.port("1001")
-				.processID("80000")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
-				.build();
-		liveDataProvider.add("processkey2", liveData2);
-
-		SpringProcessLiveData liveData3 = new SpringProcessLiveDataBuilder()
-				.port("1002")
-				.processID("90000")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
-				.build();
-		liveDataProvider.add("processkey3", liveData3);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-
-		editor.assertHoverContains("@ConditionalOnMissingBean",
-				"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n" + "\n"
-						+ "Process [PID=70000, name=`test-conditionals-live-hover`]\n" + "\n"
-						+ "@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n"
-						+ "\n" + "Process [PID=80000, name=`test-conditionals-live-hover`]\n" + "\n"
-						+ "@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n"
-						+ "\n" + "Process [PID=90000, name=`test-conditionals-live-hover`]");
-
-	}
-
-	@Test
-	public void testMultipleConditionalsSameMethod() throws Exception {
-
-		// Tests something like this:
-		// @Bean
-		// @ConditionalOnBean
-		// @ConditionalOnWebApplication
-		// @ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)
-		// @ConditionalOnMissingClass
-		// @ConditionalOnExpression
-		// public Hello hi() {
-		// return null;
-		// }
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1000")
-				.processID("70000")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"HelloConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}],\"HelloConfig2#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}],\"MultipleConditionals#hi\":[{\"condition\":\"OnClassCondition\",\"message\":\"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\"},{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"},{\"condition\":\"OnExpressionCondition\",\"message\":\"@ConditionalOnExpression (#{true}) resulted in true\"},{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\"}]}}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-
-		// IMPORTANT: test EXACT text to ensure that multiple conditionals on the same
-		// method do not show
-		// up while
-		// hovering over only one of the conditional annotations
-		editor.assertHoverExactText("@ConditionalOnBean",
-				"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\n" + "\n"
-						+ "Process [PID=70000, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverExactText("@ConditionalOnWebApplication",
-				"@ConditionalOnWebApplication (required) found StandardServletEnvironment\n" + "\n"
-						+ "Process [PID=70000, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverExactText("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)",
-				"@ConditionalOnJava (1.8 or newer) found 1.8\n" + "\n"
-						+ "Process [PID=70000, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverExactText("@ConditionalOnMissingClass",
-				"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\n"
-						+ "\n" + "Process [PID=70000, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverExactText("@ConditionalOnExpression", "@ConditionalOnExpression (#{true}) resulted in true\n"
-				+ "\n" + "Process [PID=70000, name=`test-conditionals-live-hover`]");
-	}
-
-	@Test
-	public void PT152535713testMultipleLiveHoverHints() throws Exception {
-
-		// Tests fix for PT152535713. Ensure that in a method with multiple
-		// conditionals,
-		// hovering over any one conditional annotation only shows content for that
-		// conditional
-		// and not any of the other ones
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionalsPT152535713.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1000")
-				.processID("70000")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"MultipleConditionalsPT152535713#hi\":[{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"}]}}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-
-		editor.assertHoverExactText("@ConditionalOnWebApplication",
-				"@ConditionalOnWebApplication (required) found StandardServletEnvironment\n" + "\n"
-						+ "Process [PID=70000, name=`test-conditionals-live-hover`]");
-
-		editor.assertHoverExactText("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)",
-				"@ConditionalOnJava (1.8 or newer) found 1.8\n" + "\n"
-						+ "Process [PID=70000, name=`test-conditionals-live-hover`]");
-
-		// Test that the hovers dont have extra information of the other conditionals:
-		Hover hover = editor.getHover("@ConditionalOnWebApplication");
-		String hoverContent = editor.hoverString(hover);
-		assertFalse(hoverContent.contains("@ConditionalOnJava"));
-
-		hover = editor.getHover("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)");
-		hoverContent = editor.hoverString(hover);
-		assertFalse(hoverContent.contains("@ConditionalOnWebApplication"));
-	}
-
-	@Test
-	public void testHighlightsMethodConditionals() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1111")
-				.processID("22022")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson(
-						"{\"positiveMatches\":{\"HelloConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}],\"HelloConfig2#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}],\"MultipleConditionals#hi\":[{\"condition\":\"OnClassCondition\",\"message\":\"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\"},{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"},{\"condition\":\"OnExpressionCondition\",\"message\":\"@ConditionalOnExpression (#{true}) resulted in true\"},{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\"}]}}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		String content = "package example;\n" + "\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnJava;\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;\n"
-				+ "import org.springframework.context.annotation.Bean;\n"
-				+ "import org.springframework.context.annotation.Configuration;\n" + "\n" + "@Configuration\n"
-				+ "public class MultipleConditionals {\n" + "\n" + "	@Bean\n" + "	@ConditionalOnBean\n"
-				+ "	@ConditionalOnWebApplication\n" + "	@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)\n"
-				+ "	@ConditionalOnMissingClass\n" + "	@ConditionalOnExpression\n" + "	public Hello hi() {\n"
-				+ "		return null;\n" + "	}\n" + "}";
-
-		Editor editor = harness.newEditor(LanguageId.JAVA, content, docUri);
-
-		editor.assertHighlights("@ConditionalOnBean", "@ConditionalOnWebApplication",
-				"@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)", "@ConditionalOnMissingClass",
-				"@ConditionalOnExpression");
-
-	}
-
-	@Test
-	public void testHighlightsTypeConditionals() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1111")
-				.processID("22022")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson("{\"negativeMatches\": {\n" + "        \"MyConditionalComponent\": {\n"
-						+ "            \"notMatched\": [\n" + "                {\n"
-						+ "                    \"condition\": \"OnClassCondition\",\n"
-						+ "                    \"message\": \"@ConditionalOnClass did not find required class 'java.lang.String2'\"\n"
-						+ "                }\n" + "            ],\n" + "            \"matched\": []\n" + "        }\n"
-						+ "}\n" + "}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		String content = "package com.example;\n" + "\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n"
-				+ "import org.springframework.stereotype.Component;\n" + "\n" + "@Component\n"
-				+ "@ConditionalOnClass(name=\"java.lang.String2\")\n" + "public class MyConditionalComponent {\n" + "}";
-
-		Editor editor = harness.newEditor(LanguageId.JAVA, content, docUri);
-
-		editor.assertHighlights("@ConditionalOnClass(name=\"java.lang.String2\")");
-
-	}
-
-	@Test
-	public void testNegativeMatches() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-				.port("1111")
-				.processID("67950")
-				.host("cfapps.io")
-				.processName("test-conditionals-live-hover")
-				.liveConditionalsJson("{\"negativeMatches\": {\n" + "        \"MyConditionalComponent\": {\n"
-						+ "            \"notMatched\": [\n" + "                {\n"
-						+ "                    \"condition\": \"OnClassCondition\",\n"
-						+ "                    \"message\": \"@ConditionalOnClass did not find required class 'java.lang.String2'\"\n"
-						+ "                }\n" + "            ],\n" + "            \"matched\": []\n" + "        }\n"
-						+ "}\n" + "}")
-				.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		String content = "package com.example;\n" + "\n"
-				+ "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n"
-				+ "import org.springframework.stereotype.Component;\n" + "\n" + "@Component\n"
-				+ "@ConditionalOnClass(name=\"java.lang.String2\")\n" + "public class MyConditionalComponent {\n" + "}";
-
-		Editor editor = harness.newEditor(LanguageId.JAVA, content, docUri);
-
-		editor.assertHoverContains("@ConditionalOnClass(name=\"java.lang.String2\")",
-				"@ConditionalOnClass did not find required class 'java.lang.String2'\n" + "\n"
-						+ "Process [PID=67950, name=`test-conditionals-live-hover`]");
-
-	}
+    @Test
+    void testNoLiveHoverNoRunningApp() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnMissingBeanConfig.java").toUri()
+                .toString();
+
+        harness.intialize(directory);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertNoHover("@ConditionalOnMissingBean");
+    }
+
+    @Test
+    void testLiveHoverConditionalOnBean() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnBeanConfig.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"ConditionalOnBeanConfig#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}]}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHoverContains("@ConditionalOnBean",
+                "@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\n" + "\n"
+                        + "Process [PID=22022, name=`test-conditionals-live-hover`]");
+    }
+
+    @Test
+    void testLiveHoverConditionalOnMissingBean() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnMissingBeanConfig.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("proesskey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHoverContains("@ConditionalOnMissingBean",
+                "@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n" + "\n"
+                        + "Process [PID=22022, name=`test-conditionals-live-hover`]");
+
+    }
+
+    @Test
+    void testMultipleLiveHoverContentRealProject() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"HelloConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}],\"HelloConfig2#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}],\"MultipleConditionals#hi\":[{\"condition\":\"OnClassCondition\",\"message\":\"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\"},{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"},{\"condition\":\"OnExpressionCondition\",\"message\":\"@ConditionalOnExpression (#{true}) resulted in true\"},{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\"}]}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("proesskey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+
+        editor.assertHoverContains("@ConditionalOnBean",
+                "@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\n" + "\n"
+                        + "Process [PID=22022, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverContains("@ConditionalOnWebApplication",
+                "@ConditionalOnWebApplication (required) found StandardServletEnvironment\n" + "\n"
+                        + "Process [PID=22022, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverContains("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)",
+                "@ConditionalOnJava (1.8 or newer) found 1.8\n" + "\n"
+                        + "Process [PID=22022, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverContains("@ConditionalOnMissingClass",
+                "@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\n"
+                        + "\n" + "Process [PID=22022, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverContains("@ConditionalOnExpression", "@ConditionalOnExpression (#{true}) resulted in true\n"
+                + "\n" + "Process [PID=22022, name=`test-conditionals-live-hover`]");
+    }
+
+    @Test
+    void testMultipleAppInstances() throws Exception {
+
+        // Test that live hover shows information for multiple app instances
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/ConditionalOnMissingBeanConfig.java").toUri()
+                .toString();
+        harness.intialize(directory);
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData1 = new SpringProcessLiveDataBuilder()
+                .port("1000")
+                .processID("70000")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
+                .build();
+        liveDataProvider.add("processkey1", liveData1);
+
+        SpringProcessLiveData liveData2 = new SpringProcessLiveDataBuilder()
+                .port("1001")
+                .processID("80000")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
+                .build();
+        liveDataProvider.add("processkey2", liveData2);
+
+        SpringProcessLiveData liveData3 = new SpringProcessLiveDataBuilder()
+                .port("1002")
+                .processID("90000")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}")
+                .build();
+        liveDataProvider.add("processkey3", liveData3);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+
+        editor.assertHoverContains("@ConditionalOnMissingBean",
+                "@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n" + "\n"
+                        + "Process [PID=70000, name=`test-conditionals-live-hover`]\n" + "\n"
+                        + "@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n"
+                        + "\n" + "Process [PID=80000, name=`test-conditionals-live-hover`]\n" + "\n"
+                        + "@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n"
+                        + "\n" + "Process [PID=90000, name=`test-conditionals-live-hover`]");
+
+    }
+
+    @Test
+    void testMultipleConditionalsSameMethod() throws Exception {
+
+        // Tests something like this:
+        // @Bean
+        // @ConditionalOnBean
+        // @ConditionalOnWebApplication
+        // @ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)
+        // @ConditionalOnMissingClass
+        // @ConditionalOnExpression
+        // public Hello hi() {
+        // return null;
+        // }
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1000")
+                .processID("70000")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"HelloConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}],\"HelloConfig2#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}],\"MultipleConditionals#hi\":[{\"condition\":\"OnClassCondition\",\"message\":\"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\"},{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"},{\"condition\":\"OnExpressionCondition\",\"message\":\"@ConditionalOnExpression (#{true}) resulted in true\"},{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\"}]}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+
+        // IMPORTANT: test EXACT text to ensure that multiple conditionals on the same
+        // method do not show
+        // up while
+        // hovering over only one of the conditional annotations
+        editor.assertHoverExactText("@ConditionalOnBean",
+                "@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\n" + "\n"
+                        + "Process [PID=70000, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverExactText("@ConditionalOnWebApplication",
+                "@ConditionalOnWebApplication (required) found StandardServletEnvironment\n" + "\n"
+                        + "Process [PID=70000, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverExactText("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)",
+                "@ConditionalOnJava (1.8 or newer) found 1.8\n" + "\n"
+                        + "Process [PID=70000, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverExactText("@ConditionalOnMissingClass",
+                "@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\n"
+                        + "\n" + "Process [PID=70000, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverExactText("@ConditionalOnExpression", "@ConditionalOnExpression (#{true}) resulted in true\n"
+                + "\n" + "Process [PID=70000, name=`test-conditionals-live-hover`]");
+    }
+
+    @Test
+    void PT152535713testMultipleLiveHoverHints() throws Exception {
+
+        // Tests fix for PT152535713. Ensure that in a method with multiple
+        // conditionals,
+        // hovering over any one conditional annotation only shows content for that
+        // conditional
+        // and not any of the other ones
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionalsPT152535713.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1000")
+                .processID("70000")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"MultipleConditionalsPT152535713#hi\":[{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"}]}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+
+        editor.assertHoverExactText("@ConditionalOnWebApplication",
+                "@ConditionalOnWebApplication (required) found StandardServletEnvironment\n" + "\n"
+                        + "Process [PID=70000, name=`test-conditionals-live-hover`]");
+
+        editor.assertHoverExactText("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)",
+                "@ConditionalOnJava (1.8 or newer) found 1.8\n" + "\n"
+                        + "Process [PID=70000, name=`test-conditionals-live-hover`]");
+
+        // Test that the hovers dont have extra information of the other conditionals:
+        Hover hover = editor.getHover("@ConditionalOnWebApplication");
+        String hoverContent = editor.hoverString(hover);
+        assertFalse(hoverContent.contains("@ConditionalOnJava"));
+
+        hover = editor.getHover("@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)");
+        hoverContent = editor.hoverString(hover);
+        assertFalse(hoverContent.contains("@ConditionalOnWebApplication"));
+    }
+
+    @Test
+    void testHighlightsMethodConditionals() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson(
+                        "{\"positiveMatches\":{\"HelloConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}],\"HelloConfig2#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}],\"MultipleConditionals#hi\":[{\"condition\":\"OnClassCondition\",\"message\":\"@ConditionalOnClass found required class; @ConditionalOnMissingClass did not find unwanted class\"},{\"condition\":\"OnWebApplicationCondition\",\"message\":\"@ConditionalOnWebApplication (required) found StandardServletEnvironment\"},{\"condition\":\"OnJavaCondition\",\"message\":\"@ConditionalOnJava (1.8 or newer) found 1.8\"},{\"condition\":\"OnExpressionCondition\",\"message\":\"@ConditionalOnExpression (#{true}) resulted in true\"},{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found beans 'hi', 'missing'\"}]}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        String content = "package example;\n" + "\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnJava;\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;\n"
+                + "import org.springframework.context.annotation.Bean;\n"
+                + "import org.springframework.context.annotation.Configuration;\n" + "\n" + "@Configuration\n"
+                + "public class MultipleConditionals {\n" + "\n" + "	@Bean\n" + "	@ConditionalOnBean\n"
+                + "	@ConditionalOnWebApplication\n" + "	@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)\n"
+                + "	@ConditionalOnMissingClass\n" + "	@ConditionalOnExpression\n" + "	public Hello hi() {\n"
+                + "		return null;\n" + "	}\n" + "}";
+
+        Editor editor = harness.newEditor(LanguageId.JAVA, content, docUri);
+
+        editor.assertHighlights("@ConditionalOnBean", "@ConditionalOnWebApplication",
+                "@ConditionalOnJava(value=ConditionalOnJava.JavaVersion.EIGHT)", "@ConditionalOnMissingClass",
+                "@ConditionalOnExpression");
+
+    }
+
+    @Test
+    void testHighlightsTypeConditionals() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson("{\"negativeMatches\": {\n" + "        \"MyConditionalComponent\": {\n"
+                        + "            \"notMatched\": [\n" + "                {\n"
+                        + "                    \"condition\": \"OnClassCondition\",\n"
+                        + "                    \"message\": \"@ConditionalOnClass did not find required class 'java.lang.String2'\"\n"
+                        + "                }\n" + "            ],\n" + "            \"matched\": []\n" + "        }\n"
+                        + "}\n" + "}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        String content = "package com.example;\n" + "\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n"
+                + "import org.springframework.stereotype.Component;\n" + "\n" + "@Component\n"
+                + "@ConditionalOnClass(name=\"java.lang.String2\")\n" + "public class MyConditionalComponent {\n" + "}";
+
+        Editor editor = harness.newEditor(LanguageId.JAVA, content, docUri);
+
+        editor.assertHighlights("@ConditionalOnClass(name=\"java.lang.String2\")");
+
+    }
+
+    @Test
+    void testNegativeMatches() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/MultipleConditionals.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("67950")
+                .host("cfapps.io")
+                .processName("test-conditionals-live-hover")
+                .liveConditionalsJson("{\"negativeMatches\": {\n" + "        \"MyConditionalComponent\": {\n"
+                        + "            \"notMatched\": [\n" + "                {\n"
+                        + "                    \"condition\": \"OnClassCondition\",\n"
+                        + "                    \"message\": \"@ConditionalOnClass did not find required class 'java.lang.String2'\"\n"
+                        + "                }\n" + "            ],\n" + "            \"matched\": []\n" + "        }\n"
+                        + "}\n" + "}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        String content = "package com.example;\n" + "\n"
+                + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n"
+                + "import org.springframework.stereotype.Component;\n" + "\n" + "@Component\n"
+                + "@ConditionalOnClass(name=\"java.lang.String2\")\n" + "public class MyConditionalComponent {\n" + "}";
+
+        Editor editor = harness.newEditor(LanguageId.JAVA, content, docUri);
+
+        editor.assertHoverContains("@ConditionalOnClass(name=\"java.lang.String2\")",
+                "@ConditionalOnClass did not find required class 'java.lang.String2'\n" + "\n"
+                        + "Process [PID=67950, name=`test-conditionals-live-hover`]");
+
+    }
 }

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

@@ -10,16 +10,16 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.data.test;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.InputStream;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.eclipse.lsp4j.CompletionItem;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.bootiful.BootLanguageServerTest;
@@ -30,12 +30,12 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.languageserver.testharness.TestAsserts;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class DataRepositoryCompletionProcessorTest {
@@ -43,20 +43,20 @@ public class DataRepositoryCompletionProcessorTest {
 	@Autowired private BootLanguageServerHarness harness;
 	private Editor editor;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		IJavaProject testProject = ProjectsHarness.INSTANCE.mavenProject("test-spring-data-symbols");
 		harness.useProject(testProject);
 		harness.intialize(null);
 	}
 
-	@Test
-	public void testStandardFindByCompletions() throws Exception {
-		prepareCase("{", "{<*>");
-		assertContainsAnnotationCompletions(
-				"List<Customer> findByFirstName(String firstName);",
-				"List<Customer> findByLastName(String lastName);");
-	}
+    @Test
+    void testStandardFindByCompletions() throws Exception {
+        prepareCase("{", "{<*>");
+        assertContainsAnnotationCompletions(
+                "List<Customer> findByFirstName(String firstName);",
+                "List<Customer> findByLastName(String lastName);");
+    }
 
 	private void prepareCase(String selectedAnnotation, String annotationStatementBeforeTest) throws Exception {
 		InputStream resource = this.getClass().getResourceAsStream("/test-projects/test-spring-data-symbols/src/main/java/org/test/TestCustomerRepositoryForCompletions.java");

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.data.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.Iterator;
@@ -21,9 +21,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -34,12 +34,12 @@ import org.springframework.ide.vscode.boot.java.handlers.SymbolAddOnInformation;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class DataRepositorySymbolProviderTest {
@@ -50,7 +50,7 @@ public class DataRepositorySymbolProviderTest {
 
 	private File directory;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 
@@ -64,18 +64,18 @@ public class DataRepositorySymbolProviderTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testSimpleRepositorySymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepository.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@+ 'customerRepository' (Customer) Repository<Customer,Long>", docUri, 6, 17, 6, 35));
+    @Test
+    void testSimpleRepositorySymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepository.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@+ 'customerRepository' (Customer) Repository<Customer,Long>", docUri, 6, 17, 6, 35));
 
-		List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
-		assertEquals(1, addon.size());
+        List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
+        assertEquals(1, addon.size());
 
-		assertEquals("customerRepository", ((BeansSymbolAddOnInformation)addon.get(0)).getBeanID());
-	}
+        assertEquals("customerRepository", ((BeansSymbolAddOnInformation) addon.get(0)).getBeanID());
+    }
 
 	private boolean containsSymbol(List<? extends WorkspaceSymbol> symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {
 		for (Iterator<? extends WorkspaceSymbol> iterator = symbols.iterator(); iterator.hasNext();) {

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

@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.livehover.test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+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.bootiful.BootLanguageServerTest;
@@ -25,9 +25,9 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.ide.vscode.project.harness.SpringProcessLiveDataBuilder;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class ActiveProfilesHoverTest {
@@ -37,132 +37,132 @@ public class ActiveProfilesHoverTest {
 	@Autowired private BootLanguageServerHarness harness;
 	@Autowired private SpringProcessLiveDataProvider liveDataProvider;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.useProject(projects.mavenProject("empty-boot-15-web-app"));
 		harness.intialize(null);
 	}
 	
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		liveDataProvider.remove("processkey");
 		liveDataProvider.remove("processkey1");
 		liveDataProvider.remove("processkey2");
 	}
 
-	@Test
-	public void testActiveProfileHover() throws Exception {
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("22022")
-			.processName("foo.bar.RunningApp")
-			.activeProfiles("testing-profile", "local-profile")
-			.build();
-		liveDataProvider.add("processkey", liveData);
+    @Test
+    void testActiveProfileHover() throws Exception {
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("22022")
+                .processName("foo.bar.RunningApp")
+                .activeProfiles("testing-profile", "local-profile")
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"@Profile({\"local-profile\", \"inactive\", \"testing-profile\"})\n" +
-				"public class LocalConfig {\n" +
-				"}"
-		);
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "@Profile({\"local-profile\", \"inactive\", \"testing-profile\"})\n" +
+                        "public class LocalConfig {\n" +
+                        "}"
+        );
 
-		String[] hoverSites = {
-				"@Profile", "local-profile", "testing-profile"
-		};
-		editor.assertHighlights(
-				hoverSites
-		);
-		for (String hoverOver : hoverSites) {
-			editor.assertHoverContains(hoverOver, "testing-profile");
-			editor.assertHoverContains(hoverOver, "local-profile");
-			editor.assertHoverContains(hoverOver, "foo.bar.RunningApp");
-			editor.assertHoverContains(hoverOver, "22022");
-		}
-	}
+        String[] hoverSites = {
+                "@Profile", "local-profile", "testing-profile"
+        };
+        editor.assertHighlights(
+                hoverSites
+        );
+        for (String hoverOver : hoverSites) {
+            editor.assertHoverContains(hoverOver, "testing-profile");
+            editor.assertHoverContains(hoverOver, "local-profile");
+            editor.assertHoverContains(hoverOver, "foo.bar.RunningApp");
+            editor.assertHoverContains(hoverOver, "22022");
+        }
+    }
 
-	@Test
-	public void testActiveProfileHover_Unknown() throws Exception {
-		//Sometimes its not possible to determine active profiles for an app (e.g. no actuator dependency).
-		//Make sure we show something sensible
-		harness.useProject(projects.mavenProject("no-actuator-boot-15-web-app"));
+    @Test
+    void testActiveProfileHover_Unknown() throws Exception {
+        //Sometimes its not possible to determine active profiles for an app (e.g. no actuator dependency).
+        //Make sure we show something sensible
+        harness.useProject(projects.mavenProject("no-actuator-boot-15-web-app"));
 
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("22022")
-			.processName("foo.bar.RunningApp")
-			.activeProfiles((String[]) null)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("22022")
+                .processName("foo.bar.RunningApp")
+                .activeProfiles((String[]) null)
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"@Profile(\"local\")\n" +
-				"public class LocalConfig {\n" +
-				"\n" +
-				"}"
-		);
-		editor.assertHighlights(/*NONE*/);
-		editor.assertHoverContains("@Profile", "Consider adding `spring-boot-actuator` as a dependency");
-	}
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "@Profile(\"local\")\n" +
+                        "public class LocalConfig {\n" +
+                        "\n" +
+                        "}"
+        );
+        editor.assertHighlights(/*NONE*/);
+        editor.assertHoverContains("@Profile", "Consider adding `spring-boot-actuator` as a dependency");
+    }
 
-	@Test
-	public void testActiveProfileHoverMixedKnownAndUnknown() throws Exception {
-		SpringProcessLiveData liveData1 = new SpringProcessLiveDataBuilder()
-			.processID("22022")
-			.processName("foo.bar.NoActuatorApp")
-			.activeProfiles((String[]) null)
-			.build();
-		liveDataProvider.add("processkey1", liveData1);
+    @Test
+    void testActiveProfileHoverMixedKnownAndUnknown() throws Exception {
+        SpringProcessLiveData liveData1 = new SpringProcessLiveDataBuilder()
+                .processID("22022")
+                .processName("foo.bar.NoActuatorApp")
+                .activeProfiles((String[]) null)
+                .build();
+        liveDataProvider.add("processkey1", liveData1);
 
-		SpringProcessLiveData liveData2 = new SpringProcessLiveDataBuilder()
-			.processID("3456")
-			.processName("foo.bar.NormalApp")
-			.activeProfiles("fancy")
-			.build();
-		liveDataProvider.add("processkey2", liveData2);
+        SpringProcessLiveData liveData2 = new SpringProcessLiveDataBuilder()
+                .processID("3456")
+                .processName("foo.bar.NormalApp")
+                .activeProfiles("fancy")
+                .build();
+        liveDataProvider.add("processkey2", liveData2);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"@Profile({\"unknown\", \"inactive\", \"fancy\"})\n" +
-				"public class LocalConfig {\n" +
-				"\n" +
-				"}"
-		);
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "@Profile({\"unknown\", \"inactive\", \"fancy\"})\n" +
+                        "public class LocalConfig {\n" +
+                        "\n" +
+                        "}"
+        );
 
-		editor.assertHighlights("@Profile", "fancy");
-		editor.assertHoverContains("@Profile", "Unknown");
-		editor.assertHoverContains("@Profile", "fancy");
-	}
+        editor.assertHighlights("@Profile", "fancy");
+        editor.assertHoverContains("@Profile", "Unknown");
+        editor.assertHoverContains("@Profile", "fancy");
+    }
 
-	@Test
-	public void testNoRunningApps() throws Exception {
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"@Profile(\"local\")\n" +
-				"public class LocalConfig {\n" +
-				"\n" +
-				"}"
-		);
-		editor.assertHighlights(/*NONE*/);
-		editor.assertNoHover("@Profile");
-	}
+    @Test
+    void testNoRunningApps() throws Exception {
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "@Profile(\"local\")\n" +
+                        "public class LocalConfig {\n" +
+                        "\n" +
+                        "}"
+        );
+        editor.assertHighlights(/*NONE*/);
+        editor.assertNoHover("@Profile");
+    }
 }

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

@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.livehover.test;
 
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+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.bootiful.BootLanguageServerTest;
@@ -25,9 +25,9 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.ide.vscode.project.harness.SpringProcessLiveDataBuilder;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class ActuatorWarningHoverTest {
@@ -39,141 +39,145 @@ public class ActuatorWarningHoverTest {
 	@Autowired private BootLanguageServerHarness harness;
 	@Autowired private SpringProcessLiveDataProvider liveDataProvider;
 	
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		liveDataProvider.remove("processkey");
 	}
 
-	@Test public void showWarningIf_NoActuator_and_RunningApp() throws Exception {
-		//No actuator on classpath:
-		String projectName = NO_ACTUATOR_PROJECT;
-		IJavaProject project = projects.mavenProject(projectName);
-		harness.useProject(project);
-		harness.intialize(null);
-		
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("22022")
-			.processName("foo.bar.RunningApp")
-			.activeProfiles((String[]) null)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+    @Test
+    void showWarningIf_NoActuator_and_RunningApp() throws Exception {
+        //No actuator on classpath:
+        String projectName = NO_ACTUATOR_PROJECT;
+        IJavaProject project = projects.mavenProject(projectName);
+        harness.useProject(project);
+        harness.intialize(null);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"@Profile({\"local-profile\", \"inactive\", \"testing-profile\"})\n" +
-				"public class LocalConfig {\n" +
-				"}"
-		);
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("22022")
+                .processName("foo.bar.RunningApp")
+                .activeProfiles((String[]) null)
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-		editor.assertHighlights(/*NONE*/);
-		editor.assertHoverContains("@Profile", "No live hover information");
-		editor.assertHoverContains("@Profile", "Consider adding `spring-boot-actuator` as a dependency to your project `"+projectName+"`");
-	}
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "@Profile({\"local-profile\", \"inactive\", \"testing-profile\"})\n" +
+                        "public class LocalConfig {\n" +
+                        "}"
+        );
 
-	@Test public void noWarningIf_NoRunningApps() throws Exception {
+        editor.assertHighlights(/*NONE*/);
+        editor.assertHoverContains("@Profile", "No live hover information");
+        editor.assertHoverContains("@Profile", "Consider adding `spring-boot-actuator` as a dependency to your project `" + projectName + "`");
+    }
 
-		//No running app:
-		// actaully... no code needed to set that up. mockAppBuilder is 'empty' by default.
+    @Test
+    void noWarningIf_NoRunningApps() throws Exception {
 
-		//No actuator on classpath:
-		String projectName = NO_ACTUATOR_PROJECT;
-		IJavaProject project = projects.mavenProject(projectName);
-		harness.useProject(project);
-		harness.intialize(null);
+        //No running app:
+        // actaully... no code needed to set that up. mockAppBuilder is 'empty' by default.
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"@Profile({\"local-profile\", \"inactive\", \"testing-profile\"})\n" +
-				"public class LocalConfig {\n" +
-				"}"
-		);
+        //No actuator on classpath:
+        String projectName = NO_ACTUATOR_PROJECT;
+        IJavaProject project = projects.mavenProject(projectName);
+        harness.useProject(project);
+        harness.intialize(null);
 
-		editor.assertHighlights(/*NONE*/);
-		editor.assertNoHover("@Profile");
-	}
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "@Profile({\"local-profile\", \"inactive\", \"testing-profile\"})\n" +
+                        "public class LocalConfig {\n" +
+                        "}"
+        );
 
-	@Test public void noWarningIf_ActuatorOnClasspath() throws Exception {
-		//Actuator on classpath:
-		String projectName = ACTUATOR_PROJECT;
-		IJavaProject project = projects.mavenProject(projectName);
-		harness.useProject(project);
-		harness.intialize(null);
+        editor.assertHighlights(/*NONE*/);
+        editor.assertNoHover("@Profile");
+    }
 
-		//Has running app:
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("22022")
-			.processName("foo.bar.RunningApp")
-			.activeProfiles((String[]) null)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+    @Test
+    void noWarningIf_ActuatorOnClasspath() throws Exception {
+        //Actuator on classpath:
+        String projectName = ACTUATOR_PROJECT;
+        IJavaProject project = projects.mavenProject(projectName);
+        harness.useProject(project);
+        harness.intialize(null);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Bean;\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"public class LocalConfig {\n" +
-				"	\n" +
-				"	@Bean\n" +
-				"	Foo myFoo() {\n" +
-				"		return new FooImplementation();\n" +
-				"	}\n" +
-				"}"
-		);
-		editor.assertHighlights(/*NONE*/);
-		editor.assertNoHover("@Bean");
-	}
+        //Has running app:
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("22022")
+                .processName("foo.bar.RunningApp")
+                .activeProfiles((String[]) null)
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-	@Test public void warningHoverHasPreciseLocation() throws Exception {
-		// It will be less annoying if limit the area the hover responds to, to just inside the
-		// annotation name rather than the whole range of the ast node.
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Bean;\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "public class LocalConfig {\n" +
+                        "	\n" +
+                        "	@Bean\n" +
+                        "	Foo myFoo() {\n" +
+                        "		return new FooImplementation();\n" +
+                        "	}\n" +
+                        "}"
+        );
+        editor.assertHighlights(/*NONE*/);
+        editor.assertNoHover("@Bean");
+    }
 
-		//No actuator on classpath:
-		String projectName = NO_ACTUATOR_PROJECT;
-		IJavaProject project = projects.mavenProject(projectName);
-		harness.useProject(project);
-		harness.intialize(null);
+    @Test
+    void warningHoverHasPreciseLocation() throws Exception {
+        // It will be less annoying if limit the area the hover responds to, to just inside the
+        // annotation name rather than the whole range of the ast node.
 
-		//Has running app:
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("22022")
-			.processName("foo.bar.RunningApp")
-			.activeProfiles((String[]) null)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+        //No actuator on classpath:
+        String projectName = NO_ACTUATOR_PROJECT;
+        IJavaProject project = projects.mavenProject(projectName);
+        harness.useProject(project);
+        harness.intialize(null);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package hello;\n" +
-				"\n" +
-				"import org.springframework.context.annotation.Bean;\n" +
-				"import org.springframework.context.annotation.Configuration;\n" +
-				"import org.springframework.context.annotation.Profile;\n" +
-				"\n" +
-				"@Configuration\n" +
-				"public class LocalConfig {\n" +
-				"	\n" +
-				"	@Bean(\"the-bean-name\")\n" +
-				"	Foo myFoo() {\n" +
-				"		return new FooImplementation();\n" +
-				"	}\n" +
-				"}"
-		);
-		editor.assertHighlights(/*NONE*/);
-		editor.assertHoverContains("@Bean", "No live hover information");
-		editor.assertNoHover("the-bean-name");
-	}
+        //Has running app:
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("22022")
+                .processName("foo.bar.RunningApp")
+                .activeProfiles((String[]) null)
+                .build();
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package hello;\n" +
+                        "\n" +
+                        "import org.springframework.context.annotation.Bean;\n" +
+                        "import org.springframework.context.annotation.Configuration;\n" +
+                        "import org.springframework.context.annotation.Profile;\n" +
+                        "\n" +
+                        "@Configuration\n" +
+                        "public class LocalConfig {\n" +
+                        "	\n" +
+                        "	@Bean(\"the-bean-name\")\n" +
+                        "	Foo myFoo() {\n" +
+                        "		return new FooImplementation();\n" +
+                        "	}\n" +
+                        "}"
+        );
+        editor.assertHighlights(/*NONE*/);
+        editor.assertHoverContains("@Bean", "No live hover information");
+        editor.assertNoHover("the-bean-name");
+    }
 
 }

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

@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.livehover.test;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+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.bootiful.BootLanguageServerTest;
@@ -28,9 +28,9 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.ide.vscode.project.harness.SpringProcessLiveDataBuilder;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class BeansByTypeHoverProviderTest {
@@ -39,318 +39,318 @@ public class BeansByTypeHoverProviderTest {
 	@Autowired private BootLanguageServerHarness harness;
 	@Autowired private SpringProcessLiveDataProvider liveDataProvider;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		MavenJavaProject jp =  projects.mavenProject("empty-boot-15-web-app");
 		harness.useProject(jp);
 		harness.intialize(null);
 	}
 	
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		liveDataProvider.remove("processkey");
 	}
 
-	@Test
-	public void typeButNotABean() throws Exception {
-		LiveBeansModel beans = LiveBeansModel.builder()
-				.add(LiveBean.builder()
-						.id("scannedRandomClass")
-						.type("com.example.ScannedRandomClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("randomOtherBean")
-						.type("randomOtherBeanType")
-						.dependencies("scannedRandomClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("irrelevantBean")
-						.type("com.example.IrrelevantBean")
-						.dependencies("myController")
-						.build()
-				)
-				.build();
+    @Test
+    void typeButNotABean() throws Exception {
+        LiveBeansModel beans = LiveBeansModel.builder()
+                .add(LiveBean.builder()
+                        .id("scannedRandomClass")
+                        .type("com.example.ScannedRandomClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("randomOtherBean")
+                        .type("randomOtherBeanType")
+                        .dependencies("scannedRandomClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("irrelevantBean")
+                        .type("com.example.IrrelevantBean")
+                        .dependencies("myController")
+                        .build()
+                )
+                .build();
 
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("111")
-			.processName("the-app")
-			.beans(beans)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("111")
+                .processName("the-app")
+                .beans(beans)
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package com.example;\n" +
-				"\n" +
-				"import java.io.Serializable;\n" +
-				"\n" +
-				"public class ClassNoBean implements Serializable {\n" +
-				"\n" +
-				"	public String apply(String t) {\n" +
-				"		return t.toUpperCase();\n" +
-				"	}\n" +
-				"\n" +
-				"}\n" +
-				""
-		);
-		editor.assertHighlights();
-		editor.assertNoHover("ClassNoBean");
-	}
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package com.example;\n" +
+                        "\n" +
+                        "import java.io.Serializable;\n" +
+                        "\n" +
+                        "public class ClassNoBean implements Serializable {\n" +
+                        "\n" +
+                        "	public String apply(String t) {\n" +
+                        "		return t.toUpperCase();\n" +
+                        "	}\n" +
+                        "\n" +
+                        "}\n" +
+                        ""
+        );
+        editor.assertHighlights();
+        editor.assertNoHover("ClassNoBean");
+    }
 
-	@Test
-	public void typeWithGeneralBean() throws Exception {
-		LiveBeansModel beans = LiveBeansModel.builder()
-				.add(LiveBean.builder()
-						.id("scannedRandomClass")
-						.type("com.example.ScannedRandomClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("randomOtherBean")
-						.type("randomOtherBeanType")
-						.dependencies("scannedRandomClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("irrelevantBean")
-						.type("com.example.IrrelevantBean")
-						.dependencies("myController")
-						.build()
-				)
-				.build();
-		
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("111")
-			.processName("the-app")
-			.beans(beans)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+    @Test
+    void typeWithGeneralBean() throws Exception {
+        LiveBeansModel beans = LiveBeansModel.builder()
+                .add(LiveBean.builder()
+                        .id("scannedRandomClass")
+                        .type("com.example.ScannedRandomClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("randomOtherBean")
+                        .type("randomOtherBeanType")
+                        .dependencies("scannedRandomClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("irrelevantBean")
+                        .type("com.example.IrrelevantBean")
+                        .dependencies("myController")
+                        .build()
+                )
+                .build();
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package com.example;\n" +
-				"\n" +
-				"import java.io.Serializable;\n" +
-				"\n" +
-				"public class ScannedRandomClass implements Serializable {\n" +
-				"\n" +
-				"	public String apply(String t) {\n" +
-				"		return t.toUpperCase();\n" +
-				"	}\n" +
-				"\n" +
-				"}\n" +
-				""
-		);
-		editor.assertHighlights("ScannedRandomClass");
-		editor.assertTrimmedHover("ScannedRandomClass",
-				"**→ `randomOtherBeanType`**\n" +
-				"- Bean: `randomOtherBean`  \n" +
-				"  Type: `randomOtherBeanType`\n" +
-				"  \n" +
-				"Bean id: `scannedRandomClass`  \n" +
-				"Process [PID=111, name=`the-app`]"
-		);
-	}
-	
-	@Test
-	public void beanWithNonStandardId() throws Exception {
-		LiveBeansModel beans = LiveBeansModel.builder()
-				.add(LiveBean.builder()
-						.id("random")
-						.type("com.example.ScannedRandomClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("randomOtherBean")
-						.type("randomOtherBeanType")
-						.dependencies("random")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("irrelevantBean")
-						.type("com.example.IrrelevantBean")
-						.dependencies("myController")
-						.build()
-				)
-				.build();
-		
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("111")
-			.processName("the-app")
-			.beans(beans)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("111")
+                .processName("the-app")
+                .beans(beans)
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package com.example;\n" +
-				"\n" +
-				"import java.io.Serializable;\n" +
-				"\n" +
-				"public class ScannedRandomClass implements Serializable {\n" +
-				"\n" +
-				"	public String apply(String t) {\n" +
-				"		return t.toUpperCase();\n" +
-				"	}\n" +
-				"\n" +
-				"}\n" +
-				""
-		);
-		editor.assertHighlights("ScannedRandomClass");
-		editor.assertTrimmedHover("ScannedRandomClass",
-				"**→ `randomOtherBeanType`**\n" +
-				"- Bean: `randomOtherBean`  \n" +
-				"  Type: `randomOtherBeanType`\n" +
-				"  \n" +
-				"Bean id: `random`  \n" +
-				"Process [PID=111, name=`the-app`]"
-		);
-	}
-	
-	@Test
-	public void beansWithNonStandardIdMoreThanOneOfSameType() throws Exception {
-		LiveBeansModel beans = LiveBeansModel.builder()
-				.add(LiveBean.builder()
-						.id("random")
-						.type("com.example.ScannedRandomClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("anotherRandom")
-						.type("com.example.ScannedRandomClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("randomOtherBean")
-						.type("randomOtherBeanType")
-						.dependencies("random")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("irrelevantBean")
-						.type("com.example.IrrelevantBean")
-						.dependencies("anotherRandom")
-						.build()
-				)
-				.build();
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package com.example;\n" +
+                        "\n" +
+                        "import java.io.Serializable;\n" +
+                        "\n" +
+                        "public class ScannedRandomClass implements Serializable {\n" +
+                        "\n" +
+                        "	public String apply(String t) {\n" +
+                        "		return t.toUpperCase();\n" +
+                        "	}\n" +
+                        "\n" +
+                        "}\n" +
+                        ""
+        );
+        editor.assertHighlights("ScannedRandomClass");
+        editor.assertTrimmedHover("ScannedRandomClass",
+                "**→ `randomOtherBeanType`**\n" +
+                        "- Bean: `randomOtherBean`  \n" +
+                        "  Type: `randomOtherBeanType`\n" +
+                        "  \n" +
+                        "Bean id: `scannedRandomClass`  \n" +
+                        "Process [PID=111, name=`the-app`]"
+        );
+    }
 
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("111")
-			.processName("the-app")
-			.beans(beans)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+    @Test
+    void beanWithNonStandardId() throws Exception {
+        LiveBeansModel beans = LiveBeansModel.builder()
+                .add(LiveBean.builder()
+                        .id("random")
+                        .type("com.example.ScannedRandomClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("randomOtherBean")
+                        .type("randomOtherBeanType")
+                        .dependencies("random")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("irrelevantBean")
+                        .type("com.example.IrrelevantBean")
+                        .dependencies("myController")
+                        .build()
+                )
+                .build();
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package com.example;\n" +
-				"\n" +
-				"import java.io.Serializable;\n" +
-				"\n" +
-				"public class ScannedRandomClass implements Serializable {\n" +
-				"\n" +
-				"	public String apply(String t) {\n" +
-				"		return t.toUpperCase();\n" +
-				"	}\n" +
-				"\n" +
-				"}\n" +
-				""
-		);
-		editor.assertHighlights();
-		editor.assertNoHover("ScannedRandomClass");
-	}
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("111")
+                .processName("the-app")
+                .beans(beans)
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-	@Test
-	public void scannedAndInjectedFunction() throws Exception {
-		LiveBeansModel beans = LiveBeansModel.builder()
-				.add(LiveBean.builder()
-						.id("scannedFunctionClass")
-						.type("com.example.ScannedFunctionClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration")
-						.type("org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration")
-						.dependencies("scannedFunctionClass")
-						.build()
-				)
-				.add(LiveBean.builder()
-						.id("irrelevantBean")
-						.type("com.example.IrrelevantBean")
-						.dependencies("myController")
-						.build()
-				)
-				.build();
-		
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("111")
-			.processName("the-app")
-			.beans(beans)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package com.example;\n" +
+                        "\n" +
+                        "import java.io.Serializable;\n" +
+                        "\n" +
+                        "public class ScannedRandomClass implements Serializable {\n" +
+                        "\n" +
+                        "	public String apply(String t) {\n" +
+                        "		return t.toUpperCase();\n" +
+                        "	}\n" +
+                        "\n" +
+                        "}\n" +
+                        ""
+        );
+        editor.assertHighlights("ScannedRandomClass");
+        editor.assertTrimmedHover("ScannedRandomClass",
+                "**→ `randomOtherBeanType`**\n" +
+                        "- Bean: `randomOtherBean`  \n" +
+                        "  Type: `randomOtherBeanType`\n" +
+                        "  \n" +
+                        "Bean id: `random`  \n" +
+                        "Process [PID=111, name=`the-app`]"
+        );
+    }
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package com.example;\n" +
-				"\n" +
-				"import java.util.function.Function;\n" +
-				"\n" +
-				"public class ScannedFunctionClass implements Function<String, String> {\n" +
-				"\n" +
-				"	@Override\n" +
-				"	public String apply(String t) {\n" +
-				"		return t.toUpperCase();\n" +
-				"	}\n" +
-				"\n" +
-				"}\n" +
-				""
-		);
-		editor.assertHighlights("ScannedFunctionClass");
-		editor.assertTrimmedHover("ScannedFunctionClass",
-				"**&#8594; 1 bean**\n" +
-				"- Bean: `org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration`  \n" +
-				"  Type: `org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration`\n" +
-				"  \n" +
-				"Bean id: `scannedFunctionClass`  \n" +
-				"Process [PID=111, name=`the-app`]"
+    @Test
+    void beansWithNonStandardIdMoreThanOneOfSameType() throws Exception {
+        LiveBeansModel beans = LiveBeansModel.builder()
+                .add(LiveBean.builder()
+                        .id("random")
+                        .type("com.example.ScannedRandomClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("anotherRandom")
+                        .type("com.example.ScannedRandomClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("randomOtherBean")
+                        .type("randomOtherBeanType")
+                        .dependencies("random")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("irrelevantBean")
+                        .type("com.example.IrrelevantBean")
+                        .dependencies("anotherRandom")
+                        .build()
+                )
+                .build();
 
-		);
-	}
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("111")
+                .processName("the-app")
+                .beans(beans)
+                .build();
+        liveDataProvider.add("processkey", liveData);
 
-	@Test
-	public void generalBeanLiveHoverAvoidOverlapWithAnnotation() throws Exception {
-		LiveBeansModel beans = LiveBeansModel.builder()
-				.add(LiveBean.builder()
-						.id("fooImplementation")
-						.type("com.example.FooImplementation")
-						.build()
-				)
-				.build();
-		
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.processID("111")
-			.processName("the-app")
-			.beans(beans)
-			.build();
-		liveDataProvider.add("processkey", liveData);
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package com.example;\n" +
+                        "\n" +
+                        "import java.io.Serializable;\n" +
+                        "\n" +
+                        "public class ScannedRandomClass implements Serializable {\n" +
+                        "\n" +
+                        "	public String apply(String t) {\n" +
+                        "		return t.toUpperCase();\n" +
+                        "	}\n" +
+                        "\n" +
+                        "}\n" +
+                        ""
+        );
+        editor.assertHighlights();
+        editor.assertNoHover("ScannedRandomClass");
+    }
 
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package com.example;\n" +
-				"\n" +
-				"import org.springframework.stereotype.Component;\n" +
-				"\n" +
-				"@Component\n" +
-				"public class FooImplementation implements Foo {\n" +
-				"\n" +
-				"	@Override\n" +
-				"	public void doSomeFoo() {\n" +
-				"		System.out.println(\"Foo do do do!\");\n" +
-				"	}\n" +
-				"}\n"
-		);
-		editor.assertHighlights("@Component");
-		editor.assertTrimmedHover("@Component",
-				"Bean id: `fooImplementation`  \n" +
-				"Process [PID=111, name=`the-app`]"
-		);
-	}
+    @Test
+    void scannedAndInjectedFunction() throws Exception {
+        LiveBeansModel beans = LiveBeansModel.builder()
+                .add(LiveBean.builder()
+                        .id("scannedFunctionClass")
+                        .type("com.example.ScannedFunctionClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration")
+                        .type("org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration")
+                        .dependencies("scannedFunctionClass")
+                        .build()
+                )
+                .add(LiveBean.builder()
+                        .id("irrelevantBean")
+                        .type("com.example.IrrelevantBean")
+                        .dependencies("myController")
+                        .build()
+                )
+                .build();
+
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("111")
+                .processName("the-app")
+                .beans(beans)
+                .build();
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package com.example;\n" +
+                        "\n" +
+                        "import java.util.function.Function;\n" +
+                        "\n" +
+                        "public class ScannedFunctionClass implements Function<String, String> {\n" +
+                        "\n" +
+                        "	@Override\n" +
+                        "	public String apply(String t) {\n" +
+                        "		return t.toUpperCase();\n" +
+                        "	}\n" +
+                        "\n" +
+                        "}\n" +
+                        ""
+        );
+        editor.assertHighlights("ScannedFunctionClass");
+        editor.assertTrimmedHover("ScannedFunctionClass",
+                "**&#8594; 1 bean**\n" +
+                        "- Bean: `org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration`  \n" +
+                        "  Type: `org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration`\n" +
+                        "  \n" +
+                        "Bean id: `scannedFunctionClass`  \n" +
+                        "Process [PID=111, name=`the-app`]"
+
+        );
+    }
+
+    @Test
+    void generalBeanLiveHoverAvoidOverlapWithAnnotation() throws Exception {
+        LiveBeansModel beans = LiveBeansModel.builder()
+                .add(LiveBean.builder()
+                        .id("fooImplementation")
+                        .type("com.example.FooImplementation")
+                        .build()
+                )
+                .build();
+
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .processID("111")
+                .processName("the-app")
+                .beans(beans)
+                .build();
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package com.example;\n" +
+                        "\n" +
+                        "import org.springframework.stereotype.Component;\n" +
+                        "\n" +
+                        "@Component\n" +
+                        "public class FooImplementation implements Foo {\n" +
+                        "\n" +
+                        "	@Override\n" +
+                        "	public void doSomeFoo() {\n" +
+                        "		System.out.println(\"Foo do do do!\");\n" +
+                        "	}\n" +
+                        "}\n"
+        );
+        editor.assertHighlights("@Component");
+        editor.assertTrimmedHover("@Component",
+                "Bean id: `fooImplementation`  \n" +
+                        "Process [PID=111, name=`the-app`]"
+        );
+    }
 
 
 }

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

@@ -10,15 +10,15 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.livehover.test;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory;
 import org.springframework.ide.vscode.boot.java.links.SourceLinks;
 import org.springframework.ide.vscode.boot.java.utils.SpringResource;
 import org.springframework.ide.vscode.boot.java.value.test.MockProjects;
 import org.springframework.ide.vscode.boot.java.value.test.MockProjects.MockProject;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class SpringResourceTest {
 
 	private MockProjects projects = new MockProjects();
@@ -26,12 +26,13 @@ public class SpringResourceTest {
 
 	private SourceLinks sourceLinks = SourceLinkFactory.NO_SOURCE_LINKS;
 
-	@Test public void vcapResourceToMarkdown() throws Exception {
-		assertEquals(
-				"`com/github/kdvolder/helloworldservice/Greeter.class`",
-				toMarkdown("file [/home/vcap/app/com/github/kdvolder/helloworldservice/Greeter.class]")
-		);
-	}
+    @Test
+    void vcapResourceToMarkdown() throws Exception {
+        assertEquals(
+                "`com/github/kdvolder/helloworldservice/Greeter.class`",
+                toMarkdown("file [/home/vcap/app/com/github/kdvolder/helloworldservice/Greeter.class]")
+        );
+    }
 
 	private String toMarkdown(String beanResourceString) {
 		return new SpringResource(sourceLinks, beanResourceString, project).toMarkdown();

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

@@ -14,18 +14,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.livehover.v2.RequestMappingMetrics;
 
 public class RequestMappingMetricsTest {
-	
-	@Test
-	public void testParser1() throws Exception {
-		RequestMappingMetrics mappingMetrics = RequestMappingMetrics.parse("{\"name\":\"http.server.requests\",\"description\":null,\"baseUnit\":\"seconds\",\"measurements\":[{\"statistic\":\"COUNT\",\"value\":1.0},{\"statistic\":\"TOTAL_TIME\",\"value\":0.03465965},{\"statistic\":\"MAX\",\"value\":0.47461985}],\"availableTags\":[{\"tag\":\"exception\",\"values\":[\"None\"]},{\"tag\":\"outcome\",\"values\":[\"SUCCESS\"]},{\"tag\":\"status\",\"values\":[\"200\"]}]}");
-		assertEquals(TimeUnit.SECONDS, mappingMetrics.getTimeUnit());
-		assertEquals(1, mappingMetrics.getCallsCount());
-		assertEquals(0.47461985, mappingMetrics.getMaxTime());
-		assertEquals(0.03465965, mappingMetrics.getTotalTime());
-	}
+
+    @Test
+    void testParser1() throws Exception {
+        RequestMappingMetrics mappingMetrics = RequestMappingMetrics.parse("{\"name\":\"http.server.requests\",\"description\":null,\"baseUnit\":\"seconds\",\"measurements\":[{\"statistic\":\"COUNT\",\"value\":1.0},{\"statistic\":\"TOTAL_TIME\",\"value\":0.03465965},{\"statistic\":\"MAX\",\"value\":0.47461985}],\"availableTags\":[{\"tag\":\"exception\",\"values\":[\"None\"]},{\"tag\":\"outcome\",\"values\":[\"SUCCESS\"]},{\"tag\":\"status\",\"values\":[\"200\"]}]}");
+        assertEquals(TimeUnit.SECONDS, mappingMetrics.getTimeUnit());
+        assertEquals(1, mappingMetrics.getCallsCount());
+        assertEquals(0.47461985, mappingMetrics.getMaxTime());
+        assertEquals(0.03465965, mappingMetrics.getTotalTime());
+    }
 
 }

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

@@ -10,28 +10,28 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.metrics.test;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.InputStreamReader;
 import java.time.Duration;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.livehover.v2.StartupMetricsModel;
 
 import com.google.gson.Gson;
 
 public class StartupMetricsTest {
-	
-	@Test
-	public void testParser() throws Exception {
-		Gson gson = new Gson();
-		Map<?,?> mapContent = gson.fromJson(new InputStreamReader(getClass().getResourceAsStream("/test-files/startup.json")), Map.class);
-		StartupMetricsModel startupMetricsModel = StartupMetricsModel.parse(mapContent);
-		assertNotNull(startupMetricsModel);
-		assertEquals(419, startupMetricsModel.getStartupEvents().size());
-		assertEquals(Duration.ofNanos(10298253), startupMetricsModel.getBeanInstanciationTime("ownerController"));
-	}
+
+    @Test
+    void testParser() throws Exception {
+        Gson gson = new Gson();
+        Map<?, ?> mapContent = gson.fromJson(new InputStreamReader(getClass().getResourceAsStream("/test-files/startup.json")), Map.class);
+        StartupMetricsModel startupMetricsModel = StartupMetricsModel.parse(mapContent);
+        assertNotNull(startupMetricsModel);
+        assertEquals(419, startupMetricsModel.getStartupEvents().size());
+        assertEquals(Duration.ofNanos(10298253), startupMetricsModel.getBeanInstanciationTime("ownerController"));
+    }
 
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.references.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.net.URI;
 import java.nio.file.Path;
@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.WorkspaceFolder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.value.ValuePropertyReferencesProvider;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 
@@ -32,24 +32,24 @@ import com.google.common.collect.ImmutableList;
  */
 public class PropertyReferenceFinderTest {
 
-	@Test
-	public void testFindReferenceAtBeginningPropFile() throws Exception {
-		ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
+    @Test
+    void testFindReferenceAtBeginningPropFile() throws Exception {
+        ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
 
-		Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/simple-case/").toURI());
-		List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "test.property");
+        Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/simple-case/").toURI());
+        List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "test.property");
 
-		assertNotNull(locations);
-		assertEquals(1, locations.size());
-		Location location = locations.get(0);
+        assertNotNull(locations);
+        assertEquals(1, locations.size());
+        Location location = locations.get(0);
 
-		URI docURI = Paths.get(root.toString(), "application.properties").toUri();
-		assertEquals(docURI.toString(), location.getUri());
-		assertEquals(0, location.getRange().getStart().getLine());
-		assertEquals(0, location.getRange().getStart().getCharacter());
-		assertEquals(0, location.getRange().getEnd().getLine());
-		assertEquals(13, location.getRange().getEnd().getCharacter());
-	}
+        URI docURI = Paths.get(root.toString(), "application.properties").toUri();
+        assertEquals(docURI.toString(), location.getUri());
+        assertEquals(0, location.getRange().getStart().getLine());
+        assertEquals(0, location.getRange().getStart().getCharacter());
+        assertEquals(0, location.getRange().getEnd().getLine());
+        assertEquals(13, location.getRange().getEnd().getCharacter());
+    }
 
 	private Collection<WorkspaceFolder> wsFolder(Path directory) {
 		if (directory != null) {
@@ -61,75 +61,75 @@ public class PropertyReferenceFinderTest {
 		return ImmutableList.of();
 	}
 
-	@Test
-	public void testFindReferenceAtBeginningYMLFile() throws Exception {
-		ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
+    @Test
+    void testFindReferenceAtBeginningYMLFile() throws Exception {
+        ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
 
-		Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/simple-yml/").toURI());
-		List<? extends Location> locations  = provider.findReferencesFromPropertyFiles(wsFolder(root), "test.property");
+        Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/simple-yml/").toURI());
+        List<? extends Location> locations  = provider.findReferencesFromPropertyFiles(wsFolder(root), "test.property");
 
-		assertNotNull(locations);
-		assertEquals(1, locations.size());
-		Location location = locations.get(0);
+        assertNotNull(locations);
+        assertEquals(1, locations.size());
+        Location location = locations.get(0);
 
-		URI docURI = Paths.get(root.toString(), "application.yml").toUri();
-		assertEquals(docURI.toString(), location.getUri());
-		assertEquals(3, location.getRange().getStart().getLine());
-		assertEquals(2, location.getRange().getStart().getCharacter());
-		assertEquals(3, location.getRange().getEnd().getLine());
-		assertEquals(10, location.getRange().getEnd().getCharacter());
-	}
+        URI docURI = Paths.get(root.toString(), "application.yml").toUri();
+        assertEquals(docURI.toString(), location.getUri());
+        assertEquals(3, location.getRange().getStart().getLine());
+        assertEquals(2, location.getRange().getStart().getCharacter());
+        assertEquals(3, location.getRange().getEnd().getLine());
+        assertEquals(10, location.getRange().getEnd().getCharacter());
+    }
 
-	@Test
-	public void testFindReferenceWithinTheDocument() throws Exception {
-		ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
+    @Test
+    void testFindReferenceWithinTheDocument() throws Exception {
+        ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
 
-		Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/simple-case/").toURI());
-		List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "server.port");
+        Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/simple-case/").toURI());
+        List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "server.port");
 
-		assertNotNull(locations);
-		assertEquals(1, locations.size());
-		Location location = locations.get(0);
+        assertNotNull(locations);
+        assertEquals(1, locations.size());
+        Location location = locations.get(0);
 
-		URI docURI = Paths.get(root.toString(), "application.properties").toUri();
-		assertEquals(docURI.toString(), location.getUri());
-		assertEquals(2, location.getRange().getStart().getLine());
-		assertEquals(0, location.getRange().getStart().getCharacter());
-		assertEquals(2, location.getRange().getEnd().getLine());
-		assertEquals(11, location.getRange().getEnd().getCharacter());
-	}
+        URI docURI = Paths.get(root.toString(), "application.properties").toUri();
+        assertEquals(docURI.toString(), location.getUri());
+        assertEquals(2, location.getRange().getStart().getLine());
+        assertEquals(0, location.getRange().getStart().getCharacter());
+        assertEquals(2, location.getRange().getEnd().getLine());
+        assertEquals(11, location.getRange().getEnd().getCharacter());
+    }
 
-	@Test
-	public void testFindReferenceWithinMultipleFiles() throws Exception {
-		ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
+    @Test
+    void testFindReferenceWithinMultipleFiles() throws Exception {
+        ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
 
-		Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/multiple-files/").toURI());
-		List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "appl1.prop");
+        Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/multiple-files/").toURI());
+        List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "appl1.prop");
 
-		assertNotNull(locations);
-		assertEquals(3, locations.size());
+        assertNotNull(locations);
+        assertEquals(3, locations.size());
 
-		Location location = getLocation(locations, Paths.get(root.toString(), "application-dev.properties").toUri());
-		assertNotNull(location);
-		assertEquals(1, location.getRange().getStart().getLine());
-		assertEquals(0, location.getRange().getStart().getCharacter());
-		assertEquals(1, location.getRange().getEnd().getLine());
-		assertEquals(10, location.getRange().getEnd().getCharacter());
+        Location location = getLocation(locations, Paths.get(root.toString(), "application-dev.properties").toUri());
+        assertNotNull(location);
+        assertEquals(1, location.getRange().getStart().getLine());
+        assertEquals(0, location.getRange().getStart().getCharacter());
+        assertEquals(1, location.getRange().getEnd().getLine());
+        assertEquals(10, location.getRange().getEnd().getCharacter());
 
-		location = getLocation(locations, Paths.get(root.toString(), "application.properties").toUri());
-		assertNotNull(location);
-		assertEquals(1, location.getRange().getStart().getLine());
-		assertEquals(0, location.getRange().getStart().getCharacter());
-		assertEquals(1, location.getRange().getEnd().getLine());
-		assertEquals(10, location.getRange().getEnd().getCharacter());
+        location = getLocation(locations, Paths.get(root.toString(), "application.properties").toUri());
+        assertNotNull(location);
+        assertEquals(1, location.getRange().getStart().getLine());
+        assertEquals(0, location.getRange().getStart().getCharacter());
+        assertEquals(1, location.getRange().getEnd().getLine());
+        assertEquals(10, location.getRange().getEnd().getCharacter());
 
-		location = getLocation(locations, Paths.get(root.toString(), "prod-application.properties").toUri());
-		assertNotNull(location);
-		assertEquals(1, location.getRange().getStart().getLine());
-		assertEquals(0, location.getRange().getStart().getCharacter());
-		assertEquals(1, location.getRange().getEnd().getLine());
-		assertEquals(10, location.getRange().getEnd().getCharacter());
-	}
+        location = getLocation(locations, Paths.get(root.toString(), "prod-application.properties").toUri());
+        assertNotNull(location);
+        assertEquals(1, location.getRange().getStart().getLine());
+        assertEquals(0, location.getRange().getStart().getCharacter());
+        assertEquals(1, location.getRange().getEnd().getLine());
+        assertEquals(10, location.getRange().getEnd().getCharacter());
+    }
 
 	private Location getLocation(List<? extends Location> locations, URI docURI) {
 		for (Location location : locations) {
@@ -141,28 +141,28 @@ public class PropertyReferenceFinderTest {
 		return null;
 	}
 
-	@Test
-	public void testFindReferenceWithinMultipleMixedFiles() throws Exception {
-		ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
+    @Test
+    void testFindReferenceWithinMultipleMixedFiles() throws Exception {
+        ValuePropertyReferencesProvider provider = new ValuePropertyReferencesProvider(null);
 
-		Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/mixed-multiple-files/").toURI());
-		List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "appl1.prop");
+        Path root = Paths.get(ProjectsHarness.class.getResource("/test-property-files/mixed-multiple-files/").toURI());
+        List<? extends Location> locations = provider.findReferencesFromPropertyFiles(wsFolder(root), "appl1.prop");
 
-		assertNotNull(locations);
-		assertEquals(2, locations.size());
+        assertNotNull(locations);
+        assertEquals(2, locations.size());
 
-		Location location = getLocation(locations, Paths.get(root.toString(), "application-dev.properties").toUri());
-		assertNotNull(location);
-		assertEquals(1, location.getRange().getStart().getLine());
-		assertEquals(0, location.getRange().getStart().getCharacter());
-		assertEquals(1, location.getRange().getEnd().getLine());
-		assertEquals(10, location.getRange().getEnd().getCharacter());
+        Location location = getLocation(locations, Paths.get(root.toString(), "application-dev.properties").toUri());
+        assertNotNull(location);
+        assertEquals(1, location.getRange().getStart().getLine());
+        assertEquals(0, location.getRange().getStart().getCharacter());
+        assertEquals(1, location.getRange().getEnd().getLine());
+        assertEquals(10, location.getRange().getEnd().getCharacter());
 
-		location = getLocation(locations, Paths.get(root.toString(), "application.yml").toUri());
-		assertNotNull(locations);
-		assertEquals(3, location.getRange().getStart().getLine());
-		assertEquals(2, location.getRange().getStart().getCharacter());
-		assertEquals(3, location.getRange().getEnd().getLine());
-		assertEquals(6, location.getRange().getEnd().getCharacter());
-	}
+        location = getLocation(locations, Paths.get(root.toString(), "application.yml").toUri());
+        assertNotNull(locations);
+        assertEquals(3, location.getRange().getStart().getLine());
+        assertEquals(2, location.getRange().getStart().getCharacter());
+        assertEquals(3, location.getRange().getEnd().getLine());
+        assertEquals(6, location.getRange().getEnd().getCharacter());
+    }
 }

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

@@ -10,9 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -25,9 +23,9 @@ import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -42,9 +40,9 @@ import org.springframework.ide.vscode.commons.util.text.TextDocument;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness.CustomizableProjectContent;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class RequestMappingDependentConstantChangedTest {
@@ -57,7 +55,7 @@ public class RequestMappingDependentConstantChangedTest {
 	private MavenJavaProject project;
 	private Path directory;
 	
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 
@@ -77,139 +75,139 @@ public class RequestMappingDependentConstantChangedTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testSimpleRequestMappingSymbolFromConstantInDifferentClass() throws Exception {
-		String docUri = directory.resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
-		String constantsUri = directory.resolve("src/main/java/org/test/Constants.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertSymbol(docUri, "@/path/from/constant", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
+    @Test
+    void testSimpleRequestMappingSymbolFromConstantInDifferentClass() throws Exception {
+        String docUri = directory.resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
+        String constantsUri = directory.resolve("src/main/java/org/test/Constants.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertSymbol(docUri, "@/path/from/constant", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
 
-		TestFileScanListener fileScanListener = new TestFileScanListener();
-		indexer.getJavaIndexer().setFileScanListener(fileScanListener);
-		
-		replaceInFile(constantsUri, "path/from/constant", "/changed-path");
-		indexer.updateDocument(constantsUri, null, "triggered by test code").get();
-		
-		fileScanListener.assertScannedUris(constantsUri, docUri);
-		fileScanListener.assertScannedUri(constantsUri, 1);
-		fileScanListener.assertScannedUri(docUri, 1);
-		
-		symbols = indexer.getSymbols(docUri);
-		assertSymbolCount(1, symbols);
-		assertSymbol(docUri, "@/changed-path", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
-	}
-	
-	@Test
-	public void testSimpleRequestMappingSymbolFromConstantInDifferentClassViaMultipleFilesUpdate() throws Exception {
-		String docUri = directory.resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
-		String constantsUri = directory.resolve("src/main/java/org/test/Constants.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertSymbol(docUri, "@/path/from/constant", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
+        TestFileScanListener fileScanListener = new TestFileScanListener();
+        indexer.getJavaIndexer().setFileScanListener(fileScanListener);
 
-		TestFileScanListener fileScanListener = new TestFileScanListener();
-		indexer.getJavaIndexer().setFileScanListener(fileScanListener);
-		
-		replaceInFile(constantsUri, "path/from/constant", "/changed-path");
-		indexer.updateDocuments(new String[] {constantsUri}, "triggered by test code").get();
+        replaceInFile(constantsUri, "path/from/constant", "/changed-path");
+        indexer.updateDocument(constantsUri, null, "triggered by test code").get();
 
-		fileScanListener.assertScannedUris(constantsUri, docUri);
-		fileScanListener.assertScannedUri(constantsUri, 1);
-		fileScanListener.assertScannedUri(docUri, 1);
-		
-		symbols = indexer.getSymbols(docUri);
-		assertSymbolCount(1, symbols);
-		assertSymbol(docUri, "@/changed-path", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
-	}
-	
-	@Test
-	public void testRequestMappingSymbolFromConstantChained() throws Exception {
-		String docUri = directory.resolve("src/main/java/org/test/ChainedRequestMappingPathOverMultipleClasses.java").toUri().toString();
-		String chainConstantsUri_2 = directory.resolve("src/main/java/org/test/ChainElement2.java").toUri().toString();
+        fileScanListener.assertScannedUris(constantsUri, docUri);
+        fileScanListener.assertScannedUri(constantsUri, 1);
+        fileScanListener.assertScannedUri(docUri, 1);
 
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertSymbol(docUri, "@/path/from/chain", "@RequestMapping(ChainElement1.MAPPING_PATH_1)");
+        symbols = indexer.getSymbols(docUri);
+        assertSymbolCount(1, symbols);
+        assertSymbol(docUri, "@/changed-path", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
+    }
 
-		replaceInFile(chainConstantsUri_2, "path/from/chain", "/changed-path");
-		indexer.updateDocument(chainConstantsUri_2, null, "triggered by test code").get();
+    @Test
+    void testSimpleRequestMappingSymbolFromConstantInDifferentClassViaMultipleFilesUpdate() throws Exception {
+        String docUri = directory.resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
+        String constantsUri = directory.resolve("src/main/java/org/test/Constants.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertSymbol(docUri, "@/path/from/constant", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
 
-		symbols = indexer.getSymbols(docUri);
-		assertSymbolCount(1, symbols);
-		assertSymbol(docUri, "@/path/from/chain", "@RequestMapping(ChainElement1.MAPPING_PATH_1)");
-		
-		// You would expect here that the symbol got updated from "path/from/chain" to the changed value "/changed-path",
-		// but the mechanism doesn't know anything about this chained dependendy. This is a limitation of the current
-		// implementation, since the AST has no idea about the chain, therefore we are only aware of the first
-		// element in this chained dependency, which comes from ChainElement1.java
-	}
-	
-	@Test
-	public void testCyclicalDependency() throws Exception {
-		//cyclical dependency between two files (ping refers pong and vice versa)
-		
-		String pingUri = directory.resolve("src/main/java/org/test/PingConstantRequestMapping.java").toUri().toString();
-		String pongUri = directory.resolve("src/main/java/org/test/PongConstantRequestMapping.java").toUri().toString();
+        TestFileScanListener fileScanListener = new TestFileScanListener();
+        indexer.getJavaIndexer().setFileScanListener(fileScanListener);
 
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
-		}
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pongUri, "@/ping -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
-		}
+        replaceInFile(constantsUri, "path/from/constant", "/changed-path");
+        indexer.updateDocuments(new String[]{constantsUri}, "triggered by test code").get();
 
-		replaceInFile(pingUri, "/ping", "/changed");
-		indexer.updateDocument(pingUri, null, "triggered by test code").get();
+        fileScanListener.assertScannedUris(constantsUri, docUri);
+        fileScanListener.assertScannedUri(constantsUri, 1);
+        fileScanListener.assertScannedUri(docUri, 1);
 
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
-		}
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pongUri, "@/changed -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
-		}
-	}
+        symbols = indexer.getSymbols(docUri);
+        assertSymbolCount(1, symbols);
+        assertSymbol(docUri, "@/changed-path", "@RequestMapping(Constants.REQUEST_MAPPING_PATH)");
+    }
 
-	@Test
-	public void testCyclicalDependencyViaMultipleFilesUpdate() throws Exception {
-		//cyclical dependency between two files (ping refers pong and vice versa)
-		
-		String pingUri = directory.resolve("src/main/java/org/test/PingConstantRequestMapping.java").toUri().toString();
-		String pongUri = directory.resolve("src/main/java/org/test/PongConstantRequestMapping.java").toUri().toString();
+    @Test
+    void testRequestMappingSymbolFromConstantChained() throws Exception {
+        String docUri = directory.resolve("src/main/java/org/test/ChainedRequestMappingPathOverMultipleClasses.java").toUri().toString();
+        String chainConstantsUri_2 = directory.resolve("src/main/java/org/test/ChainElement2.java").toUri().toString();
 
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
-		}
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pongUri, "@/ping -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
-		}
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertSymbol(docUri, "@/path/from/chain", "@RequestMapping(ChainElement1.MAPPING_PATH_1)");
 
-		replaceInFile(pingUri, "/ping", "/changed");
-		indexer.updateDocuments(new String[] {pingUri}, "triggered by test code").get();
+        replaceInFile(chainConstantsUri_2, "path/from/chain", "/changed-path");
+        indexer.updateDocument(chainConstantsUri_2, null, "triggered by test code").get();
 
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
-		}
-		{
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
-			assertSymbolCount(1, symbols);
-			assertSymbol(pongUri, "@/changed -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
-		}
-	}
+        symbols = indexer.getSymbols(docUri);
+        assertSymbolCount(1, symbols);
+        assertSymbol(docUri, "@/path/from/chain", "@RequestMapping(ChainElement1.MAPPING_PATH_1)");
+
+        // You would expect here that the symbol got updated from "path/from/chain" to the changed value "/changed-path",
+        // but the mechanism doesn't know anything about this chained dependendy. This is a limitation of the current
+        // implementation, since the AST has no idea about the chain, therefore we are only aware of the first
+        // element in this chained dependency, which comes from ChainElement1.java
+    }
+
+    @Test
+    void testCyclicalDependency() throws Exception {
+        //cyclical dependency between two files (ping refers pong and vice versa)
+        
+        String pingUri = directory.resolve("src/main/java/org/test/PingConstantRequestMapping.java").toUri().toString();
+        String pongUri = directory.resolve("src/main/java/org/test/PongConstantRequestMapping.java").toUri().toString();
+
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
+        }
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pongUri, "@/ping -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
+        }
+
+        replaceInFile(pingUri, "/ping", "/changed");
+        indexer.updateDocument(pingUri, null, "triggered by test code").get();
+
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
+        }
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pongUri, "@/changed -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
+        }
+    }
+
+    @Test
+    void testCyclicalDependencyViaMultipleFilesUpdate() throws Exception {
+        //cyclical dependency between two files (ping refers pong and vice versa)
+        
+        String pingUri = directory.resolve("src/main/java/org/test/PingConstantRequestMapping.java").toUri().toString();
+        String pongUri = directory.resolve("src/main/java/org/test/PongConstantRequestMapping.java").toUri().toString();
+
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
+        }
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pongUri, "@/ping -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
+        }
+
+        replaceInFile(pingUri, "/ping", "/changed");
+        indexer.updateDocuments(new String[]{pingUri}, "triggered by test code").get();
+
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pingUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
+        }
+        {
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(pongUri);
+            assertSymbolCount(1, symbols);
+            assertSymbol(pongUri, "@/changed -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
+        }
+    }
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////
 	

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

@@ -12,10 +12,10 @@ package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
 import java.io.File;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+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.bootiful.BootLanguageServerTest;
@@ -27,9 +27,9 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.ide.vscode.project.harness.SpringProcessLiveDataBuilder;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class RequestMappingLiveHoverTestWithContextPath {
@@ -37,491 +37,490 @@ public class RequestMappingLiveHoverTestWithContextPath {
 	@Autowired private BootLanguageServerHarness harness;
 	@Autowired private SpringProcessLiveDataProvider liveDataProvider;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.useProject(ProjectsHarness.INSTANCE.mavenProject("test-request-mapping-live-hover"));
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		liveDataProvider.remove("processkey");
 	}
 
-	@Test
-	public void testBoot1xActualActuatorEnvProp() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "1.x";
+    @Test
+    void testBoot1xActualActuatorEnvProp() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "1.x";
 
 
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_ENV)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromEnv/hello-world](https://cfapps.io:1111/fromEnv/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot1xActualActuatorCommandArgCamel() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "1.x";
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_ENV)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromEnv/hello-world](https://cfapps.io:1111/fromEnv/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot1xActualActuatorCommandArgCamel() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "1.x";
 
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_COMMAND_LINE_ARG_CAMEL_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot1xActualActuatorCommandArgKebab() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "1.x";
-
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_COMMAND_LINE_ARG_KEBAB_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot1xActualActuatorAppConfigFileKebab() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "1.x";
-
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_APP_CONFIG_FILE_KEBAB_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot1xActualActuatorAppConfigFileCamel() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "1.x";
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_COMMAND_LINE_ARG_CAMEL_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot1xActualActuatorCommandArgKebab() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "1.x";
+
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_COMMAND_LINE_ARG_KEBAB_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot1xActualActuatorAppConfigFileKebab() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "1.x";
+
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_APP_CONFIG_FILE_KEBAB_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot1xActualActuatorAppConfigFileCamel() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "1.x";
 
 
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_APP_CONFIG_FILE_CAMEL_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot2xActualActuatorEnvProp() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "2.x";
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_1x_APP_CONFIG_FILE_CAMEL_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot2xActualActuatorEnvProp() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "2.x";
 
 
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_ENV)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_ENV)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
 
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromenvironment/hello-world](https://cfapps.io:1111/fromenvironment/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot2xActualActuatorCommandArgCamel() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "2.x";
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_COMMAND_LINE_ARG_CAMEL_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromenvironment/hello-world](https://cfapps.io:1111/fromenvironment/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot2xActualActuatorCommandArgCamel() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "2.x";
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_COMMAND_LINE_ARG_CAMEL_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
 
 
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot2xActualActuatorCommandArgKebab() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "2.x";
-
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_COMMAND_LINE_ARG_KEBAB_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("prcesskey", liveData);
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot2xActualActuatorCommandArgKebab() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "2.x";
+
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_COMMAND_LINE_ARG_KEBAB_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("prcesskey", liveData);
 
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot2xActualActuatorAppConfigFileKebab() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "2.x";
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot2xActualActuatorAppConfigFileKebab() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "2.x";
 
 
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_APP_CONFIG_FILE_KEBAB_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot2xActualActuatorAppConfigFileCamel() throws Exception {
-
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "2.x";
-
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_APP_CONFIG_FILE_CAMEL_CASE)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testBoot2xActualActuatorPropertySourcePriority() throws Exception {
-
-		//  Test that for Boot 2.x, if context path property appears in three different sources:
-		//   env var, command line arg, and app config file, that the highest priority source is read, in this case command line arg
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		String bootVersion = "2.x";
-
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_PROPERTY_SOURCE_PRIORITY)
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-
-
-	@Test
-	public void testWithMockedContextPath() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
-				.toString();
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("1111")
-			.processID("22022")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.contextPath("/mockedpath")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
-		editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
-		editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/mockedpath/hello-world](https://cfapps.io:1111/mockedpath/hello-world)  \n" +
-				"Process [PID=22022, name=`test-request-mapping-live-hover`]");
-
-	}
-
-	@Test
-	public void testMultiPathMockedContextPath() throws Exception {
-
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/RestApi.java").toUri()
-				.toString();
-
-
-		// Build a mock running boot app
-		SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
-			.port("999")
-			.processID("76543")
-			.host("cfapps.io")
-			.urlScheme("https")
-			.contextPath("/mockedpath")
-			.processName("test-request-mapping-live-hover")
-			// Ugly, but this is real JSON copied from a real live running app. We want the
-			// mock app to return realistic results if possible
-			.requestMappingsJson(
-				"{\"{[/greetings || /hello],methods=[GET]}\": {\"bean\": \"requestMappingHandlerMapping\", \"method\":\"public java.lang.String com.example.RestApi.greetings()\"}}")
-			.build();
-		harness.intialize(directory);
-		liveDataProvider.add("processkey", liveData);
-
-		Editor editor = harness.newEditor(LanguageId.JAVA,
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_APP_CONFIG_FILE_KEBAB_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot2xActualActuatorAppConfigFileCamel() throws Exception {
+
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "2.x";
+
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_APP_CONFIG_FILE_CAMEL_CASE)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testBoot2xActualActuatorPropertySourcePriority() throws Exception {
+
+        //  Test that for Boot 2.x, if context path property appears in three different sources:
+        //   env var, command line arg, and app config file, that the highest priority source is read, in this case command line arg
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        String bootVersion = "2.x";
+
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .contextPathEnvJson(bootVersion, AcuatorEnvTestConstants.BOOT_2x_PROPERTY_SOURCE_PRIORITY)
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+
+    @Test
+    void testWithMockedContextPath() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri()
+                .toString();
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("1111")
+                .processID("22022")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .contextPath("/mockedpath")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA);
+        editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)");
+        editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/mockedpath/hello-world](https://cfapps.io:1111/mockedpath/hello-world)  \n" +
+                "Process [PID=22022, name=`test-request-mapping-live-hover`]");
+
+    }
+
+    @Test
+    void testMultiPathMockedContextPath() throws Exception {
+
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/RestApi.java").toUri()
+                .toString();
+
+
+        // Build a mock running boot app
+        SpringProcessLiveData liveData = new SpringProcessLiveDataBuilder()
+                .port("999")
+                .processID("76543")
+                .host("cfapps.io")
+                .urlScheme("https")
+                .contextPath("/mockedpath")
+                .processName("test-request-mapping-live-hover")
+                // Ugly, but this is real JSON copied from a real live running app. We want the
+                // mock app to return realistic results if possible
+                .requestMappingsJson(
+                        "{\"{[/greetings || /hello],methods=[GET]}\": {\"bean\": \"requestMappingHandlerMapping\", \"method\":\"public java.lang.String com.example.RestApi.greetings()\"}}")
+                .build();
+        harness.intialize(directory);
+        liveDataProvider.add("processkey", liveData);
+
+        Editor editor = harness.newEditor(LanguageId.JAVA,
                 "package com.example;\n" +
-                "\n" +
-                "import org.springframework.stereotype.Controller;\n" +
-                "import org.springframework.web.bind.annotation.RequestMapping;\n" +
-                "import org.springframework.web.bind.annotation.RequestMethod.*;\n" +
-                "\n" +
-                "@Controller\n" +
-                "public class RestApi {\n" +
-                "\n" +
-                "@RequestMapping(value={\"/greetings\", \"/hello\"}, method=GET)\n" +
-                "public String greetings() {\n" +
-        			"}\n" +
-				"\n" +
-                "}",
-        docUri);
+                        "\n" +
+                        "import org.springframework.stereotype.Controller;\n" +
+                        "import org.springframework.web.bind.annotation.RequestMapping;\n" +
+                        "import org.springframework.web.bind.annotation.RequestMethod.*;\n" +
+                        "\n" +
+                        "@Controller\n" +
+                        "public class RestApi {\n" +
+                        "\n" +
+                        "@RequestMapping(value={\"/greetings\", \"/hello\"}, method=GET)\n" +
+                        "public String greetings() {\n" +
+                        "}\n" +
+                        "\n" +
+                        "}",
+                docUri);
 
-		editor.assertHoverContains("@RequestMapping(value={\"/greetings\", \"/hello\"}, method=GET)", "[https://cfapps.io:999/mockedpath/greetings](https://cfapps.io:999/mockedpath/greetings)  \n" +
-				"[https://cfapps.io:999/mockedpath/hello](https://cfapps.io:999/mockedpath/hello)  \n" +
-				"Process [PID=76543, name=`test-request-mapping-live-hover`]");
+        editor.assertHoverContains("@RequestMapping(value={\"/greetings\", \"/hello\"}, method=GET)", "[https://cfapps.io:999/mockedpath/greetings](https://cfapps.io:999/mockedpath/greetings)  \n" +
+                "[https://cfapps.io:999/mockedpath/hello](https://cfapps.io:999/mockedpath/hello)  \n" +
+                "Process [PID=76543, name=`test-request-mapping-live-hover`]");
 
-	}
+    }
 
 
 }

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

@@ -10,16 +10,16 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.InputStream;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.eclipse.lsp4j.CompletionItem;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.bootiful.BootLanguageServerTest;
@@ -29,9 +29,9 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class RequestMappingSnippetTests {
@@ -39,77 +39,77 @@ public class RequestMappingSnippetTests {
 	@Autowired private BootLanguageServerHarness harness;
 	private Editor editor;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		IJavaProject testProject = ProjectsHarness.INSTANCE.mavenProject("test-request-mapping-live-hover");
 		harness.useProject(testProject);
 		harness.intialize(null);
 	}
 
-	@Test
-	public void getMapping() throws Exception {
-		prepareCase("Get<*>");
-		assertOneSnippet("package example;\n"
-				+ "\n"
-				+ "import org.springframework.stereotype.Controller;\n"
-				+ "import org.springframework.web.bind.annotation.DeleteMapping;\n"
-				+ "import org.springframework.web.bind.annotation.GetMapping;\n"
-				+ "import org.springframework.web.bind.annotation.PathVariable;\n"
-				+ "import org.springframework.web.bind.annotation.PostMapping;\n"
-				+ "import org.springframework.web.bind.annotation.PutMapping;\n"
-				+ "import org.springframework.web.bind.annotation.RequestBody;\n"
-				+ "import org.springframework.web.bind.annotation.RequestMapping;\n"
-				+ "import org.springframework.web.bind.annotation.ResponseBody;\n"
-				+ "\n"
-				+ "/** Boot Java - Test Completion */\n"
-				+ "@Controller\n"
-				+ "public class RestApi {\n"
-				+ "\n"
-				+ "@GetMapping(value=\"${1:path}\")\n"
-				+ "public ${2:SomeData} ${3:getMethodName}(@RequestParam ${4:String} ${5:param}) {\n"
-				+ "    return new ${2:SomeData}($0);\n"
-				+ "}\n"
-				+ "<*>\n"
-				+ "\n"
-				+ "\n"
-				+ "	@RequestMapping(\"/hello\")\n"
-				+ "	@ResponseBody\n"
-				+ "	public String hello() {\n"
-				+ "		return \"Hello there!\";\n"
-				+ "	}\n"
-				+ "	\n"
-				+ "	\n"
-				+ "	@RequestMapping(\"/goodbye\")\n"
-				+ "	@ResponseBody\n"
-				+ "	public String goodbye() {\n"
-				+ "		return \"Good bye\";\n"
-				+ "	}\n"
-				+ "\n"
-				+ "	@GetMapping(\"/person/{name}\")\n"
-				+ "	public String getMapping(@PathVariable String name) {\n"
-				+ "		return \"Hello \" + name;\n"
-				+ "	}\n"
-				+ "\n"
-				+ "	@DeleteMapping(\"/delete/{id}\")\n"
-				+ "	public String removeMe(@PathVariable int id) {\n"
-				+ "		System.out.println(\"You are removed: \" + id);\n"
-				+ "		return \"Done\";\n"
-				+ "	}\n"
-				+ "\n"
-				+ "	@PostMapping(\"/postHello\")\n"
-				+ "	public String postMethod(@RequestBody String name) {\n"
-				+ "		System.out.println(\"Posted hello: \" + name);\n"
-				+ "		return name;\n"
-				+ "	}\n"
-				+ "\n"
-				+ "	@PutMapping(\"/put/{id}\")\n"
-				+ "	public String putMethod(@PathVariable int id, @RequestBody String name) {\n"
-				+ "		System.out.println(\"Added \" + name + \" with ID: \" + id);\n"
-				+ "		return name;\n"
-				+ "	}\n"
-				+ "}\n"
-				+ "");
-	}
+    @Test
+    void getMapping() throws Exception {
+        prepareCase("Get<*>");
+        assertOneSnippet("package example;\n"
+                + "\n"
+                + "import org.springframework.stereotype.Controller;\n"
+                + "import org.springframework.web.bind.annotation.DeleteMapping;\n"
+                + "import org.springframework.web.bind.annotation.GetMapping;\n"
+                + "import org.springframework.web.bind.annotation.PathVariable;\n"
+                + "import org.springframework.web.bind.annotation.PostMapping;\n"
+                + "import org.springframework.web.bind.annotation.PutMapping;\n"
+                + "import org.springframework.web.bind.annotation.RequestBody;\n"
+                + "import org.springframework.web.bind.annotation.RequestMapping;\n"
+                + "import org.springframework.web.bind.annotation.ResponseBody;\n"
+                + "\n"
+                + "/** Boot Java - Test Completion */\n"
+                + "@Controller\n"
+                + "public class RestApi {\n"
+                + "\n"
+                + "@GetMapping(value=\"${1:path}\")\n"
+                + "public ${2:SomeData} ${3:getMethodName}(@RequestParam ${4:String} ${5:param}) {\n"
+                + "    return new ${2:SomeData}($0);\n"
+                + "}\n"
+                + "<*>\n"
+                + "\n"
+                + "\n"
+                + "	@RequestMapping(\"/hello\")\n"
+                + "	@ResponseBody\n"
+                + "	public String hello() {\n"
+                + "		return \"Hello there!\";\n"
+                + "	}\n"
+                + "	\n"
+                + "	\n"
+                + "	@RequestMapping(\"/goodbye\")\n"
+                + "	@ResponseBody\n"
+                + "	public String goodbye() {\n"
+                + "		return \"Good bye\";\n"
+                + "	}\n"
+                + "\n"
+                + "	@GetMapping(\"/person/{name}\")\n"
+                + "	public String getMapping(@PathVariable String name) {\n"
+                + "		return \"Hello \" + name;\n"
+                + "	}\n"
+                + "\n"
+                + "	@DeleteMapping(\"/delete/{id}\")\n"
+                + "	public String removeMe(@PathVariable int id) {\n"
+                + "		System.out.println(\"You are removed: \" + id);\n"
+                + "		return \"Done\";\n"
+                + "	}\n"
+                + "\n"
+                + "	@PostMapping(\"/postHello\")\n"
+                + "	public String postMethod(@RequestBody String name) {\n"
+                + "		System.out.println(\"Posted hello: \" + name);\n"
+                + "		return name;\n"
+                + "	}\n"
+                + "\n"
+                + "	@PutMapping(\"/put/{id}\")\n"
+                + "	public String putMethod(@PathVariable int id, @RequestBody String name) {\n"
+                + "		System.out.println(\"Added \" + name + \" with ID: \" + id);\n"
+                + "		return name;\n"
+                + "	}\n"
+                + "}\n"
+                + "");
+    }
 
 	private void prepareCase(String prefix) throws Exception {
 		InputStream resource = this.getClass().getResourceAsStream("/test-projects/test-request-mapping-live-hover/src/main/java/example/RestApi.java");
@@ -121,7 +121,7 @@ public class RequestMappingSnippetTests {
 	
 	private void assertOneSnippet(String expected) throws Exception {
 		List<CompletionItem> completions = editor.getCompletions();
-		assertEquals(completions.size(), 1);
+        assertEquals(1, completions.size());
 		Editor clonedEditor = editor.clone();
 		clonedEditor.apply(completions.get(0));
 		assertEquals(expected, clonedEditor.getText());

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.Iterator;
@@ -24,9 +24,9 @@ import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -40,14 +40,14 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.google.common.collect.ImmutableSet;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class RequestMappingSymbolProviderTest {
@@ -58,7 +58,7 @@ public class RequestMappingSymbolProviderTest {
 
 	private File directory;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 
@@ -72,214 +72,214 @@ public class RequestMappingSymbolProviderTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testSimpleRequestMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/greeting", docUri, 6, 1, 6, 29));
-	}
+    @Test
+    void testSimpleRequestMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/greeting", docUri, 6, 1, 6, 29));
+    }
 
-	@Test
-	public void testSimpleRequestMappingSymbolFromConstantInDifferentClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
-		String constantsUri = directory.toPath().resolve("src/main/java/org/test/Constants.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/path/from/constant", docUri, 6, 1, 6, 48));
+    @Test
+    void testSimpleRequestMappingSymbolFromConstantInDifferentClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
+        String constantsUri = directory.toPath().resolve("src/main/java/org/test/Constants.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/path/from/constant", docUri, 6, 1, 6, 48));
 
-		//Verify whether dependency tracker logics works properly for this example.
-		SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
-		assertEquals(ImmutableSet.of("Lorg/test/Constants;"), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
-		
-		TestFileScanListener fileScanListener = new TestFileScanListener();
-		indexer.getJavaIndexer().setFileScanListener(fileScanListener);
+        //Verify whether dependency tracker logics works properly for this example.
+        SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
+        assertEquals(ImmutableSet.of("Lorg/test/Constants;"), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
 
-		CompletableFuture<Void> updateFuture = indexer.updateDocument(constantsUri, FileUtils.readFileToString(UriUtil.toFile(constantsUri)), "test triggered");
-		updateFuture.get(5, TimeUnit.SECONDS);
-		
-		fileScanListener.assertScannedUris(constantsUri, docUri);
-		fileScanListener.assertScannedUri(constantsUri, 1);
-		fileScanListener.assertScannedUri(docUri, 1);
-	}
-	
-	@Test
-	public void testUpdateDocumentWithConstantFromDifferentClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
-		String constantsUri = directory.toPath().resolve("src/main/java/org/test/Constants.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/path/from/constant", docUri, 6, 1, 6, 48));
+        TestFileScanListener fileScanListener = new TestFileScanListener();
+        indexer.getJavaIndexer().setFileScanListener(fileScanListener);
 
-		//Verify whether dependency tracker logics works properly for this example.
-		SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
-		assertEquals(ImmutableSet.of("Lorg/test/Constants;"), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
-		
-		TestFileScanListener fileScanListener = new TestFileScanListener();
-		indexer.getJavaIndexer().setFileScanListener(fileScanListener);
+        CompletableFuture<Void> updateFuture = indexer.updateDocument(constantsUri, FileUtils.readFileToString(UriUtil.toFile(constantsUri)), "test triggered");
+        updateFuture.get(5, TimeUnit.SECONDS);
 
-		CompletableFuture<Void> updateFuture = indexer.updateDocument(docUri, FileUtils.readFileToString(UriUtil.toFile(docUri)), "test triggered");
-		updateFuture.get(5, TimeUnit.SECONDS);
-		
-		assertEquals(ImmutableSet.of("Lorg/test/Constants;"), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
+        fileScanListener.assertScannedUris(constantsUri, docUri);
+        fileScanListener.assertScannedUri(constantsUri, 1);
+        fileScanListener.assertScannedUri(docUri, 1);
+    }
 
-		fileScanListener.assertScannedUris(docUri);
-		fileScanListener.assertScannedUri(constantsUri, 0);
-		fileScanListener.assertScannedUri(docUri, 1);
-	}
-	
-	@Test
-	public void testCyclicalRequestMappingDependency() throws Exception {
-		//Cyclical dependency:
-		//file a => file b => file a
-		//This has the potential to cause infinite loop.
-		
-		String pingUri = directory.toPath().resolve("src/main/java/org/test/PingConstantRequestMapping.java").toUri().toString();
-		String pongUri = directory.toPath().resolve("src/main/java/org/test/PongConstantRequestMapping.java").toUri().toString();
+    @Test
+    void testUpdateDocumentWithConstantFromDifferentClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
+        String constantsUri = directory.toPath().resolve("src/main/java/org/test/Constants.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/path/from/constant", docUri, 6, 1, 6, 48));
 
-		assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
-		assertSymbol(pongUri, "@/ping -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
-		
-		TestFileScanListener fileScanListener = new TestFileScanListener();
-		indexer.getJavaIndexer().setFileScanListener(fileScanListener);
-		
-		CompletableFuture<Void> updateFuture = indexer.updateDocument(pingUri, null, "test triggered");
-		updateFuture.get(5, TimeUnit.SECONDS);
+        //Verify whether dependency tracker logics works properly for this example.
+        SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
+        assertEquals(ImmutableSet.of("Lorg/test/Constants;"), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
 
-		fileScanListener.assertScannedUris(pingUri, pongUri);
-		
-		fileScanListener.reset();
-		fileScanListener.assertScannedUris(/*none*/);
+        TestFileScanListener fileScanListener = new TestFileScanListener();
+        indexer.getJavaIndexer().setFileScanListener(fileScanListener);
 
-		CompletableFuture<Void> updateFuture2 = indexer.updateDocument(pongUri, null, "test triggered");
-		updateFuture2.get(5, TimeUnit.SECONDS);
+        CompletableFuture<Void> updateFuture = indexer.updateDocument(docUri, FileUtils.readFileToString(UriUtil.toFile(docUri)), "test triggered");
+        updateFuture.get(5, TimeUnit.SECONDS);
 
-		fileScanListener.assertScannedUris(pingUri, pongUri);
-	}
+        assertEquals(ImmutableSet.of("Lorg/test/Constants;"), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
 
-	@Test
-	public void testSimpleRequestMappingSymbolFromConstantInSameClass() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInSameClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/request/mapping/path/from/same/class/constant", docUri, 8, 1, 8, 52));
-		
-		SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
-		assertEquals(ImmutableSet.of(), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
-	}
+        fileScanListener.assertScannedUris(docUri);
+        fileScanListener.assertScannedUri(constantsUri, 0);
+        fileScanListener.assertScannedUri(docUri, 1);
+    }
 
-	@Test
-	public void testSimpleRequestMappingSymbolFromConstantInBinaryType() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantFromBinaryType.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/(inferred)", docUri, 7, 1, 7, 53));
-		
-		SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
-		assertEquals(ImmutableSet.of(), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
-	}
+    @Test
+    void testCyclicalRequestMappingDependency() throws Exception {
+        //Cyclical dependency:
+        //file a => file b => file a
+        //This has the potential to cause infinite loop.
+        
+        String pingUri = directory.toPath().resolve("src/main/java/org/test/PingConstantRequestMapping.java").toUri().toString();
+        String pongUri = directory.toPath().resolve("src/main/java/org/test/PongConstantRequestMapping.java").toUri().toString();
 
-	@Test
-	public void testParentRequestMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/ParentMappingClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/parent/greeting -- GET", docUri, 8, 1, 8, 47));
-	}
+        assertSymbol(pingUri, "@/pong -- GET", "@GetMapping(PongConstantRequestMapping.PONG)");
+        assertSymbol(pongUri, "@/ping -- GET", "@GetMapping(PingConstantRequestMapping.PING)");
 
-	@Test
-	public void testEmptyPathWithParentRequestMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/ParentMappingClass2.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/parent2 -- GET,POST,DELETE", docUri, 8, 1, 8, 16));
-	}
+        TestFileScanListener fileScanListener = new TestFileScanListener();
+        indexer.getJavaIndexer().setFileScanListener(fileScanListener);
 
-	@Test
-	public void testMultiRequestMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MultiRequestMappingClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertEquals(2, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/hello1", docUri, 6, 1, 6, 44));
-		assertTrue(containsSymbol(symbols, "@/hello2", docUri, 6, 1, 6, 44));
-	}
+        CompletableFuture<Void> updateFuture = indexer.updateDocument(pingUri, null, "test triggered");
+        updateFuture.get(5, TimeUnit.SECONDS);
 
-	@Test
-	public void testGetMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/getData -- GET", docUri, 12, 1, 12, 24));
-	}
+        fileScanListener.assertScannedUris(pingUri, pongUri);
 
-	@Test
-	public void testGetMappingSymbolWithoutPath() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/ -- GET", docUri, 40, 1, 40, 16));
-	}
+        fileScanListener.reset();
+        fileScanListener.assertScannedUris(/*none*/);
 
-	@Test
-	public void testGetMappingSymbolWithoutAnything() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/ -- GET", docUri, 44, 1, 44, 14));
-	}
+        CompletableFuture<Void> updateFuture2 = indexer.updateDocument(pongUri, null, "test triggered");
+        updateFuture2.get(5, TimeUnit.SECONDS);
 
-	@Test
-	public void testDeleteMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/deleteData -- DELETE",docUri, 20, 1, 20, 30));
-	}
+        fileScanListener.assertScannedUris(pingUri, pongUri);
+    }
 
-	@Test
-	public void testPostMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/postData -- POST", docUri, 24, 1, 24, 26));
-	}
+    @Test
+    void testSimpleRequestMappingSymbolFromConstantInSameClass() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInSameClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/request/mapping/path/from/same/class/constant", docUri, 8, 1, 8, 52));
 
-	@Test
-	public void testPutMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/putData -- PUT", docUri, 16, 1, 16, 24));
-	}
+        SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
+        assertEquals(ImmutableSet.of(), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
+    }
 
-	@Test
-	public void testPatchMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/patchData -- PATCH", docUri, 28, 1, 28, 28));
-	}
+    @Test
+    void testSimpleRequestMappingSymbolFromConstantInBinaryType() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantFromBinaryType.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/(inferred)", docUri, 7, 1, 7, 53));
 
-	@Test
-	public void testGetRequestMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/getHello -- GET", docUri, 32, 1, 32, 61));
-	}
+        SpringIndexerJavaDependencyTracker dt = indexer.getJavaIndexer().getDependencyTracker();
+        assertEquals(ImmutableSet.of(), dt.getAllDependencies().get(UriUtil.toFileString(docUri)));
+    }
 
-	@Test
-	public void testMultiRequestMethodMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
-		assertTrue(containsSymbol(symbols, "@/postAndPutHello -- POST,PUT", docUri, 36, 1, 36, 76));
-	}
+    @Test
+    void testParentRequestMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/ParentMappingClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/parent/greeting -- GET", docUri, 8, 1, 8, 47));
+    }
 
-	@Test
-	public void testMediaTypes() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMappingMediaTypes.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(7, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/consume1 -- HEAD - Accept: testconsume", docUri, 8, 1, 8, 90));
-		assertTrue(containsSymbol(symbols, "@/consume2 - Accept: text/plain", docUri, 13, 1, 13, 73));
-		assertTrue(containsSymbol(symbols, "@/consume3 - Accept: text/plain,testconsumetype", docUri, 18, 1, 18, 94));
-		assertTrue(containsSymbol(symbols, "@/produce1 - Content-Type: testproduce", docUri, 23, 1, 23, 60));
-		assertTrue(containsSymbol(symbols, "@/produce2 - Content-Type: text/plain", docUri, 28, 1, 28, 73));
-		assertTrue(containsSymbol(symbols, "@/produce3 - Content-Type: text/plain,testproducetype", docUri, 33, 1, 33, 94));
-		assertTrue(containsSymbol(symbols, "@/everything - Accept: application/json,text/plain,testconsume - Content-Type: application/json", docUri, 38, 1, 38, 170));
-	}
+    @Test
+    void testEmptyPathWithParentRequestMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/ParentMappingClass2.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/parent2 -- GET,POST,DELETE", docUri, 8, 1, 8, 16));
+    }
+
+    @Test
+    void testMultiRequestMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MultiRequestMappingClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertEquals(2, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/hello1", docUri, 6, 1, 6, 44));
+        assertTrue(containsSymbol(symbols, "@/hello2", docUri, 6, 1, 6, 44));
+    }
+
+    @Test
+    void testGetMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/getData -- GET", docUri, 12, 1, 12, 24));
+    }
+
+    @Test
+    void testGetMappingSymbolWithoutPath() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/ -- GET", docUri, 40, 1, 40, 16));
+    }
+
+    @Test
+    void testGetMappingSymbolWithoutAnything() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/ -- GET", docUri, 44, 1, 44, 14));
+    }
+
+    @Test
+    void testDeleteMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/deleteData -- DELETE", docUri, 20, 1, 20, 30));
+    }
+
+    @Test
+    void testPostMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/postData -- POST", docUri, 24, 1, 24, 26));
+    }
+
+    @Test
+    void testPutMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/putData -- PUT", docUri, 16, 1, 16, 24));
+    }
+
+    @Test
+    void testPatchMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/patchData -- PATCH", docUri, 28, 1, 28, 28));
+    }
+
+    @Test
+    void testGetRequestMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/getHello -- GET", docUri, 32, 1, 32, 61));
+    }
+
+    @Test
+    void testMultiRequestMethodMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMethodClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols =  indexer.getSymbols(docUri);
+        assertTrue(containsSymbol(symbols, "@/postAndPutHello -- POST,PUT", docUri, 36, 1, 36, 76));
+    }
+
+    @Test
+    void testMediaTypes() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/RequestMappingMediaTypes.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(7, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/consume1 -- HEAD - Accept: testconsume", docUri, 8, 1, 8, 90));
+        assertTrue(containsSymbol(symbols, "@/consume2 - Accept: text/plain", docUri, 13, 1, 13, 73));
+        assertTrue(containsSymbol(symbols, "@/consume3 - Accept: text/plain,testconsumetype", docUri, 18, 1, 18, 94));
+        assertTrue(containsSymbol(symbols, "@/produce1 - Content-Type: testproduce", docUri, 23, 1, 23, 60));
+        assertTrue(containsSymbol(symbols, "@/produce2 - Content-Type: text/plain", docUri, 28, 1, 28, 73));
+        assertTrue(containsSymbol(symbols, "@/produce3 - Content-Type: text/plain,testproducetype", docUri, 33, 1, 33, 94));
+        assertTrue(containsSymbol(symbols, "@/everything - Accept: application/json,text/plain,testconsume - Content-Type: application/json", docUri, 38, 1, 38, 170));
+    }
 
 	private boolean containsSymbol(List<? extends WorkspaceSymbol> symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {
 		for (Iterator<? extends WorkspaceSymbol> iterator = symbols.iterator(); iterator.hasNext();) {

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.net.URI;
@@ -23,10 +23,9 @@ import org.eclipse.lsp4j.CodeLens;
 import org.eclipse.lsp4j.Command;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -37,13 +36,13 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.languageserver.testharness.TextDocumentInfo;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
 @SuppressWarnings("deprecation")
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class WebFluxCodeLensProviderTest {
@@ -53,7 +52,7 @@ public class WebFluxCodeLensProviderTest {
 	@Autowired private SpringSymbolIndex indexer;
 	private File directory;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		directory = new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI());
@@ -66,67 +65,67 @@ public class WebFluxCodeLensProviderTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testRoutesCodeLensesSimpleCase() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/QuoteHandler.java").toUri().toString();
-		TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
-		TextDocumentInfo openedDoc = harness.openDocument(doc);
+    @Test
+    void testRoutesCodeLensesSimpleCase() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/QuoteHandler.java").toUri().toString();
+        TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
+        TextDocumentInfo openedDoc = harness.openDocument(doc);
 
-		List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
+        List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
 
-		assertEquals(4, codeLenses.size());
+        assertEquals(4, codeLenses.size());
 
-		assertTrue(containsCodeLens(codeLenses, "GET /hello - Accept: text/plain", 25, 29, 25, 34));
-		assertTrue(containsCodeLens(codeLenses, "POST /echo - Accept: text/plain - Content-Type: text/plain", 30, 29, 30, 33));
-		assertTrue(containsCodeLens(codeLenses, "GET /quotes - Accept: application/stream+json", 35, 29, 35, 41));
-		assertTrue(containsCodeLens(codeLenses, "GET /quotes - Accept: application/json", 41, 29, 41, 40));
-	}
+        assertTrue(containsCodeLens(codeLenses, "GET /hello - Accept: text/plain", 25, 29, 25, 34));
+        assertTrue(containsCodeLens(codeLenses, "POST /echo - Accept: text/plain - Content-Type: text/plain", 30, 29, 30, 33));
+        assertTrue(containsCodeLens(codeLenses, "GET /quotes - Accept: application/stream+json", 35, 29, 35, 41));
+        assertTrue(containsCodeLens(codeLenses, "GET /quotes - Accept: application/json", 41, 29, 41, 40));
+    }
 
-	@Test
-	public void testRoutesCodeLensesNestedRoutes1() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/PersonHandler1.java").toUri().toString();
-		TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
-		TextDocumentInfo openedDoc = harness.openDocument(doc);
+    @Test
+    void testRoutesCodeLensesNestedRoutes1() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/PersonHandler1.java").toUri().toString();
+        TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
+        TextDocumentInfo openedDoc = harness.openDocument(doc);
 
-		List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
+        List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
 
-		assertEquals(3, codeLenses.size());
+        assertEquals(3, codeLenses.size());
 
-		assertTrue(containsCodeLens(codeLenses, "GET /person/{id} - Accept: application/json", 9, 29, 9, 38));
-		assertTrue(containsCodeLens(codeLenses, "POST /person/ - Content-Type: application/json", 13, 29, 13, 41));
-		assertTrue(containsCodeLens(codeLenses, "GET /person - Accept: application/json", 17, 29, 17, 39));
-	}
+        assertTrue(containsCodeLens(codeLenses, "GET /person/{id} - Accept: application/json", 9, 29, 9, 38));
+        assertTrue(containsCodeLens(codeLenses, "POST /person/ - Content-Type: application/json", 13, 29, 13, 41));
+        assertTrue(containsCodeLens(codeLenses, "GET /person - Accept: application/json", 17, 29, 17, 39));
+    }
 
-	@Test
-	public void testRoutesCodeLensesNestedRoutes2() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/PersonHandler2.java").toUri().toString();
-		TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
-		TextDocumentInfo openedDoc = harness.openDocument(doc);
+    @Test
+    void testRoutesCodeLensesNestedRoutes2() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/PersonHandler2.java").toUri().toString();
+        TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
+        TextDocumentInfo openedDoc = harness.openDocument(doc);
 
-		List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
+        List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
 
-		assertEquals(3, codeLenses.size());
+        assertEquals(3, codeLenses.size());
 
-		assertTrue(containsCodeLens(codeLenses, "GET /person/{id} - Accept: application/json", 9, 29, 9, 38));
-		assertTrue(containsCodeLens(codeLenses, "POST / - Accept: application/json - Content-Type: application/json,application/pdf", 13, 29, 13, 41));
-		assertTrue(containsCodeLens(codeLenses, "GET,HEAD /person - Accept: text/plain,application/json", 17, 29, 17, 39));
-	}
+        assertTrue(containsCodeLens(codeLenses, "GET /person/{id} - Accept: application/json", 9, 29, 9, 38));
+        assertTrue(containsCodeLens(codeLenses, "POST / - Accept: application/json - Content-Type: application/json,application/pdf", 13, 29, 13, 41));
+        assertTrue(containsCodeLens(codeLenses, "GET,HEAD /person - Accept: text/plain,application/json", 17, 29, 17, 39));
+    }
 
-	@Test
-	public void testRoutesCodeLensesNestedRoutes3() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/PersonHandler3.java").toUri().toString();
-		TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
-		TextDocumentInfo openedDoc = harness.openDocument(doc);
+    @Test
+    void testRoutesCodeLensesNestedRoutes3() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/PersonHandler3.java").toUri().toString();
+        TextDocumentInfo doc = harness.getOrReadFile(new File(new URI(docUri)), LanguageId.JAVA.getId());
+        TextDocumentInfo openedDoc = harness.openDocument(doc);
 
-		List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
+        List<? extends CodeLens> codeLenses = harness.getCodeLenses(openedDoc);
 
-		assertEquals(6, codeLenses.size());
-/*
-		assertTrue(containsCodeLens(codeLenses, "GET /person/{id} - Accept: application/json", 9, 29, 9, 38));
-		assertTrue(containsCodeLens(codeLenses, "POST / - Accept: application/json - Content-Type: application/json, application/pdf", 13, 29, 13, 41));
-		assertTrue(containsCodeLens(codeLenses, "GET, HEAD /person - Accept: text/plain, application/json", 17, 29, 17, 39));
-*/
-	}
+        assertEquals(6, codeLenses.size());
+        /*
+            assertTrue(containsCodeLens(codeLenses, "GET /person/{id} - Accept: application/json", 9, 29, 9, 38));
+            assertTrue(containsCodeLens(codeLenses, "POST / - Accept: application/json - Content-Type: application/json, application/pdf", 13, 29, 13, 41));
+            assertTrue(containsCodeLens(codeLenses, "GET, HEAD /person - Accept: text/plain, application/json", 17, 29, 17, 39));
+    */
+    }
 
 	private boolean containsCodeLens(List<? extends CodeLens> codeLenses, String commandTitle, int startLine, int startPosition, int endLine, int endPosition) {
 		for (CodeLens codeLens : codeLenses) {

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.Arrays;
@@ -23,9 +23,9 @@ import java.util.stream.Collectors;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -37,12 +37,12 @@ import org.springframework.ide.vscode.boot.java.requestmapping.WebfluxHandlerInf
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class WebFluxMappingSymbolProviderTest {
@@ -58,7 +58,7 @@ public class WebFluxMappingSymbolProviderTest {
 
 	private File directory;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		directory = new File(ProjectsHarness.class.getResource("/test-projects/test-webflux-project/").toURI());
@@ -71,203 +71,203 @@ public class WebFluxMappingSymbolProviderTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testSimpleRequestMappingSymbol() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/UserController.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(4, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/users -- GET - Content-Type: application/json", docUri, 13, 1, 13, 74));
-		assertTrue(containsSymbol(symbols, "@/users/{username} -- GET - Content-Type: application/json", docUri, 18, 1, 18, 85));
+    @Test
+    void testSimpleRequestMappingSymbol() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/UserController.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(4, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/users -- GET - Content-Type: application/json", docUri, 13, 1, 13, 74));
+        assertTrue(containsSymbol(symbols, "@/users/{username} -- GET - Content-Type: application/json", docUri, 18, 1, 18, 85));
 
-		List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
-		assertEquals(1, addon.size());
-		assertEquals("userController", ((BeansSymbolAddOnInformation)addon.get(0)).getBeanID());
-	}
+        List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
+        assertEquals(1, addon.size());
+        assertEquals("userController", ((BeansSymbolAddOnInformation) addon.get(0)).getBeanID());
+    }
 
-	@Test
-	public void testRoutesMappingSymbols() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/QuoteRouter.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(6, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/hello -- GET - Accept: text/plain", docUri, 22, 5, 22, 70));
-		assertTrue(containsSymbol(symbols, "@/echo -- POST - Accept: text/plain - Content-Type: text/plain", docUri, 23, 5, 23, 101));
-		assertTrue(containsSymbol(symbols, "@/quotes -- GET - Accept: application/json", docUri, 24, 5, 24, 86));
-		assertTrue(containsSymbol(symbols, "@/quotes -- GET - Accept: application/stream+json", docUri, 25, 5, 25, 94));
+    @Test
+    void testRoutesMappingSymbols() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/QuoteRouter.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(6, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/hello -- GET - Accept: text/plain", docUri, 22, 5, 22, 70));
+        assertTrue(containsSymbol(symbols, "@/echo -- POST - Accept: text/plain - Content-Type: text/plain", docUri, 23, 5, 23, 101));
+        assertTrue(containsSymbol(symbols, "@/quotes -- GET - Accept: application/json", docUri, 24, 5, 24, 86));
+        assertTrue(containsSymbol(symbols, "@/quotes -- GET - Accept: application/stream+json", docUri, 25, 5, 25, 94));
 
-		List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
-		assertEquals(10, addons.size());
+        List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
+        assertEquals(10, addons.size());
 
-		WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/hello", "GET").get(0);
-		assertEquals("/hello", handlerInfo1.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
-		assertEquals(0, handlerInfo1.getContentTypes().length);
-		assertEquals("[TEXT_PLAIN]", Arrays.toString(handlerInfo1.getAcceptTypes()));
-		assertEquals("org.test.QuoteHandler", handlerInfo1.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> hello(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/hello", "GET").get(0);
+        assertEquals("/hello", handlerInfo1.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
+        assertEquals(0, handlerInfo1.getContentTypes().length);
+        assertEquals("[TEXT_PLAIN]", Arrays.toString(handlerInfo1.getAcceptTypes()));
+        assertEquals("org.test.QuoteHandler", handlerInfo1.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> hello(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/echo", "POST").get(0);
-		assertEquals("/echo", handlerInfo2.getPath());
-		assertEquals("[POST]", Arrays.toString(handlerInfo2.getHttpMethods()));
-		assertEquals("[TEXT_PLAIN]", Arrays.toString(handlerInfo2.getContentTypes()));
-		assertEquals("[TEXT_PLAIN]", Arrays.toString(handlerInfo2.getAcceptTypes()));
-		assertEquals("org.test.QuoteHandler", handlerInfo2.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> echo(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/echo", "POST").get(0);
+        assertEquals("/echo", handlerInfo2.getPath());
+        assertEquals("[POST]", Arrays.toString(handlerInfo2.getHttpMethods()));
+        assertEquals("[TEXT_PLAIN]", Arrays.toString(handlerInfo2.getContentTypes()));
+        assertEquals("[TEXT_PLAIN]", Arrays.toString(handlerInfo2.getAcceptTypes()));
+        assertEquals("org.test.QuoteHandler", handlerInfo2.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> echo(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/quotes", "GET").get(0);
-		assertEquals("/quotes", handlerInfo3.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo3.getHttpMethods()));
-		assertEquals(0, handlerInfo3.getContentTypes().length);
-		assertEquals("[APPLICATION_STREAM_JSON]", Arrays.toString(handlerInfo3.getAcceptTypes()));
-		assertEquals("org.test.QuoteHandler", handlerInfo3.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> streamQuotes(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/quotes", "GET").get(0);
+        assertEquals("/quotes", handlerInfo3.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo3.getHttpMethods()));
+        assertEquals(0, handlerInfo3.getContentTypes().length);
+        assertEquals("[APPLICATION_STREAM_JSON]", Arrays.toString(handlerInfo3.getAcceptTypes()));
+        assertEquals("org.test.QuoteHandler", handlerInfo3.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> streamQuotes(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo4 = getWebfluxHandler(addons, "/quotes", "GET").get(1);
-		assertEquals("/quotes", handlerInfo4.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo4.getHttpMethods()));
-		assertEquals(0, handlerInfo4.getContentTypes().length);
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo4.getAcceptTypes()));
-		assertEquals("org.test.QuoteHandler", handlerInfo4.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> fetchQuotes(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo4.getHandlerMethod());
-	}
+        WebfluxHandlerInformation handlerInfo4 = getWebfluxHandler(addons, "/quotes", "GET").get(1);
+        assertEquals("/quotes", handlerInfo4.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo4.getHttpMethods()));
+        assertEquals(0, handlerInfo4.getContentTypes().length);
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo4.getAcceptTypes()));
+        assertEquals("org.test.QuoteHandler", handlerInfo4.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> fetchQuotes(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo4.getHandlerMethod());
+    }
 
-	@Test
-	public void testNestedRoutesMappingSymbols1() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter1.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(5, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/person/{id} -- GET - Accept: application/json", docUri, 27, 6, 27, 45));
-		assertTrue(containsSymbol(symbols, "@/person/ -- POST - Content-Type: application/json", docUri, 29, 6, 29, 83));
-		assertTrue(containsSymbol(symbols, "@/person -- GET - Accept: application/json", docUri, 28, 7, 28, 60));
+    @Test
+    void testNestedRoutesMappingSymbols1() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter1.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(5, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/person/{id} -- GET - Accept: application/json", docUri, 27, 6, 27, 45));
+        assertTrue(containsSymbol(symbols, "@/person/ -- POST - Content-Type: application/json", docUri, 29, 6, 29, 83));
+        assertTrue(containsSymbol(symbols, "@/person -- GET - Accept: application/json", docUri, 28, 7, 28, 60));
 
-		List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
-		assertEquals(8, addons.size());
+        List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
+        assertEquals(8, addons.size());
 
-		WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/person/{id}", "GET").get(0);
-		assertEquals("/person/{id}", handlerInfo1.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
-		assertEquals(0, handlerInfo1.getContentTypes().length);
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo1.getAcceptTypes()));
-		assertEquals("org.test.PersonHandler1", handlerInfo1.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/person/{id}", "GET").get(0);
+        assertEquals("/person/{id}", handlerInfo1.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
+        assertEquals(0, handlerInfo1.getContentTypes().length);
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo1.getAcceptTypes()));
+        assertEquals("org.test.PersonHandler1", handlerInfo1.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/person/", "POST").get(0);
-		assertEquals("/person/", handlerInfo2.getPath());
-		assertEquals("[POST]", Arrays.toString(handlerInfo2.getHttpMethods()));
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo2.getContentTypes()));
-		assertEquals(0, handlerInfo2.getAcceptTypes().length);
-		assertEquals("org.test.PersonHandler1", handlerInfo2.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> createPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/person/", "POST").get(0);
+        assertEquals("/person/", handlerInfo2.getPath());
+        assertEquals("[POST]", Arrays.toString(handlerInfo2.getHttpMethods()));
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo2.getContentTypes()));
+        assertEquals(0, handlerInfo2.getAcceptTypes().length);
+        assertEquals("org.test.PersonHandler1", handlerInfo2.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> createPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/person", "GET").get(0);
-		assertEquals("/person", handlerInfo3.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo3.getHttpMethods()));
-		assertEquals(0, handlerInfo3.getContentTypes().length);
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo3.getAcceptTypes()));
-		assertEquals("org.test.PersonHandler1", handlerInfo3.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> listPeople(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
-	}
+        WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/person", "GET").get(0);
+        assertEquals("/person", handlerInfo3.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo3.getHttpMethods()));
+        assertEquals(0, handlerInfo3.getContentTypes().length);
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo3.getAcceptTypes()));
+        assertEquals("org.test.PersonHandler1", handlerInfo3.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> listPeople(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
+    }
 
-	@Test
-	public void testNestedRoutesMappingSymbols2() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter2.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(5, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/person/{id} -- GET - Accept: application/json", docUri, 29, 6, 29, 45));
-		assertTrue(containsSymbol(symbols, "@/ -- POST - Accept: application/json - Content-Type: application/json,application/pdf", docUri, 31, 6, 31, 117));
-		assertTrue(containsSymbol(symbols, "@/person -- GET,HEAD - Accept: text/plain,application/json", docUri, 30, 7, 30, 113));
+    @Test
+    void testNestedRoutesMappingSymbols2() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter2.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(5, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/person/{id} -- GET - Accept: application/json", docUri, 29, 6, 29, 45));
+        assertTrue(containsSymbol(symbols, "@/ -- POST - Accept: application/json - Content-Type: application/json,application/pdf", docUri, 31, 6, 31, 117));
+        assertTrue(containsSymbol(symbols, "@/person -- GET,HEAD - Accept: text/plain,application/json", docUri, 30, 7, 30, 113));
 
-		List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
-		assertEquals(8, addons.size());
+        List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
+        assertEquals(8, addons.size());
 
-		WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/person/{id}", "GET").get(0);
-		assertEquals("/person/{id}", handlerInfo1.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
-		assertEquals(0, handlerInfo1.getContentTypes().length);
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo1.getAcceptTypes()));
-		assertEquals("org.test.PersonHandler2", handlerInfo1.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/person/{id}", "GET").get(0);
+        assertEquals("/person/{id}", handlerInfo1.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
+        assertEquals(0, handlerInfo1.getContentTypes().length);
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo1.getAcceptTypes()));
+        assertEquals("org.test.PersonHandler2", handlerInfo1.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/", "POST").get(0);
-		assertEquals("/", handlerInfo2.getPath());
-		assertEquals("[POST]", Arrays.toString(handlerInfo2.getHttpMethods()));
-		assertEquals("[APPLICATION_JSON, APPLICATION_PDF]", Arrays.toString(handlerInfo2.getContentTypes()));
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo2.getAcceptTypes()));
-		assertEquals("org.test.PersonHandler2", handlerInfo2.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> createPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/", "POST").get(0);
+        assertEquals("/", handlerInfo2.getPath());
+        assertEquals("[POST]", Arrays.toString(handlerInfo2.getHttpMethods()));
+        assertEquals("[APPLICATION_JSON, APPLICATION_PDF]", Arrays.toString(handlerInfo2.getContentTypes()));
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo2.getAcceptTypes()));
+        assertEquals("org.test.PersonHandler2", handlerInfo2.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> createPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/person", "HEAD").get(0);
-		assertEquals("/person", handlerInfo3.getPath());
-		assertEquals("[GET, HEAD]", Arrays.toString(handlerInfo3.getHttpMethods()));
-		assertEquals(0, handlerInfo3.getContentTypes().length);
-		assertEquals("[TEXT_PLAIN, APPLICATION_JSON]", Arrays.toString(handlerInfo3.getAcceptTypes()));
-		assertEquals("org.test.PersonHandler2", handlerInfo3.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> listPeople(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
-	}
+        WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/person", "HEAD").get(0);
+        assertEquals("/person", handlerInfo3.getPath());
+        assertEquals("[GET, HEAD]", Arrays.toString(handlerInfo3.getHttpMethods()));
+        assertEquals(0, handlerInfo3.getContentTypes().length);
+        assertEquals("[TEXT_PLAIN, APPLICATION_JSON]", Arrays.toString(handlerInfo3.getAcceptTypes()));
+        assertEquals("org.test.PersonHandler2", handlerInfo3.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> listPeople(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
+    }
 
-	@Test
-	public void testNestedRoutesMappingSymbols3() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter3.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(8, symbols.size());
+    @Test
+    void testNestedRoutesMappingSymbols3() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/NestedRouter3.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(8, symbols.size());
 
-		assertTrue(containsSymbol(symbols, "@/person/sub1/sub2/{id} -- GET - Accept: application/json", docUri, 29, 7, 29, 46));
-		assertTrue(containsSymbol(symbols, "@/person/sub1/sub2 -- GET - Accept: application/json", docUri, 30, 8, 30, 61));
-		assertTrue(containsSymbol(symbols, "@/person/sub1/sub2/nestedGet -- GET", docUri, 31, 9, 31, 56));
-		assertTrue(containsSymbol(symbols, "@/person/sub1/andNestPath/andNestPathGET -- GET", docUri, 33, 5, 33, 54));
-		assertTrue(containsSymbol(symbols, "@/person/ -- POST - Content-Type: application/json", docUri, 34, 5, 34, 82));
-		assertTrue(containsSymbol(symbols, "@/nestedDelete -- DELETE", docUri, 35, 42, 35, 93));
+        assertTrue(containsSymbol(symbols, "@/person/sub1/sub2/{id} -- GET - Accept: application/json", docUri, 29, 7, 29, 46));
+        assertTrue(containsSymbol(symbols, "@/person/sub1/sub2 -- GET - Accept: application/json", docUri, 30, 8, 30, 61));
+        assertTrue(containsSymbol(symbols, "@/person/sub1/sub2/nestedGet -- GET", docUri, 31, 9, 31, 56));
+        assertTrue(containsSymbol(symbols, "@/person/sub1/andNestPath/andNestPathGET -- GET", docUri, 33, 5, 33, 54));
+        assertTrue(containsSymbol(symbols, "@/person/ -- POST - Content-Type: application/json", docUri, 34, 5, 34, 82));
+        assertTrue(containsSymbol(symbols, "@/nestedDelete -- DELETE", docUri, 35, 42, 35, 93));
 
-		List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
-		assertEquals(14, addons.size());
+        List<? extends SymbolAddOnInformation> addons = indexer.getAdditonalInformation(docUri);
+        assertEquals(14, addons.size());
 
-		WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/person/sub1/sub2/{id}", "GET").get(0);
-		assertEquals("/person/sub1/sub2/{id}", handlerInfo1.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
-		assertEquals(0, handlerInfo1.getContentTypes().length);
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo1.getAcceptTypes()));
-		assertEquals("org.test.PersonHandler3", handlerInfo1.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "/person/sub1/sub2/{id}", "GET").get(0);
+        assertEquals("/person/sub1/sub2/{id}", handlerInfo1.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo1.getHttpMethods()));
+        assertEquals(0, handlerInfo1.getContentTypes().length);
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo1.getAcceptTypes()));
+        assertEquals("org.test.PersonHandler3", handlerInfo1.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo1.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/person/sub1/sub2", "GET").get(0);
-		assertEquals("/person/sub1/sub2", handlerInfo2.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo2.getHttpMethods()));
-		assertEquals(0, handlerInfo2.getContentTypes().length);
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo2.getAcceptTypes()));
-		assertEquals("org.test.PersonHandler3", handlerInfo1.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> listPeople(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "/person/sub1/sub2", "GET").get(0);
+        assertEquals("/person/sub1/sub2", handlerInfo2.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo2.getHttpMethods()));
+        assertEquals(0, handlerInfo2.getContentTypes().length);
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo2.getAcceptTypes()));
+        assertEquals("org.test.PersonHandler3", handlerInfo1.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> listPeople(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo2.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/person/sub1/sub2/nestedGet", "GET").get(0);
-		assertEquals("/person/sub1/sub2/nestedGet", handlerInfo3.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo3.getHttpMethods()));
-		assertEquals(0, handlerInfo3.getContentTypes().length);
-		assertEquals(0, handlerInfo3.getAcceptTypes().length);
-		assertEquals("org.test.PersonHandler3", handlerInfo1.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "/person/sub1/sub2/nestedGet", "GET").get(0);
+        assertEquals("/person/sub1/sub2/nestedGet", handlerInfo3.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo3.getHttpMethods()));
+        assertEquals(0, handlerInfo3.getContentTypes().length);
+        assertEquals(0, handlerInfo3.getAcceptTypes().length);
+        assertEquals("org.test.PersonHandler3", handlerInfo1.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo3.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo4 = getWebfluxHandler(addons, "/person/sub1/andNestPath/andNestPathGET", "GET").get(0);
-		assertEquals("/person/sub1/andNestPath/andNestPathGET", handlerInfo4.getPath());
-		assertEquals("[GET]", Arrays.toString(handlerInfo4.getHttpMethods()));
-		assertEquals(0, handlerInfo4.getContentTypes().length);
-		assertEquals(0, handlerInfo4.getAcceptTypes().length);
-		assertEquals("org.test.PersonHandler3", handlerInfo4.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo4.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo4 = getWebfluxHandler(addons, "/person/sub1/andNestPath/andNestPathGET", "GET").get(0);
+        assertEquals("/person/sub1/andNestPath/andNestPathGET", handlerInfo4.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerInfo4.getHttpMethods()));
+        assertEquals(0, handlerInfo4.getContentTypes().length);
+        assertEquals(0, handlerInfo4.getAcceptTypes().length);
+        assertEquals("org.test.PersonHandler3", handlerInfo4.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> getPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo4.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo5 = getWebfluxHandler(addons, "/person/", "POST").get(0);
-		assertEquals("/person/", handlerInfo5.getPath());
-		assertEquals("[POST]", Arrays.toString(handlerInfo5.getHttpMethods()));
-		assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo5.getContentTypes()));
-		assertEquals(0, handlerInfo5.getAcceptTypes().length);
-		assertEquals("org.test.PersonHandler3", handlerInfo5.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> createPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo5.getHandlerMethod());
+        WebfluxHandlerInformation handlerInfo5 = getWebfluxHandler(addons, "/person/", "POST").get(0);
+        assertEquals("/person/", handlerInfo5.getPath());
+        assertEquals("[POST]", Arrays.toString(handlerInfo5.getHttpMethods()));
+        assertEquals("[APPLICATION_JSON]", Arrays.toString(handlerInfo5.getContentTypes()));
+        assertEquals(0, handlerInfo5.getAcceptTypes().length);
+        assertEquals("org.test.PersonHandler3", handlerInfo5.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> createPerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo5.getHandlerMethod());
 
-		WebfluxHandlerInformation handlerInfo6 = getWebfluxHandler(addons, "/nestedDelete", "DELETE").get(0);
-		assertEquals("/nestedDelete", handlerInfo6.getPath());
-		assertEquals("[DELETE]", Arrays.toString(handlerInfo6.getHttpMethods()));
-		assertEquals(0, handlerInfo6.getContentTypes().length);
-		assertEquals(0, handlerInfo6.getAcceptTypes().length);
-		assertEquals("org.test.PersonHandler3", handlerInfo6.getHandlerClass());
-		assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> deletePerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo6.getHandlerMethod());
-	}
+        WebfluxHandlerInformation handlerInfo6 = getWebfluxHandler(addons, "/nestedDelete", "DELETE").get(0);
+        assertEquals("/nestedDelete", handlerInfo6.getPath());
+        assertEquals("[DELETE]", Arrays.toString(handlerInfo6.getHttpMethods()));
+        assertEquals(0, handlerInfo6.getContentTypes().length);
+        assertEquals(0, handlerInfo6.getAcceptTypes().length);
+        assertEquals("org.test.PersonHandler3", handlerInfo6.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> deletePerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerInfo6.getHandlerMethod());
+    }
 
 	private boolean containsSymbol(List<? extends WorkspaceSymbol> symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {
 		for (Iterator<? extends WorkspaceSymbol> iterator = symbols.iterator(); iterator.hasNext();) {

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

@@ -10,103 +10,107 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.requestmapping.WebfluxElementsInformation;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 /**
  * @author Martin Lippert
  */
 public class WebfluxElementsInformationTest {
 
-	@Test
-	public void testContainsSingleCharacterRange() {
-		Range range = new Range(new Position(3, 10), new Position(3, 10));
-		WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[] {range});
-		
-		assertFalse(information.contains(new Position(3, 9)));
-		assertTrue(information.contains(new Position(3, 10)));
-		assertFalse(information.contains(new Position(3, 11)));
-	}
+    @Test
+    void testContainsSingleCharacterRange() {
+        Range range = new Range(new Position(3, 10), new Position(3, 10));
+        WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[]{range});
 
-	@Test
-	public void testContainsSingleLineRange() {
-		Range range = new Range(new Position(3, 10), new Position(3, 20));
-		WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[] {range});
-		
-		assertFalse(information.contains(new Position(3, 5)));
-		assertTrue(information.contains(new Position(3, 11)));
-		assertFalse(information.contains(new Position(3, 25)));
-		
-		assertFalse(information.contains(new Position(1, 12)));
-		assertFalse(information.contains(new Position(2, 1)));
-		assertFalse(information.contains(new Position(4, 21)));
-	}
+        assertFalse(information.contains(new Position(3, 9)));
+        assertTrue(information.contains(new Position(3, 10)));
+        assertFalse(information.contains(new Position(3, 11)));
+    }
 
-	@Test
-	public void testContainsMultipleLineRange() {
-		Range range = new Range(new Position(2, 10), new Position(4, 5));
-		WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[] {range});
-		
-		assertFalse(information.contains(new Position(1, 1)));
-		assertFalse(information.contains(new Position(1, 11)));
-		assertFalse(information.contains(new Position(2, 1)));
-		
-		assertFalse(information.contains(new Position(2, 9)));
-		assertTrue(information.contains(new Position(2, 10)));
-		assertTrue(information.contains(new Position(2, 11)));
-		assertTrue(information.contains(new Position(2, 40)));
-		assertTrue(information.contains(new Position(3, 1)));
-		assertTrue(information.contains(new Position(3, 12)));
-		assertTrue(information.contains(new Position(3, 50)));
-		assertTrue(information.contains(new Position(4, 1)));
-		assertTrue(information.contains(new Position(4, 5)));
-		assertFalse(information.contains(new Position(4, 6)));
-		assertFalse(information.contains(new Position(4, 10)));
-		
-		assertFalse(information.contains(new Position(5, 1)));
-		assertFalse(information.contains(new Position(5, 20)));
-	}
-	
-	@Test
-	public void testContainsMultipleRanges() {
-		Range range1 = new Range(new Position(2, 10), new Position(3, 20));
-		Range range2 = new Range(new Position(5, 2), new Position(5, 3));
-		Range range3 = new Range(new Position(10, 10), new Position(20, 20));
-		Range range4 = new Range(new Position(4, 40), new Position(6, 3));
+    @Test
+    void testContainsSingleLineRange() {
+        Range range = new Range(new Position(3, 10), new Position(3, 20));
+        WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[]{range});
 
-		WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[] {range1, range2, range3, range4});
-		
-		assertFalse(information.contains(new Position(2, 9)));
-		assertTrue(information.contains(new Position(2, 10)));
-		assertTrue(information.contains(new Position(3, 19)));
-		assertTrue(information.contains(new Position(3, 20)));
-		assertFalse(information.contains(new Position(3, 21)));
+        assertFalse(information.contains(new Position(3, 5)));
+        assertTrue(information.contains(new Position(3, 11)));
+        assertFalse(information.contains(new Position(3, 25)));
 
-		assertTrue(information.contains(new Position(5, 1)));
-		assertTrue(information.contains(new Position(5, 2)));
-		assertTrue(information.contains(new Position(5, 3)));
-		assertTrue(information.contains(new Position(5, 4)));
-		
-		assertFalse(information.contains(new Position(4, 39)));
-		assertTrue(information.contains(new Position(4, 40)));
-		assertTrue(information.contains(new Position(4, 41)));
+        assertFalse(information.contains(new Position(1, 12)));
+        assertFalse(information.contains(new Position(2, 1)));
+        assertFalse(information.contains(new Position(4, 21)));
+    }
 
-		assertTrue(information.contains(new Position(6, 2)));
-		assertTrue(information.contains(new Position(6, 3)));
-		assertFalse(information.contains(new Position(6, 4)));
+    @Test
+    void testContainsMultipleLineRange() {
+        Range range = new Range(new Position(2, 10), new Position(4, 5));
+        WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[]{range});
 
-		assertFalse(information.contains(new Position(9, 10)));
-		assertFalse(information.contains(new Position(10, 9)));
-		assertTrue(information.contains(new Position(10, 10)));
-		assertTrue(information.contains(new Position(10, 21)));
-		assertTrue(information.contains(new Position(15, 3)));
-		assertTrue(information.contains(new Position(20, 20)));
-		assertFalse(information.contains(new Position(20, 21)));
-		assertFalse(information.contains(new Position(23, 1)));
-	}
+        assertFalse(information.contains(new Position(1, 1)));
+        assertFalse(information.contains(new Position(1, 11)));
+        assertFalse(information.contains(new Position(2, 1)));
+
+        assertFalse(information.contains(new Position(2, 9)));
+        assertTrue(information.contains(new Position(2, 10)));
+        assertTrue(information.contains(new Position(2, 11)));
+        assertTrue(information.contains(new Position(2, 40)));
+        assertTrue(information.contains(new Position(3, 1)));
+        assertTrue(information.contains(new Position(3, 12)));
+        assertTrue(information.contains(new Position(3, 50)));
+        assertTrue(information.contains(new Position(4, 1)));
+        assertTrue(information.contains(new Position(4, 5)));
+        assertFalse(information.contains(new Position(4, 6)));
+        assertFalse(information.contains(new Position(4, 10)));
+
+        assertFalse(information.contains(new Position(5, 1)));
+        assertFalse(information.contains(new Position(5, 20)));
+    }
+
+    @Test
+    void testContainsMultipleRanges() {
+        Range range1 = new Range(new Position(2, 10), new Position(3, 20));
+        Range range2 = new Range(new Position(5, 2), new Position(5, 3));
+        Range range3 = new Range(new Position(10, 10), new Position(20, 20));
+        Range range4 = new Range(new Position(4, 40), new Position(6, 3));
+
+        WebfluxElementsInformation information = new WebfluxElementsInformation(new Range[]{range1, range2, range3, range4});
+
+        assertFalse(information.contains(new Position(2, 9)));
+        assertTrue(information.contains(new Position(2, 10)));
+        assertTrue(information.contains(new Position(3, 19)));
+        assertTrue(information.contains(new Position(3, 20)));
+        assertFalse(information.contains(new Position(3, 21)));
+
+        assertTrue(information.contains(new Position(5, 1)));
+        assertTrue(information.contains(new Position(5, 2)));
+        assertTrue(information.contains(new Position(5, 3)));
+        assertTrue(information.contains(new Position(5, 4)));
+
+        assertFalse(information.contains(new Position(4, 39)));
+        assertTrue(information.contains(new Position(4, 40)));
+        assertTrue(information.contains(new Position(4, 41)));
+
+        assertTrue(information.contains(new Position(6, 2)));
+        assertTrue(information.contains(new Position(6, 3)));
+        assertFalse(information.contains(new Position(6, 4)));
+
+        assertFalse(information.contains(new Position(9, 10)));
+        assertFalse(information.contains(new Position(10, 9)));
+        assertTrue(information.contains(new Position(10, 10)));
+        assertTrue(information.contains(new Position(10, 21)));
+        assertTrue(information.contains(new Position(15, 3)));
+        assertTrue(information.contains(new Position(20, 20)));
+        assertFalse(information.contains(new Position(20, 21)));
+        assertFalse(information.contains(new Position(23, 1)));
+    }
 
 }

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

@@ -14,60 +14,60 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SpringBootUpgradeTest {
-	
-	@Test
-	public void recipeIdChain1() throws Exception {
-		assertEquals(List.of(
-				"org.openrewrite.java.spring.boot2.SpringBoot1To2Migration",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_1",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_3",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_4",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5"
-		), SpringBootUpgrade.createRecipeIdsChain(1, 3, 2, 5));
-	}
 
-	@Test
-	public void recipeIdChain2() throws Exception {
-		assertEquals(List.of(
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_3",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_4",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7"
-		), SpringBootUpgrade.createRecipeIdsChain(2, 2, 2, 7));
-	}
+    @Test
+    void recipeIdChain1() throws Exception {
+        assertEquals(List.of(
+                "org.openrewrite.java.spring.boot2.SpringBoot1To2Migration",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_1",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_3",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_4",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5"
+        ), SpringBootUpgrade.createRecipeIdsChain(1, 3, 2, 5));
+    }
 
-	@Test
-	public void recipeIdChain3() throws Exception {
-		assertEquals(List.of(
-				"org.openrewrite.java.spring.boot2.SpringBoot1To2Migration",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_1",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_3",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_4",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6",
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
-				"org.springframework.sts.java.spring.boot3.UpgradeSpringBoot_3_0"
-		), SpringBootUpgrade.createRecipeIdsChain(1, 3, 3, 0));
-	}
-	
-	@Test
-	public void recipeIdChain4() throws Exception {
-		assertEquals(List.of(
-				"org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2"
-		), SpringBootUpgrade.createRecipeIdsChain(2, 2, 2, 2));
-	}
+    @Test
+    void recipeIdChain2() throws Exception {
+        assertEquals(List.of(
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_3",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_4",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7"
+        ), SpringBootUpgrade.createRecipeIdsChain(2, 2, 2, 7));
+    }
 
-	@Test
-	public void recipeIdChain5() throws Exception {
-		assertEquals(List.of(
-		), SpringBootUpgrade.createRecipeIdsChain(2, 7, 2, 2));
-	}
+    @Test
+    void recipeIdChain3() throws Exception {
+        assertEquals(List.of(
+                "org.openrewrite.java.spring.boot2.SpringBoot1To2Migration",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_1",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_3",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_4",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_6",
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7",
+                "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_0"
+        ), SpringBootUpgrade.createRecipeIdsChain(1, 3, 3, 0));
+    }
+
+    @Test
+    void recipeIdChain4() throws Exception {
+        assertEquals(List.of(
+                "org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_2"
+        ), SpringBootUpgrade.createRecipeIdsChain(2, 2, 2, 2));
+    }
+
+    @Test
+    void recipeIdChain5() throws Exception {
+        assertEquals(List.of(
+                ), SpringBootUpgrade.createRecipeIdsChain(2, 7, 2, 2));
+    }
 }
 

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

@@ -10,16 +10,16 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.scope.test;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.InputStream;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.eclipse.lsp4j.CompletionItem;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.bootiful.BootLanguageServerTest;
@@ -30,12 +30,12 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.languageserver.testharness.TestAsserts;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class ScopeCompletionTest {
@@ -43,7 +43,7 @@ public class ScopeCompletionTest {
 	@Autowired private BootLanguageServerHarness harness;
 	private Editor editor;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		IJavaProject testProject = ProjectsHarness.INSTANCE.mavenProject("test-annotations");
 		harness.useProject(testProject);
@@ -54,96 +54,96 @@ public class ScopeCompletionTest {
 //		return testProject;
 //	}
 
-	@Test
-	public void testEmptyBracketsCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(<*>)");
-		assertAnnotationCompletions(
-				"@Scope(\"application\"<*>)",
-				"@Scope(\"globalSession\"<*>)",
-				"@Scope(\"prototype\"<*>)",
-				"@Scope(\"request\"<*>)",
-				"@Scope(\"session\"<*>)",
-				"@Scope(\"singleton\"<*>)",
-				"@Scope(\"websocket\"<*>)");
-	}
+    @Test
+    void testEmptyBracketsCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(<*>)");
+        assertAnnotationCompletions(
+                "@Scope(\"application\"<*>)",
+                "@Scope(\"globalSession\"<*>)",
+                "@Scope(\"prototype\"<*>)",
+                "@Scope(\"request\"<*>)",
+                "@Scope(\"session\"<*>)",
+                "@Scope(\"singleton\"<*>)",
+                "@Scope(\"websocket\"<*>)");
+    }
 
-	@Test
-	public void testEmptyStringLiteralCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(\"<*>\")");
-		assertAnnotationCompletions(
-				"@Scope(\"application\"<*>)",
-				"@Scope(\"globalSession\"<*>)",
-				"@Scope(\"prototype\"<*>)",
-				"@Scope(\"request\"<*>)",
-				"@Scope(\"session\"<*>)",
-				"@Scope(\"singleton\"<*>)",
-				"@Scope(\"websocket\"<*>)");
-	}
+    @Test
+    void testEmptyStringLiteralCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(\"<*>\")");
+        assertAnnotationCompletions(
+                "@Scope(\"application\"<*>)",
+                "@Scope(\"globalSession\"<*>)",
+                "@Scope(\"prototype\"<*>)",
+                "@Scope(\"request\"<*>)",
+                "@Scope(\"session\"<*>)",
+                "@Scope(\"singleton\"<*>)",
+                "@Scope(\"websocket\"<*>)");
+    }
 
-	@Test
-	public void testEmptyValueCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(value=<*>)");
-		assertAnnotationCompletions(
-				"@Scope(value=\"application\"<*>)",
-				"@Scope(value=\"globalSession\"<*>)",
-				"@Scope(value=\"prototype\"<*>)",
-				"@Scope(value=\"request\"<*>)",
-				"@Scope(value=\"session\"<*>)",
-				"@Scope(value=\"singleton\"<*>)",
-				"@Scope(value=\"websocket\"<*>)");
-	}
+    @Test
+    void testEmptyValueCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(value=<*>)");
+        assertAnnotationCompletions(
+                "@Scope(value=\"application\"<*>)",
+                "@Scope(value=\"globalSession\"<*>)",
+                "@Scope(value=\"prototype\"<*>)",
+                "@Scope(value=\"request\"<*>)",
+                "@Scope(value=\"session\"<*>)",
+                "@Scope(value=\"singleton\"<*>)",
+                "@Scope(value=\"websocket\"<*>)");
+    }
 
-	@Test
-	public void testEmptyValueStringLiteralCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(value=\"<*>\")");
-		assertAnnotationCompletions(
-				"@Scope(value=\"application\"<*>)",
-				"@Scope(value=\"globalSession\"<*>)",
-				"@Scope(value=\"prototype\"<*>)",
-				"@Scope(value=\"request\"<*>)",
-				"@Scope(value=\"session\"<*>)",
-				"@Scope(value=\"singleton\"<*>)",
-				"@Scope(value=\"websocket\"<*>)");
-	}
+    @Test
+    void testEmptyValueStringLiteralCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(value=\"<*>\")");
+        assertAnnotationCompletions(
+                "@Scope(value=\"application\"<*>)",
+                "@Scope(value=\"globalSession\"<*>)",
+                "@Scope(value=\"prototype\"<*>)",
+                "@Scope(value=\"request\"<*>)",
+                "@Scope(value=\"session\"<*>)",
+                "@Scope(value=\"singleton\"<*>)",
+                "@Scope(value=\"websocket\"<*>)");
+    }
 
-	@Test
-	public void testPrefixWithClosingQuotesCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(\"pro<*>\")");
-		assertAnnotationCompletions(
-				"@Scope(\"prototype\"<*>)");
-	}
+    @Test
+    void testPrefixWithClosingQuotesCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(\"pro<*>\")");
+        assertAnnotationCompletions(
+                "@Scope(\"prototype\"<*>)");
+    }
 
-	@Test
-	public void testPrefixWithoutClosingQuotesCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(\"pro<*>)");
-		assertAnnotationCompletions();
-	}
+    @Test
+    void testPrefixWithoutClosingQuotesCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(\"pro<*>)");
+        assertAnnotationCompletions();
+    }
 
-	@Test
-	public void testValuePrefixWithClosingQuotesCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(value=\"pro<*>\")");
-		assertAnnotationCompletions(
-				"@Scope(value=\"prototype\"<*>)");
-	}
+    @Test
+    void testValuePrefixWithClosingQuotesCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(value=\"pro<*>\")");
+        assertAnnotationCompletions(
+                "@Scope(value=\"prototype\"<*>)");
+    }
 
-	@Test
-	public void testValuePrefixWithoutClosingQuotesCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(value=\"pro<*>)");
-		assertAnnotationCompletions();
-	}
+    @Test
+    void testValuePrefixWithoutClosingQuotesCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(value=\"pro<*>)");
+        assertAnnotationCompletions();
+    }
 
-	@Test
-	public void testPrefixReplaceRestCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(\"pro<*>something\")");
-		assertAnnotationCompletions(
-				"@Scope(\"prototype\"<*>)");
-	}
+    @Test
+    void testPrefixReplaceRestCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(\"pro<*>something\")");
+        assertAnnotationCompletions(
+                "@Scope(\"prototype\"<*>)");
+    }
 
-	@Test
-	public void testDifferentMemberNameCompletion() throws Exception {
-		prepareCase("@Scope(\"onClass\")", "@Scope(proxyName=\"<*>\")");
-		assertAnnotationCompletions();
-	}
+    @Test
+    void testDifferentMemberNameCompletion() throws Exception {
+        prepareCase("@Scope(\"onClass\")", "@Scope(proxyName=\"<*>\")");
+        assertAnnotationCompletions();
+    }
 
 	private void prepareCase(String selectedAnnotation, String annotationStatementBeforeTest) throws Exception {
 		InputStream resource = this.getClass().getResourceAsStream("/test-projects/test-annotations/src/main/java/org/test/TestScopeCompletion.java");

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

@@ -10,15 +10,14 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URI;
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -31,13 +30,10 @@ import org.springframework.ide.vscode.languageserver.starter.LanguageServerAutoC
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * @author Alex Boyko
  */
-@RunWith(SpringRunner.class)
-//@BootLanguageServerTest
 @OverrideAutoConfiguration(enabled=false)
 @Import({LanguageServerAutoConf.class, SourceLinksTestConf.class})
 @SpringBootTest(classes={
@@ -57,7 +53,7 @@ public class AdvancedSourceLinksTest {
 	private MavenJavaProject appProject;
 	private MavenJavaProject libraryProject;
 	
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		// Build parent project
 		projects.mavenProject("gs-multi-module-complete");
@@ -67,14 +63,14 @@ public class AdvancedSourceLinksTest {
 		projectObserver.doWithListeners(l -> l.created(appProject));
 	}
 
-	@Test
-	public void linkFromApptoLibrarySource() throws Exception {
-		Optional<String> link = sourceLinks.sourceLinkUrlForFQName(appProject, "hello.service.MyService");
-		assertTrue(link.isPresent());
-		String linkUri = link.get();
-		URI uri = URI.create(linkUri);
-		assertEquals("file", uri.getScheme());
-		assertTrue(linkUri.endsWith("gs-multi-module-complete/library/src/main/java/hello/service/MyService.java#8,14"));
-	}
+    @Test
+    void linkFromApptoLibrarySource() throws Exception {
+        Optional<String> link = sourceLinks.sourceLinkUrlForFQName(appProject, "hello.service.MyService");
+        assertTrue(link.isPresent());
+        String linkUri = link.get();
+        URI uri = URI.create(linkUri);
+        assertEquals("file", uri.getScheme());
+        assertTrue(linkUri.endsWith("gs-multi-module-complete/library/src/main/java/hello/service/MyService.java#8,14"));
+    }
 
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URI;
 import java.net.URL;
@@ -28,8 +28,8 @@ import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.NormalAnnotation;
 import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.links.SourceLinks;
 import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache;
 import org.springframework.ide.vscode.commons.maven.java.MavenJavaProject;
@@ -42,82 +42,82 @@ public class AstParserTest {
 	
 	private MavenJavaProject jp;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		jp =  projects.mavenProject("empty-boot-15-web-app");
 		assertTrue(jp.getIndex().findType("org.springframework.boot.SpringApplication").exists());
 	}
 
-	@Test
-	public void test1() throws Exception {
-		URL sourceUrl = SourceLinks.source(jp, "org.springframework.boot.SpringApplication").get();
-		
-		URI uri = sourceUrl.toURI();
-		
-		String unitName = "SpringApplication";
-		
-		char[] content = IOUtils.toString(uri).toCharArray();
-		
-		CompilationUnit cu = CompilationUnitCache.parse2(content, uri.toString(), unitName, jp);
-		
-		assertNotNull(cu);
-		
-		cu.accept(new ASTVisitor() {
+    @Test
+    void test1() throws Exception {
+        URL sourceUrl = SourceLinks.source(jp, "org.springframework.boot.SpringApplication").get();
 
-			@Override
-			public boolean visit(TypeDeclaration node) {
-				ITypeBinding binding = node.resolveBinding();
-				assertNotNull(binding);
-				return super.visit(node);
-			}
+        URI uri = sourceUrl.toURI();
 
-			@Override
-			public boolean visit(SingleMemberAnnotation node) {
-				IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
-				assertNotNull(annotationBinding);
-				ITypeBinding binding = node.resolveTypeBinding();
-				assertNotNull(binding);
-				return super.visit(node);
-			}
+        String unitName = "SpringApplication";
 
-			@Override
-			public boolean visit(NormalAnnotation node) {
-				IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
-				assertNotNull(annotationBinding);
-				ITypeBinding binding = node.resolveTypeBinding();
-				assertNotNull(binding);
-				return super.visit(node);
-			}
+        char[] content = IOUtils.toString(uri).toCharArray();
 
-			@Override
-			public boolean visit(MarkerAnnotation node) {
-				IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
-				assertNotNull(annotationBinding);
-				ITypeBinding binding = node.resolveTypeBinding();
-				assertNotNull(binding);
-				return super.visit(node);
-			}
+        CompilationUnit cu = CompilationUnitCache.parse2(content, uri.toString(), unitName, jp);
 
-			@Override
-			public boolean visit(MethodDeclaration node) {
-				IMethodBinding binding = node.resolveBinding();
-				assertNotNull(binding);
-				if (node.getReturnType2() != null) {
-					ITypeBinding returnTypeBinding = node.getReturnType2().resolveBinding();
-					assertNotNull(returnTypeBinding);
-				}
-				return super.visit(node);
-			}
+        assertNotNull(cu);
 
-			@Override
-			public boolean visit(FieldDeclaration node) {
-				ITypeBinding binding = node.getType().resolveBinding();
-				assertNotNull(binding);
-				return super.visit(node);
-			}
+        cu.accept(new ASTVisitor() {
 
-		});
-		
-	}
+            @Override
+            public boolean visit(TypeDeclaration node) {
+                ITypeBinding binding = node.resolveBinding();
+                assertNotNull(binding);
+                return super.visit(node);
+            }
+
+            @Override
+            public boolean visit(SingleMemberAnnotation node) {
+                IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
+                assertNotNull(annotationBinding);
+                ITypeBinding binding = node.resolveTypeBinding();
+                assertNotNull(binding);
+                return super.visit(node);
+            }
+
+            @Override
+            public boolean visit(NormalAnnotation node) {
+                IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
+                assertNotNull(annotationBinding);
+                ITypeBinding binding = node.resolveTypeBinding();
+                assertNotNull(binding);
+                return super.visit(node);
+            }
+
+            @Override
+            public boolean visit(MarkerAnnotation node) {
+                IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
+                assertNotNull(annotationBinding);
+                ITypeBinding binding = node.resolveTypeBinding();
+                assertNotNull(binding);
+                return super.visit(node);
+            }
+
+            @Override
+            public boolean visit(MethodDeclaration node) {
+                IMethodBinding binding = node.resolveBinding();
+                assertNotNull(binding);
+                if (node.getReturnType2() != null) {
+                    ITypeBinding returnTypeBinding = node.getReturnType2().resolveBinding();
+                    assertNotNull(returnTypeBinding);
+                }
+                return super.visit(node);
+            }
+
+            @Override
+            public boolean visit(FieldDeclaration node) {
+                ITypeBinding binding = node.getType().resolveBinding();
+                assertNotNull(binding);
+                return super.visit(node);
+            }
+
+        });
+
+    }
 	
 }

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

@@ -10,10 +10,9 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.net.URI;
@@ -22,8 +21,8 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -48,7 +47,7 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * CU Cache tests
@@ -56,7 +55,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @author Alex Boyko
  *
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import({AdHocPropertyHarnessTestConf.class, CompilationUnitCacheTest.TestConf.class})
 public class CompilationUnitCacheTest {
@@ -110,138 +109,138 @@ public class CompilationUnitCacheTest {
 
 	}
 
-	@Test
-	public void cu_cached() throws Exception {
-		harness.useProject(ProjectsHarness.dummyProject());
-		harness.intialize(null);
+    @Test
+    void cu_cached() throws Exception {
+        harness.useProject(ProjectsHarness.dummyProject());
+        harness.intialize(null);
 
-		TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
-				"\n" +
-				"public class SomeClass {\n" +
-				"\n" +
-				"}\n");
-		CompilationUnit cu = getCompilationUnit(doc);
-		assertNotNull(cu);
+        TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
+                "\n" +
+                "public class SomeClass {\n" +
+                "\n" +
+                "}\n");
+        CompilationUnit cu = getCompilationUnit(doc);
+        assertNotNull(cu);
 
-		CompilationUnit cuAnother = getCompilationUnit(doc);
-		assertTrue(cu == cuAnother);
-	}
+        CompilationUnit cuAnother = getCompilationUnit(doc);
+        assertTrue(cu == cuAnother);
+    }
 
-	@Test
-	public void cu_not_generated_without_project() throws Exception {
-		harness.intialize(null);
+    @Test
+    void cu_not_generated_without_project() throws Exception {
+        harness.intialize(null);
 
-		TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
-				"\n" +
-				"public class SomeClass {\n" +
-				"\n" +
-				"}\n");
-		CompilationUnit cu = getCompilationUnit(doc);
-		assertNull(cu);
-	}
+        TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
+                "\n" +
+                "public class SomeClass {\n" +
+                "\n" +
+                "}\n");
+        CompilationUnit cu = getCompilationUnit(doc);
+        assertNull(cu);
+    }
 
 	private CompilationUnit getCompilationUnit(TextDocument doc) {
 		harness.getServer().getAsync().waitForAll();
 		return serverInit.getComponents().get(BootJavaLanguageServerComponents.class).getCompilationUnitCache().withCompilationUnit(doc, cu -> cu);
 	}
 
-	@Test
-	public void cu_cache_invalidated_by_doc_change() throws Exception {
-		harness.useProject(ProjectsHarness.dummyProject());
-		harness.intialize(null);
+    @Test
+    void cu_cache_invalidated_by_doc_change() throws Exception {
+        harness.useProject(ProjectsHarness.dummyProject());
+        harness.intialize(null);
 
-		TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
-				"\n" +
-				"public class SomeClass {\n" +
-				"\n" +
-				"}\n");
+        TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
+                "\n" +
+                "public class SomeClass {\n" +
+                "\n" +
+                "}\n");
 
-		harness.newEditorFromFileUri(doc.getUri(), doc.getLanguageId());
-		CompilationUnit cu = getCompilationUnit(doc);
-		assertNotNull(cu);
+        harness.newEditorFromFileUri(doc.getUri(), doc.getLanguageId());
+        CompilationUnit cu = getCompilationUnit(doc);
+        assertNotNull(cu);
 
-		harness.changeDocument(doc.getUri(), 0, 0, "     ");
-		CompilationUnit cuAnother = getCompilationUnit(doc);
-		assertNotNull(cuAnother);
-		assertFalse(cu == cuAnother);
+        harness.changeDocument(doc.getUri(), 0, 0, "     ");
+        CompilationUnit cuAnother = getCompilationUnit(doc);
+        assertNotNull(cuAnother);
+        assertNotNull(cuAnother);
 
-		CompilationUnit cuYetAnother = getCompilationUnit(doc);
-		assertTrue(cuAnother == cuYetAnother);
-	}
+        CompilationUnit cuYetAnother = getCompilationUnit(doc);
+        assertTrue(cuAnother == cuYetAnother);
+    }
 
-	@Test
-	public void cu_cache_invalidated_by_doc_close() throws Exception {
-		harness.useProject(ProjectsHarness.dummyProject());
-		harness.intialize(null);
+    @Test
+    void cu_cache_invalidated_by_doc_close() throws Exception {
+        harness.useProject(ProjectsHarness.dummyProject());
+        harness.intialize(null);
 
-		TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
-				"\n" +
-				"public class SomeClass {\n" +
-				"\n" +
-				"}\n");
+        TextDocument doc = new TextDocument(harness.createTempUri(null), LanguageId.JAVA, 0, "package my.package\n" +
+                "\n" +
+                "public class SomeClass {\n" +
+                "\n" +
+                "}\n");
 
-		harness.newEditorFromFileUri(doc.getUri(), doc.getLanguageId());
-		CompilationUnit cu = getCompilationUnit(doc);
-		assertNotNull(cu);
+        harness.newEditorFromFileUri(doc.getUri(), doc.getLanguageId());
+        CompilationUnit cu = getCompilationUnit(doc);
+        assertNotNull(cu);
 
-		harness.closeDocument(doc.getId());
-		CompilationUnit cuAnother = getCompilationUnit(doc);
-		assertNotNull(cuAnother);
-		assertFalse(cu == cuAnother);
+        harness.closeDocument(doc.getId());
+        CompilationUnit cuAnother = getCompilationUnit(doc);
+        assertNotNull(cuAnother);
+        assertNotNull(cuAnother);
 
-		CompilationUnit cuYetAnother = getCompilationUnit(doc);
-		assertTrue(cuAnother == cuYetAnother);
-	}
+        CompilationUnit cuYetAnother = getCompilationUnit(doc);
+        assertTrue(cuAnother == cuYetAnother);
+    }
 
-	@Test
-	public void cu_cache_invalidated_by_project_change() throws Exception {
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri().toString();
-		MavenJavaProject project = projects.mavenProject("test-request-mapping-live-hover");
-		harness.useProject(project);
-		harness.intialize(directory);
+    @Test
+    void cu_cache_invalidated_by_project_change() throws Exception {
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri().toString();
+        MavenJavaProject project = projects.mavenProject("test-request-mapping-live-hover");
+        harness.useProject(project);
+        harness.intialize(directory);
 
-		URI fileUri = new URI(docUri);
-		Path path = Paths.get(fileUri);
-		String content = new String(Files.readAllBytes(path));
+        URI fileUri = new URI(docUri);
+        Path path = Paths.get(fileUri);
+        String content = new String(Files.readAllBytes(path));
 
-		TextDocument document = new TextDocument(docUri, LanguageId.JAVA, 0, content);
+        TextDocument document = new TextDocument(docUri, LanguageId.JAVA, 0, content);
 
-		CompilationUnit cu = getCompilationUnit(document);
-		assertNotNull(cu);
-		CompilationUnit cuAnother = getCompilationUnit(document);
-		assertTrue(cu == cuAnother);
+        CompilationUnit cu = getCompilationUnit(document);
+        assertNotNull(cu);
+        CompilationUnit cuAnother = getCompilationUnit(document);
+        assertTrue(cu == cuAnother);
 
-		projectObserver.doWithListeners(l -> l.changed(project));
-		cuAnother = getCompilationUnit(document);
-		assertNotNull(cuAnother);
-		assertFalse(cu == cuAnother);
-	}
+        projectObserver.doWithListeners(l -> l.changed(project));
+        cuAnother = getCompilationUnit(document);
+        assertNotNull(cuAnother);
+        assertNotNull(cuAnother);
+    }
 
-	@Test
-	public void cu_cache_invalidated_by_project_deletion() throws Exception {
-		File directory = new File(
-				ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
-		String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri().toString();
-		MavenJavaProject project = projects.mavenProject("test-request-mapping-live-hover");
-		harness.useProject(project);
-		harness.intialize(directory);
+    @Test
+    void cu_cache_invalidated_by_project_deletion() throws Exception {
+        File directory = new File(
+                ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI());
+        String docUri = directory.toPath().resolve("src/main/java/example/HelloWorldController.java").toUri().toString();
+        MavenJavaProject project = projects.mavenProject("test-request-mapping-live-hover");
+        harness.useProject(project);
+        harness.intialize(directory);
 
-		URI fileUri = new URI(docUri);
-		Path path = Paths.get(fileUri);
-		String content = new String(Files.readAllBytes(path));
+        URI fileUri = new URI(docUri);
+        Path path = Paths.get(fileUri);
+        String content = new String(Files.readAllBytes(path));
 
-		TextDocument document = new TextDocument(docUri, LanguageId.JAVA, 0, content);
+        TextDocument document = new TextDocument(docUri, LanguageId.JAVA, 0, content);
 
-		CompilationUnit cu = getCompilationUnit(document);
-		assertNotNull(cu);
-		CompilationUnit cuAnother = getCompilationUnit(document);
-		assertTrue(cu == cuAnother);
+        CompilationUnit cu = getCompilationUnit(document);
+        assertNotNull(cu);
+        CompilationUnit cuAnother = getCompilationUnit(document);
+        assertTrue(cu == cuAnother);
 
-		projectObserver.doWithListeners(l -> l.deleted(project));
-		cuAnother = getCompilationUnit(document);
-		assertNotNull(cuAnother);
-		assertFalse(cu == cuAnother);
-	}
+        projectObserver.doWithListeners(l -> l.deleted(project));
+        cuAnother = getCompilationUnit(document);
+        assertNotNull(cuAnother);
+        assertNotNull(cuAnother);
+    }
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.List;
@@ -20,9 +20,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -33,12 +33,12 @@ import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFin
 import org.springframework.ide.vscode.commons.util.UriUtil;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringIndexerMultiProjectTest {
@@ -50,7 +50,7 @@ public class SpringIndexerMultiProjectTest {
 	private String projectUri1;
 	private String projectUri2;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build());
@@ -65,61 +65,60 @@ public class SpringIndexerMultiProjectTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testQueryingAllSymbolsWithRegularLimit() throws Exception {
-		List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("");
-		assertEquals(50, symbols.size());
-	}
+    @Test
+    void testQueryingAllSymbolsWithRegularLimit() throws Exception {
+        List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("");
+        assertEquals(50, symbols.size());
+    }
 
-	@Test
-	public void testQueryingAllSymbolsWithNoLimit() throws Exception {
-		List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("*");
-		assertEquals(220, symbols.size());
+    @Test
+    void testQueryingAllSymbolsWithNoLimit() throws Exception {
+        List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("*");
+        assertEquals(220, symbols.size());
 
-		int count1 = 0;
-		int count2 = 0;
+        int count1 = 0;
+        int count2 = 0;
 
-		for (WorkspaceSymbol symbol : symbols) {
-			if (symbol.getLocation().getLeft().getUri().startsWith(projectUri1)) {
-				count1++;
-			}
-			else if (symbol.getLocation().getLeft().getUri().startsWith(projectUri2)) {
-				count2++;
-			}
-		}
+        for (WorkspaceSymbol symbol : symbols) {
+            if (symbol.getLocation().getLeft().getUri().startsWith(projectUri1)) {
+                count1++;
+            } else if (symbol.getLocation().getLeft().getUri().startsWith(projectUri2)) {
+                count2++;
+            }
+        }
 
-		assertEquals(110, count1);
-		assertEquals(110, count2);
-	}
+        assertEquals(110, count1);
+        assertEquals(110, count2);
+    }
 
-	@Test
-	public void testQueryingSymbolsForSpecificProjectWithRegularLimit() throws Exception {
-		List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("locationPrefix:" + projectUri2);
-		assertEquals(50, symbols.size());
+    @Test
+    void testQueryingSymbolsForSpecificProjectWithRegularLimit() throws Exception {
+        List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("locationPrefix:" + projectUri2);
+        assertEquals(50, symbols.size());
 
-		for (WorkspaceSymbol symbol : symbols) {
-			assertTrue(symbol.getLocation().getLeft().getUri().startsWith(projectUri2));
-		}
-	}
+        for (WorkspaceSymbol symbol : symbols) {
+            assertTrue(symbol.getLocation().getLeft().getUri().startsWith(projectUri2));
+        }
+    }
 
-	@Test
-	public void testQueryingSymbolsForSpecificProjectWithNoLimit() throws Exception {
-		List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("locationPrefix:" + projectUri2 + "?*");
-		assertEquals(110, symbols.size());
+    @Test
+    void testQueryingSymbolsForSpecificProjectWithNoLimit() throws Exception {
+        List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("locationPrefix:" + projectUri2 + "?*");
+        assertEquals(110, symbols.size());
 
-		for (WorkspaceSymbol symbol : symbols) {
-			assertTrue(symbol.getLocation().getLeft().getUri().startsWith(projectUri2));
-		}
-	}
+        for (WorkspaceSymbol symbol : symbols) {
+            assertTrue(symbol.getLocation().getLeft().getUri().startsWith(projectUri2));
+        }
+    }
 
-	@Test
-	public void testQueryingSymbolsForSpecificProjectWithQuery() throws Exception {
-		List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("locationPrefix:" + projectUri2 + "?seventhWowSuperBean");
-		assertEquals(10, symbols.size());
+    @Test
+    void testQueryingSymbolsForSpecificProjectWithQuery() throws Exception {
+        List<? extends WorkspaceSymbol> symbols = indexer.getAllSymbols("locationPrefix:" + projectUri2 + "?seventhWowSuperBean");
+        assertEquals(10, symbols.size());
 
-		for (WorkspaceSymbol symbol : symbols) {
-			assertTrue(symbol.getLocation().getLeft().getUri().startsWith(projectUri2));
-		}
-	}
+        for (WorkspaceSymbol symbol : symbols) {
+            assertTrue(symbol.getLocation().getLeft().getUri().startsWith(projectUri2));
+        }
+    }
 
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.net.URI;
@@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.Bean;
 import org.springframework.context.annotation.Import;
@@ -38,12 +38,12 @@ import org.springframework.ide.vscode.boot.java.utils.SymbolIndexConfig;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SpringIndexerMultipleFilesTest.TimestampingAwareCacheConfig.class)
 public class SpringIndexerMultipleFilesTest {
@@ -65,7 +65,7 @@ public class SpringIndexerMultipleFilesTest {
 	private File directory;
 	private String projectDir;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build());
@@ -80,165 +80,165 @@ public class SpringIndexerMultipleFilesTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testUpdateChangedSingleDocumentOnDisc() throws Exception {
-		String changedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		File file = new File(new URI(changedDocURI));
-		String originalContent = FileUtils.readFileToString(file);
-		FileTime modifiedTime = Files.getLastModifiedTime(file.toPath());
+    @Test
+    void testUpdateChangedSingleDocumentOnDisc() throws Exception {
+        String changedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        File file = new File(new URI(changedDocURI));
+        String originalContent = FileUtils.readFileToString(file);
+        FileTime modifiedTime = Files.getLastModifiedTime(file.toPath());
 
-		try {
-			// update document and update index
-			List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(changedDocURI);
-			assertTrue(SpringIndexerTest.containsSymbol(symbols, "@/mapping1", changedDocURI));
-			
-			String newContent = originalContent.replace("mapping1", "mapping1-CHANGED");
-			FileUtils.writeStringToFile(new File(new URI(changedDocURI)), newContent);
-			Files.setLastModifiedTime(file.toPath(), FileTime.fromMillis(modifiedTime.toMillis() + 1000));
-			
-			TestFileScanListener fileScanListener = new TestFileScanListener();
-			indexer.getJavaIndexer().setFileScanListener(fileScanListener);
+        try {
+            // update document and update index
+            List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(changedDocURI);
+            assertTrue(SpringIndexerTest.containsSymbol(symbols, "@/mapping1", changedDocURI));
 
-			CompletableFuture<Void> updateFuture = indexer.updateDocument(changedDocURI, null, "test triggered");
-			updateFuture.get(5, TimeUnit.SECONDS);
-	
-			// check for updated index per document
-			symbols = indexer.getSymbols(changedDocURI);
-			assertEquals(2, symbols.size());
-			assertTrue(SpringIndexerTest.containsSymbol(symbols, "@/mapping1-CHANGED", changedDocURI, 6, 1, 6, 36));
-			assertTrue(SpringIndexerTest.containsSymbol(symbols, "@/mapping2", changedDocURI, 11, 1, 11, 28));
-			
-			fileScanListener.assertScannedUris(changedDocURI);
-			fileScanListener.assertScannedUri(changedDocURI, 1);
-		}
-		finally {
-			FileUtils.writeStringToFile(new File(new URI(changedDocURI)), originalContent);
-		}
-	}
+            String newContent = originalContent.replace("mapping1", "mapping1-CHANGED");
+            FileUtils.writeStringToFile(new File(new URI(changedDocURI)), newContent);
+            Files.setLastModifiedTime(file.toPath(), FileTime.fromMillis(modifiedTime.toMillis() + 1000));
 
-	@Test
-	public void testUpdateChangedMultipleDocumentsOnDisc() throws Exception {
-		
-		String doc1URI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		File file1 = new File(new URI(doc1URI));
-		String original1Content = FileUtils.readFileToString(file1);
-		FileTime modifiedTime1 = Files.getLastModifiedTime(file1.toPath());
+            TestFileScanListener fileScanListener = new TestFileScanListener();
+            indexer.getJavaIndexer().setFileScanListener(fileScanListener);
 
-		String doc2URI = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-		File file2 = new File(new URI(doc2URI));
-		String original2Content = FileUtils.readFileToString(file2);
-		FileTime modifiedTime2 = Files.getLastModifiedTime(file2.toPath());
+            CompletableFuture<Void> updateFuture = indexer.updateDocument(changedDocURI, null, "test triggered");
+            updateFuture.get(5, TimeUnit.SECONDS);
 
-		String doc3URI = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		File file3 = new File(new URI(doc3URI));
-		String original3Content = FileUtils.readFileToString(file3);
-		FileTime modifiedTime3 = Files.getLastModifiedTime(file3.toPath());
+            // check for updated index per document
+            symbols = indexer.getSymbols(changedDocURI);
+            assertEquals(2, symbols.size());
+            assertTrue(SpringIndexerTest.containsSymbol(symbols, "@/mapping1-CHANGED", changedDocURI, 6, 1, 6, 36));
+            assertTrue(SpringIndexerTest.containsSymbol(symbols, "@/mapping2", changedDocURI, 11, 1, 11, 28));
 
-		try {
-			String new1Content = original1Content.replace("mapping1", "mapping1-CHANGED");
-			FileUtils.writeStringToFile(new File(new URI(doc1URI)), new1Content);
-			Files.setLastModifiedTime(file1.toPath(), FileTime.fromMillis(modifiedTime1.toMillis() + 1000));
-			
-			String new2Content = original2Content.replace("\"/embedded-foo-mapping\"", "\"/embedded-foo-mapping-CHANGED\"");
-			FileUtils.writeStringToFile(new File(new URI(doc2URI)), new2Content);
-			Files.setLastModifiedTime(file2.toPath(), FileTime.fromMillis(modifiedTime2.toMillis() + 1000));
-			
-			String new3Content = original3Content.replace("classlevel", "classlevel-CHANGED");
-			FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content);
-			Files.setLastModifiedTime(file3.toPath(), FileTime.fromMillis(modifiedTime3.toMillis() + 1000));
-			
-			CompletableFuture<Void> updateFuture = indexer.updateDocuments(new String[] {doc1URI, doc2URI, doc3URI}, "test triggered");
-			updateFuture.get(5, TimeUnit.SECONDS);
-	
-			// check for updated index per document
-			List<? extends WorkspaceSymbol> symbols1 = indexer.getSymbols(doc1URI);
-			assertEquals(2, symbols1.size());
-			assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping1-CHANGED", doc1URI, 6, 1, 6, 36));
-			assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping2", doc1URI, 11, 1, 11, 28));
-			
-			List<? extends WorkspaceSymbol> symbols2 = indexer.getSymbols(doc2URI);
-			assertTrue(SpringIndexerTest.containsSymbol(symbols2, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", doc2URI, 6, 0, 6, 22));
-			assertTrue(SpringIndexerTest.containsSymbol(symbols2, "@/embedded-foo-mapping-CHANGED", doc2URI, 17, 1, 17, 49));
-			assertTrue(SpringIndexerTest.containsSymbol(symbols2, "@/foo-root-mapping/embedded-foo-mapping-with-root", doc2URI, 27, 1, 27, 51));
+            fileScanListener.assertScannedUris(changedDocURI);
+            fileScanListener.assertScannedUri(changedDocURI, 1);
+        }
+        finally {
+            FileUtils.writeStringToFile(new File(new URI(changedDocURI)), originalContent);
+        }
+    }
 
-			List<? extends WorkspaceSymbol> symbols3 = indexer.getSymbols(doc3URI);
-			assertTrue(SpringIndexerTest.containsSymbol(symbols3, "@/classlevel-CHANGED/mapping-subpackage", doc3URI, 7, 1, 7, 38));
-		}
-		finally {
-			FileUtils.writeStringToFile(new File(new URI(doc1URI)), original1Content);
-			FileUtils.writeStringToFile(new File(new URI(doc2URI)), original2Content);
-			FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content);
-		}
-	}
-	
-	@Test
-	public void testDontScanUnchangedDocument() throws Exception {
-		String unchangedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		
-		TestFileScanListener fileScanListener = new TestFileScanListener();
-		indexer.getJavaIndexer().setFileScanListener(fileScanListener);
+    @Test
+    void testUpdateChangedMultipleDocumentsOnDisc() throws Exception {
 
-		CompletableFuture<Void> updateFuture = indexer.updateDocuments(new String[] {unchangedDocURI}, "test triggered");
-		updateFuture.get(5, TimeUnit.SECONDS);
+        String doc1URI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        File file1 = new File(new URI(doc1URI));
+        String original1Content = FileUtils.readFileToString(file1);
+        FileTime modifiedTime1 = Files.getLastModifiedTime(file1.toPath());
 
-		fileScanListener.assertScannedUris();
-		fileScanListener.assertScannedUri(unchangedDocURI, 0);
-		
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(unchangedDocURI);
-		assertEquals(2, symbols.size());
-	}
+        String doc2URI = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        File file2 = new File(new URI(doc2URI));
+        String original2Content = FileUtils.readFileToString(file2);
+        FileTime modifiedTime2 = Files.getLastModifiedTime(file2.toPath());
 
-	@Test
-	public void testDontScanUnchangedDocumentAmongMultipleChangedFiles() throws Exception {
-		
-		String doc1URI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		File file1 = new File(new URI(doc1URI));
-		String original1Content = FileUtils.readFileToString(file1);
-		FileTime modifiedTime1 = Files.getLastModifiedTime(file1.toPath());
+        String doc3URI = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        File file3 = new File(new URI(doc3URI));
+        String original3Content = FileUtils.readFileToString(file3);
+        FileTime modifiedTime3 = Files.getLastModifiedTime(file3.toPath());
 
-		String doc2URI = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        try {
+            String new1Content = original1Content.replace("mapping1", "mapping1-CHANGED");
+            FileUtils.writeStringToFile(new File(new URI(doc1URI)), new1Content);
+            Files.setLastModifiedTime(file1.toPath(), FileTime.fromMillis(modifiedTime1.toMillis() + 1000));
 
-		String doc3URI = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		File file3 = new File(new URI(doc3URI));
-		String original3Content = FileUtils.readFileToString(file3);
-		FileTime modifiedTime3 = Files.getLastModifiedTime(file3.toPath());
+            String new2Content = original2Content.replace("\"/embedded-foo-mapping\"", "\"/embedded-foo-mapping-CHANGED\"");
+            FileUtils.writeStringToFile(new File(new URI(doc2URI)), new2Content);
+            Files.setLastModifiedTime(file2.toPath(), FileTime.fromMillis(modifiedTime2.toMillis() + 1000));
 
-		try {
-			String new1Content = original1Content.replace("mapping1", "mapping1-CHANGED");
-			FileUtils.writeStringToFile(file1, new1Content);
-			Files.setLastModifiedTime(file1.toPath(), FileTime.fromMillis(modifiedTime1.toMillis() + 1000));
-			
-			String new3Content = original3Content.replace("classlevel", "classlevel-CHANGED");
-			FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content);
-			Files.setLastModifiedTime(file3.toPath(), FileTime.fromMillis(modifiedTime3.toMillis() + 1000));
-			
-			TestFileScanListener fileScanListener = new TestFileScanListener();
-			indexer.getJavaIndexer().setFileScanListener(fileScanListener);
+            String new3Content = original3Content.replace("classlevel", "classlevel-CHANGED");
+            FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content);
+            Files.setLastModifiedTime(file3.toPath(), FileTime.fromMillis(modifiedTime3.toMillis() + 1000));
 
-			CompletableFuture<Void> updateFuture = indexer.updateDocuments(new String[] {doc1URI, doc2URI, doc3URI}, "test triggered");
-			updateFuture.get(5, TimeUnit.SECONDS);
-	
-			// check for updated index per document
-			List<? extends WorkspaceSymbol> symbols1 = indexer.getSymbols(doc1URI);
-			assertEquals(2, symbols1.size());
-			assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping1-CHANGED", doc1URI, 6, 1, 6, 36));
-			assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping2", doc1URI, 11, 1, 11, 28));
-			
-			List<? extends WorkspaceSymbol> symbols2 = indexer.getSymbols(doc2URI);
-			assertEquals(3, symbols2.size());
+            CompletableFuture<Void> updateFuture = indexer.updateDocuments(new String[]{doc1URI, doc2URI, doc3URI}, "test triggered");
+            updateFuture.get(5, TimeUnit.SECONDS);
 
-			List<? extends WorkspaceSymbol> symbols3 = indexer.getSymbols(doc3URI);
-			assertTrue(SpringIndexerTest.containsSymbol(symbols3, "@/classlevel-CHANGED/mapping-subpackage", doc3URI, 7, 1, 7, 38));
-			
-			fileScanListener.assertScannedUris(doc1URI, doc3URI);
-			fileScanListener.assertScannedUri(doc1URI, 1);
-			fileScanListener.assertScannedUri(doc2URI, 0);
-			fileScanListener.assertScannedUri(doc3URI, 1);
-		}
-		finally {
-			FileUtils.writeStringToFile(file1, original1Content);
-			FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content);
-		}
-	}
+            // check for updated index per document
+            List<? extends WorkspaceSymbol> symbols1 = indexer.getSymbols(doc1URI);
+            assertEquals(2, symbols1.size());
+            assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping1-CHANGED", doc1URI, 6, 1, 6, 36));
+            assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping2", doc1URI, 11, 1, 11, 28));
+
+            List<? extends WorkspaceSymbol> symbols2 = indexer.getSymbols(doc2URI);
+            assertTrue(SpringIndexerTest.containsSymbol(symbols2, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", doc2URI, 6, 0, 6, 22));
+            assertTrue(SpringIndexerTest.containsSymbol(symbols2, "@/embedded-foo-mapping-CHANGED", doc2URI, 17, 1, 17, 49));
+            assertTrue(SpringIndexerTest.containsSymbol(symbols2, "@/foo-root-mapping/embedded-foo-mapping-with-root", doc2URI, 27, 1, 27, 51));
+
+            List<? extends WorkspaceSymbol> symbols3 = indexer.getSymbols(doc3URI);
+            assertTrue(SpringIndexerTest.containsSymbol(symbols3, "@/classlevel-CHANGED/mapping-subpackage", doc3URI, 7, 1, 7, 38));
+        }
+        finally {
+            FileUtils.writeStringToFile(new File(new URI(doc1URI)), original1Content);
+            FileUtils.writeStringToFile(new File(new URI(doc2URI)), original2Content);
+            FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content);
+        }
+    }
+
+    @Test
+    void testDontScanUnchangedDocument() throws Exception {
+        String unchangedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+
+        TestFileScanListener fileScanListener = new TestFileScanListener();
+        indexer.getJavaIndexer().setFileScanListener(fileScanListener);
+
+        CompletableFuture<Void> updateFuture = indexer.updateDocuments(new String[]{unchangedDocURI}, "test triggered");
+        updateFuture.get(5, TimeUnit.SECONDS);
+
+        fileScanListener.assertScannedUris();
+        fileScanListener.assertScannedUri(unchangedDocURI, 0);
+
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(unchangedDocURI);
+        assertEquals(2, symbols.size());
+    }
+
+    @Test
+    void testDontScanUnchangedDocumentAmongMultipleChangedFiles() throws Exception {
+
+        String doc1URI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        File file1 = new File(new URI(doc1URI));
+        String original1Content = FileUtils.readFileToString(file1);
+        FileTime modifiedTime1 = Files.getLastModifiedTime(file1.toPath());
+
+        String doc2URI = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+
+        String doc3URI = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        File file3 = new File(new URI(doc3URI));
+        String original3Content = FileUtils.readFileToString(file3);
+        FileTime modifiedTime3 = Files.getLastModifiedTime(file3.toPath());
+
+        try {
+            String new1Content = original1Content.replace("mapping1", "mapping1-CHANGED");
+            FileUtils.writeStringToFile(file1, new1Content);
+            Files.setLastModifiedTime(file1.toPath(), FileTime.fromMillis(modifiedTime1.toMillis() + 1000));
+
+            String new3Content = original3Content.replace("classlevel", "classlevel-CHANGED");
+            FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content);
+            Files.setLastModifiedTime(file3.toPath(), FileTime.fromMillis(modifiedTime3.toMillis() + 1000));
+
+            TestFileScanListener fileScanListener = new TestFileScanListener();
+            indexer.getJavaIndexer().setFileScanListener(fileScanListener);
+
+            CompletableFuture<Void> updateFuture = indexer.updateDocuments(new String[]{doc1URI, doc2URI, doc3URI}, "test triggered");
+            updateFuture.get(5, TimeUnit.SECONDS);
+
+            // check for updated index per document
+            List<? extends WorkspaceSymbol> symbols1 = indexer.getSymbols(doc1URI);
+            assertEquals(2, symbols1.size());
+            assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping1-CHANGED", doc1URI, 6, 1, 6, 36));
+            assertTrue(SpringIndexerTest.containsSymbol(symbols1, "@/mapping2", doc1URI, 11, 1, 11, 28));
+
+            List<? extends WorkspaceSymbol> symbols2 = indexer.getSymbols(doc2URI);
+            assertEquals(3, symbols2.size());
+
+            List<? extends WorkspaceSymbol> symbols3 = indexer.getSymbols(doc3URI);
+            assertTrue(SpringIndexerTest.containsSymbol(symbols3, "@/classlevel-CHANGED/mapping-subpackage", doc3URI, 7, 1, 7, 38));
+
+            fileScanListener.assertScannedUris(doc1URI, doc3URI);
+            fileScanListener.assertScannedUri(doc1URI, 1);
+            fileScanListener.assertScannedUri(doc2URI, 0);
+            fileScanListener.assertScannedUri(doc3URI, 1);
+        }
+        finally {
+            FileUtils.writeStringToFile(file1, original1Content);
+            FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content);
+        }
+    }
 
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.List;
@@ -20,9 +20,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -31,12 +31,12 @@ import org.springframework.ide.vscode.boot.bootiful.SymbolProviderTestConf;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringIndexerNonBootProjectTest {
@@ -48,7 +48,7 @@ public class SpringIndexerNonBootProjectTest {
 	private File directory;
 	private String projectDir;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 
@@ -62,18 +62,18 @@ public class SpringIndexerNonBootProjectTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testScanningSimpleRegularSpringProject() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+    @Test
+    void testScanningSimpleRegularSpringProject() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
 
-		assertEquals(3, allSymbols.size());
+        assertEquals(3, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
+        String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
-	}
+        docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+    }
 
 }

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

@@ -10,10 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.net.URI;
@@ -25,9 +22,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -39,12 +36,12 @@ import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFin
 import org.springframework.ide.vscode.commons.util.Assert;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringIndexerTest {
@@ -57,7 +54,7 @@ public class SpringIndexerTest {
 	private String projectDir;
 	private IJavaProject project;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build());
@@ -72,271 +69,271 @@ public class SpringIndexerTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testScanningAllAnnotationsSimpleProjectUpfront() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+    @Test
+    void testScanningAllAnnotationsSimpleProjectUpfront() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
 
-		assertEquals(7, allSymbols.size());
+        assertEquals(7, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
-		assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
-		assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
+        assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
+        assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
-		assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
+        docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
+        assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
+        docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
-	}
-	
-	@Test
-	public void testScanTestJavaSources() throws Exception {
-		indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(true).build());
-		
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
-		assertEquals(8, allSymbols.size());
-		String docUri = directory.toPath().resolve("src/test/java/demo/ApplicationTests.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15));
-		
-		indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(false).build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(7, allSymbols.size());
-		assertFalse(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15));
-	}
+        docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+    }
 
-	@Test
-	public void testRetrievingSymbolsPerDocument() throws Exception {
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
-		assertEquals(3, symbols.size());
-		assertTrue(containsSymbol(symbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
-		assertTrue(containsSymbol(symbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
-		assertTrue(containsSymbol(symbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+    @Test
+    void testScanTestJavaSources() throws Exception {
+        indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(true).build());
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		symbols = indexer.getSymbols(docUri);
-		assertEquals(2, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/mapping1", docUri, 6, 1, 6, 28));
-		assertTrue(containsSymbol(symbols, "@/mapping2", docUri, 11, 1, 11, 28));
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+        assertEquals(8, allSymbols.size());
+        String docUri = directory.toPath().resolve("src/test/java/demo/ApplicationTests.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		symbols = indexer.getSymbols(docUri);
-		assertEquals(1, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
-	}
+        indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(false).build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(7, allSymbols.size());
+        assertFalse(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15));
+    }
 
-	@Test
-	public void testScanningAllAnnotationsMultiModuleProjectUpfront() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+    @Test
+    void testRetrievingSymbolsPerDocument() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
+        assertEquals(3, symbols.size());
+        assertTrue(containsSymbol(symbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
+        assertTrue(containsSymbol(symbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
+        assertTrue(containsSymbol(symbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
 
-		assertEquals(7, allSymbols.size());
+        docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        symbols = indexer.getSymbols(docUri);
+        assertEquals(2, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/mapping1", docUri, 6, 1, 6, 28));
+        assertTrue(containsSymbol(symbols, "@/mapping2", docUri, 11, 1, 11, 28));
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
-		assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
-		assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+        docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        symbols = indexer.getSymbols(docUri);
+        assertEquals(1, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
+    }
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
-		assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
+    @Test
+    void testScanningAllAnnotationsMultiModuleProjectUpfront() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
+        assertEquals(7, allSymbols.size());
+
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
+        assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
+        assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+
+        docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
+        assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
+
+        docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
-	}
+        docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+    }
 
-	@Test
-	public void testUpdateChangedDocument() throws Exception {
-		// update document and update index
-		String changedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+    @Test
+    void testUpdateChangedDocument() throws Exception {
+        // update document and update index
+        String changedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
 
-		assertTrue(containsSymbol(indexer.getSymbols(changedDocURI), "@/mapping1", changedDocURI));
+        assertTrue(containsSymbol(indexer.getSymbols(changedDocURI), "@/mapping1", changedDocURI));
 
-		String newContent = FileUtils.readFileToString(new File(new URI(changedDocURI))).replace("mapping1", "mapping1-CHANGED");
-		CompletableFuture<Void> updateFuture = indexer.updateDocument(changedDocURI, newContent, "test triggered");
-		updateFuture.get(5, TimeUnit.SECONDS);
+        String newContent = FileUtils.readFileToString(new File(new URI(changedDocURI))).replace("mapping1", "mapping1-CHANGED");
+        CompletableFuture<Void> updateFuture = indexer.updateDocument(changedDocURI, newContent, "test triggered");
+        updateFuture.get(5, TimeUnit.SECONDS);
 
-		// check for updated index per document
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(changedDocURI);
-		assertEquals(2, symbols.size());
-		assertTrue(containsSymbol(symbols, "@/mapping1-CHANGED", changedDocURI, 6, 1, 6, 36));
-		assertTrue(containsSymbol(symbols, "@/mapping2", changedDocURI, 11, 1, 11, 28));
+        // check for updated index per document
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(changedDocURI);
+        assertEquals(2, symbols.size());
+        assertTrue(containsSymbol(symbols, "@/mapping1-CHANGED", changedDocURI, 6, 1, 6, 36));
+        assertTrue(containsSymbol(symbols, "@/mapping2", changedDocURI, 11, 1, 11, 28));
 
-		// check for updated index in all symbols
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
-		assertEquals(7, allSymbols.size());
+        // check for updated index in all symbols
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+        assertEquals(7, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
-		assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
-		assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
+        assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
+        assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/mapping1-CHANGED", docUri, 6, 1, 6, 36));
-		assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
+        docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/mapping1-CHANGED", docUri, 6, 1, 6, 36));
+        assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
+        docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
-	}
+        docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+    }
 
-	@Test
-	public void testNewDocumentCreated() throws Exception {
-		String createdDocURI = directory.toPath().resolve("src/main/java/org/test/CreatedClass.java").toUri().toString();
-		// check for document to not be created yet
-		List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(createdDocURI);
-		assertNotNull(symbols);
-		assertEquals(0, symbols.size());
+    @Test
+    void testNewDocumentCreated() throws Exception {
+        String createdDocURI = directory.toPath().resolve("src/main/java/org/test/CreatedClass.java").toUri().toString();
+        // check for document to not be created yet
+        List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(createdDocURI);
+        assertNotNull(symbols);
+        assertEquals(0, symbols.size());
 
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
-		assertEquals(7, allSymbols.size());
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+        assertEquals(7, allSymbols.size());
 
-		try {
-			// create document and update index
-			String content = "package org.test;\n" +
-					"\n" +
-					"import org.springframework.web.bind.annotation.RequestMapping;\n" +
-					"\n" +
-					"public class SimpleMappingClass {\n" +
-					"	\n" +
-					"	@RequestMapping(\"created-mapping1\")\n" +
-					"	public String hello1() {\n" +
-					"		return \"hello1\";\n" +
-					"	}\n" +
-					"\n" +
-					"	@RequestMapping(\"created-mapping2\")\n" +
-					"	public String hello2() {\n" +
-					"		return \"hello2\";\n" +
-					"	}\n" +
-					"\n" +
-					"}\n" +
-					"";
-			FileUtils.write(new File(new URI(createdDocURI)), content);
-			CompletableFuture<Void> createFuture = indexer.createDocument(createdDocURI);
-			createFuture.get(5, TimeUnit.SECONDS);
+        try {
+            // create document and update index
+            String content = "package org.test;\n" +
+                    "\n" +
+                    "import org.springframework.web.bind.annotation.RequestMapping;\n" +
+                    "\n" +
+                    "public class SimpleMappingClass {\n" +
+                    "	\n" +
+                    "	@RequestMapping(\"created-mapping1\")\n" +
+                    "	public String hello1() {\n" +
+                    "		return \"hello1\";\n" +
+                    "	}\n" +
+                    "\n" +
+                    "	@RequestMapping(\"created-mapping2\")\n" +
+                    "	public String hello2() {\n" +
+                    "		return \"hello2\";\n" +
+                    "	}\n" +
+                    "\n" +
+                    "}\n" +
+                    "";
+            FileUtils.write(new File(new URI(createdDocURI)), content);
+            CompletableFuture<Void> createFuture = indexer.createDocument(createdDocURI);
+            createFuture.get(5, TimeUnit.SECONDS);
 
-			// check for updated index per document
-			symbols = indexer.getSymbols(createdDocURI);
-			assertEquals(2, symbols.size());
-			assertTrue(containsSymbol(symbols, "@/created-mapping1", createdDocURI, 6, 1, 6, 36));
-			assertTrue(containsSymbol(symbols, "@/created-mapping2", createdDocURI, 11, 1, 11, 36));
+            // check for updated index per document
+            symbols = indexer.getSymbols(createdDocURI);
+            assertEquals(2, symbols.size());
+            assertTrue(containsSymbol(symbols, "@/created-mapping1", createdDocURI, 6, 1, 6, 36));
+            assertTrue(containsSymbol(symbols, "@/created-mapping2", createdDocURI, 11, 1, 11, 36));
 
-			// check for updated index in all symbols
-			allSymbols = indexer.getAllSymbols("");
-			assertEquals(9, allSymbols.size());
+            // check for updated index in all symbols
+            allSymbols = indexer.getAllSymbols("");
+            assertEquals(9, allSymbols.size());
 
-			String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-			assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
-			assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
-			assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+            String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+            assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
+            assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
+            assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
 
-			docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-			assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
-			assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
+            docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+            assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
+            assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
 
-			docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-			assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
+            docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+            assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
-			docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-			assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+            docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
+            assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
 
-			assertTrue(containsSymbol(allSymbols, "@/created-mapping1", createdDocURI, 6, 1, 6, 36));
-			assertTrue(containsSymbol(allSymbols, "@/created-mapping2", createdDocURI, 11, 1, 11, 36));
-		}
-		finally {
-			FileUtils.deleteQuietly(new File(new URI(createdDocURI)));
-		}
-	}
+            assertTrue(containsSymbol(allSymbols, "@/created-mapping1", createdDocURI, 6, 1, 6, 36));
+            assertTrue(containsSymbol(allSymbols, "@/created-mapping2", createdDocURI, 11, 1, 11, 36));
+        }
+        finally {
+            FileUtils.deleteQuietly(new File(new URI(createdDocURI)));
+        }
+    }
 
-	@Test
-	public void testRemoveSymbolsFromDeletedDocument() throws Exception {
-		// update document and update index
-		String deletedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+    @Test
+    void testRemoveSymbolsFromDeletedDocument() throws Exception {
+        // update document and update index
+        String deletedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
 
-		assertFalse(indexer.getSymbols(deletedDocURI).isEmpty()); //We have symbols before deletion?
-		CompletableFuture<Void> deleteFuture = indexer.deleteDocument(deletedDocURI);
-		deleteFuture.get(5, TimeUnit.HOURS);
+        assertFalse(indexer.getSymbols(deletedDocURI).isEmpty()); //We have symbols before deletion?
+        CompletableFuture<Void> deleteFuture = indexer.deleteDocument(deletedDocURI);
+        deleteFuture.get(5, TimeUnit.HOURS);
 
-		// check for updated index per document
-		Assert.noElements(indexer.getSymbols(deletedDocURI));
+        // check for updated index per document
+        Assert.noElements(indexer.getSymbols(deletedDocURI));
 
-		// check for updated index in all symbols
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
-		assertEquals(5, allSymbols.size());
+        // check for updated index in all symbols
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+        assertEquals(5, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
-		assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
-		assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@+ 'mainClass' (@SpringBootApplication <: @SpringBootConfiguration, @Configuration, @Component) MainClass", docUri, 6, 0, 6, 22));
+        assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
+        assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
+        docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
-	}
+        docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithDefaultSymbol.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+    }
 
-	@Test
-	public void testFilterSymbolsUsingQueryString() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("mapp");
+    @Test
+    void testFilterSymbolsUsingQueryString() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("mapp");
 
-		assertEquals(6, allSymbols.size());
+        assertEquals(6, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
-		assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/embedded-foo-mapping", docUri, 17, 1, 17, 41));
+        assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
-		assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
+        docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/mapping1", docUri, 6, 1, 6, 28));
+        assertTrue(containsSymbol(allSymbols, "@/mapping2", docUri, 11, 1, 11, 28));
 
-		docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
-		assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
-	}
+        docUri = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
+        assertTrue(containsSymbol(allSymbols, "@/classlevel/mapping-subpackage", docUri, 7, 1, 7, 38));
+    }
 
-	@Test
-	public void testFilterSymbolsUsingQueryStringSplittedResult() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("@/foo-root-mapping");
+    @Test
+    void testFilterSymbolsUsingQueryStringSplittedResult() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("@/foo-root-mapping");
 
-		assertEquals(1, allSymbols.size());
+        assertEquals(1, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
 
-		assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
-	}
+        assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+    }
 
-	@Test
-	public void testFilterSymbolsUsingQueryStringFullSymbolString() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("@/foo-root-mapping/embedded-foo-mapping-with-root");
+    @Test
+    void testFilterSymbolsUsingQueryStringFullSymbolString() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("@/foo-root-mapping/embedded-foo-mapping-with-root");
 
-		assertEquals(1, allSymbols.size());
+        assertEquals(1, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
+        String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
 
-		assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
-	}
+        assertTrue(containsSymbol(allSymbols, "@/foo-root-mapping/embedded-foo-mapping-with-root", docUri, 27, 1, 27, 51));
+    }
 
-	@Test
-	public void testDeleteProject() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
-		assertEquals(7, allSymbols.size());
+    @Test
+    void testDeleteProject() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+        assertEquals(7, allSymbols.size());
 
-		CompletableFuture<Void> deleteProject = indexer.deleteProject(project);
-		deleteProject.get(5, TimeUnit.SECONDS);
+        CompletableFuture<Void> deleteProject = indexer.deleteProject(project);
+        deleteProject.get(5, TimeUnit.SECONDS);
 
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(0, allSymbols.size());
-	}
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(0, allSymbols.size());
+    }
 
 	static boolean containsSymbol(List<? extends WorkspaceSymbol> symbols, String name, String uri) {
 		for (Iterator<? extends WorkspaceSymbol> iterator = symbols.iterator(); iterator.hasNext();) {

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.List;
@@ -20,9 +20,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.SpringSymbolIndex;
@@ -34,12 +34,12 @@ import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFin
 import org.springframework.ide.vscode.commons.util.UriUtil;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringIndexerTestSpecialCharacters {
@@ -52,7 +52,7 @@ public class SpringIndexerTestSpecialCharacters {
 	private String projectDir;
 	private IJavaProject project;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build());
@@ -67,18 +67,18 @@ public class SpringIndexerTestSpecialCharacters {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testScanningAllAnnotationsSimpleProjectUpfront() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+    @Test
+    void testScanningAllAnnotationsSimpleProjectUpfront() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
 
-		assertEquals(8, allSymbols.size());
+        assertEquals(8, allSymbols.size());
 
-		// TODO: the direct path to URI conversion changes the é into an %-encoded character, so maybe we should switch to that entirely
+        // TODO: the direct path to URI conversion changes the é into an %-encoded character, so maybe we should switch to that entirely
 
 //		String docUri = directory.toPath().resolve("src/main/java/org/test/ClassWithSpécialCharacter.java").toUri().toString();
-		String docUri = UriUtil.toUri(directory.toPath().resolve("src/main/java/org/test/ClassWithSpécialCharacter.java").toFile()).toString();
-		
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
-	}
+        String docUri = UriUtil.toUri(directory.toPath().resolve("src/main/java/org/test/ClassWithSpécialCharacter.java").toFile()).toString();
+
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@Configurable", docUri, 4, 0, 4, 13));
+    }
 	
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.nio.file.Paths;
@@ -20,9 +20,8 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.lsp4j.WorkspaceSymbol;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -39,13 +38,10 @@ import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
-//@BootLanguageServerTest
 @OverrideAutoConfiguration(enabled=false)
 @Import({LanguageServerAutoConf.class, XmlBeansTestConf.class})
 @SpringBootTest(classes={
@@ -62,7 +58,7 @@ public class SpringIndexerXMLProjectTest {
 	private File directory;
 	private IJavaProject project;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		indexer.configureIndexer(SymbolIndexConfig.builder()
@@ -81,109 +77,109 @@ public class SpringIndexerXMLProjectTest {
 		initProject.get(5, TimeUnit.SECONDS);
 	}
 
-	@Test
-	public void testScanningSimpleSpringXMLConfig() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+    @Test
+    void testScanningSimpleSpringXMLConfig() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
 
-		assertEquals(5, allSymbols.size());
+        assertEquals(5, allSymbols.size());
 
-		String docUri = directory.toPath().resolve("config/simple-spring-config.xml").toUri().toString();
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'transactionManager' DataSourceTransactionManager", docUri, 6, 14, 6, 37));
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'jdbcTemplate' JdbcTemplate", docUri, 8, 14, 8, 31));
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'namedParameterJdbcTemplate' NamedParameterJdbcTemplate", docUri, 12, 14, 12, 45));
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'persistenceExceptionTranslationPostProcessor' PersistenceExceptionTranslationPostProcessor", docUri, 18, 10, 18, 97));
+        String docUri = directory.toPath().resolve("config/simple-spring-config.xml").toUri().toString();
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'transactionManager' DataSourceTransactionManager", docUri, 6, 14, 6, 37));
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'jdbcTemplate' JdbcTemplate", docUri, 8, 14, 8, 31));
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'namedParameterJdbcTemplate' NamedParameterJdbcTemplate", docUri, 12, 14, 12, 45));
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'persistenceExceptionTranslationPostProcessor' PersistenceExceptionTranslationPostProcessor", docUri, 18, 10, 18, 97));
 
-		List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
-		assertEquals(4, addon.size());
+        List<? extends SymbolAddOnInformation> addon = indexer.getAdditonalInformation(docUri);
+        assertEquals(4, addon.size());
 
-		assertEquals(1, addon.stream()
-			.filter(info -> info instanceof BeansSymbolAddOnInformation)
-			.filter(info -> "transactionManager".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-			.count());
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "transactionManager".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
 
-		assertEquals(1, addon.stream()
-			.filter(info -> info instanceof BeansSymbolAddOnInformation)
-			.filter(info -> "jdbcTemplate".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-			.count());
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "jdbcTemplate".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
 
-		assertEquals(1, addon.stream()
-				.filter(info -> info instanceof BeansSymbolAddOnInformation)
-				.filter(info -> "namedParameterJdbcTemplate".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-				.count());
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "namedParameterJdbcTemplate".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
 
-		assertEquals(1, addon.stream()
-				.filter(info -> info instanceof BeansSymbolAddOnInformation)
-				.filter(info -> "persistenceExceptionTranslationPostProcessor".equals(((BeansSymbolAddOnInformation)info).getBeanID()))
-				.count());
+        assertEquals(1, addon.stream()
+                .filter(info -> info instanceof BeansSymbolAddOnInformation)
+                .filter(info -> "persistenceExceptionTranslationPostProcessor".equals(((BeansSymbolAddOnInformation) info).getBeanID()))
+                .count());
 
 
-		String beansOnClasspathDocUri = directory.toPath().resolve("src/main/resources/beans.xml").toUri().toString();
-		assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'sb' SimpleBean", beansOnClasspathDocUri, 6, 14, 6, 21));
+        String beansOnClasspathDocUri = directory.toPath().resolve("src/main/resources/beans.xml").toUri().toString();
+        assertTrue(SpringIndexerTest.containsSymbol(allSymbols, "@+ 'sb' SimpleBean", beansOnClasspathDocUri, 6, 14, 6, 21));
 
-		addon = indexer.getAdditonalInformation(beansOnClasspathDocUri);
-		assertEquals(1, addon.size());
-		assertEquals("sb", ((BeansSymbolAddOnInformation)addon.get(0)).getBeanID());
-	}
-	
-	@Test
-	public void testReindexXMLConfig() throws Exception {
-		List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
-		assertEquals(5, allSymbols.size());
-		
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(true)
-				.build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(0, allSymbols.size());
-		
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(true)
-				.xmlScanFolders(new String[] {  "src/main" })
-				.build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(1, allSymbols.size());
-		
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(true)
-				.xmlScanFolders(new String[] { "config", "src/main" })
-				.build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(5, allSymbols.size());
+        addon = indexer.getAdditonalInformation(beansOnClasspathDocUri);
+        assertEquals(1, addon.size());
+        assertEquals("sb", ((BeansSymbolAddOnInformation) addon.get(0)).getBeanID());
+    }
 
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(true)
-				.xmlScanFolders(new String[] { "config" })
-				.build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(4, allSymbols.size());
-		
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(false)
-				.xmlScanFolders(new String[] { "config", "src/main" })
-				.build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(0, allSymbols.size());
-		
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(true)
-				.xmlScanFolders(new String[] { "config", "src/main" })
-				.build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(5, allSymbols.size());
-		
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(true)
-				.xmlScanFolders(new String[0])
-				.build());
-		allSymbols = indexer.getAllSymbols("");
-		assertEquals(0, allSymbols.size());
+    @Test
+    void testReindexXMLConfig() throws Exception {
+        List<? extends WorkspaceSymbol> allSymbols = indexer.getAllSymbols("");
+        assertEquals(5, allSymbols.size());
 
-		indexer.configureIndexer(SymbolIndexConfig.builder()
-				.scanXml(true)
-				.xmlScanFolders(new String[0])
-				.build());
-		allSymbols = indexer.getAllSymbols("    ");
-		assertEquals(0, allSymbols.size());
-	}
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(true)
+                .build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(0, allSymbols.size());
+
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(true)
+                .xmlScanFolders(new String[]{  "src/main"})
+                .build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(1, allSymbols.size());
+
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(true)
+                .xmlScanFolders(new String[]{"config", "src/main"})
+                .build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(5, allSymbols.size());
+
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(true)
+                .xmlScanFolders(new String[]{"config"})
+                .build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(4, allSymbols.size());
+
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(false)
+                .xmlScanFolders(new String[]{"config", "src/main"})
+                .build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(0, allSymbols.size());
+
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(true)
+                .xmlScanFolders(new String[]{"config", "src/main"})
+                .build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(5, allSymbols.size());
+
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(true)
+                .xmlScanFolders(new String[0])
+                .build());
+        allSymbols = indexer.getAllSymbols("");
+        assertEquals(0, allSymbols.size());
+
+        indexer.configureIndexer(SymbolIndexConfig.builder()
+                .scanXml(true)
+                .xmlScanFolders(new String[0])
+                .build());
+        allSymbols = indexer.getAllSymbols("    ");
+        assertEquals(0, allSymbols.size());
+    }
 
 }

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

@@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify;
 
 import java.io.File;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.bootiful.BootLanguageServerTest;
@@ -31,14 +31,14 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Tests for Spring properties index in Boot Java server
  *
  * @author Alex Boyko
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringPropertyIndexTest {
@@ -49,36 +49,36 @@ public class SpringPropertyIndexTest {
 	@Autowired
 	private DefaultSpringPropertyIndexProvider propertyIndexProvider;
 
-	@Test
-	public void testPropertiesIndexRefreshOnProjectChange() throws Exception {
-		harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI()));
+    @Test
+    void testPropertiesIndexRefreshOnProjectChange() throws Exception {
+        harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI()));
 
-		File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI());
+        File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI());
 
-		File javaFile = new File(directory, "/src/main/java/org/test/SimpleMappingClass.java");
+        File javaFile = new File(directory, "/src/main/java/org/test/SimpleMappingClass.java");
 
-		TextDocument doc = new TextDocument(javaFile.toURI().toString(), LanguageId.JAVA);
+        TextDocument doc = new TextDocument(javaFile.toURI().toString(), LanguageId.JAVA);
 
-		// Not cached yet, hence progress service invoked
-		ProgressService progressService = mock(ProgressService.class);
-		propertyIndexProvider.setProgressService(progressService);
-		propertyIndexProvider.getIndex(doc);
-		verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
+        // Not cached yet, hence progress service invoked
+        ProgressService progressService = mock(ProgressService.class);
+        propertyIndexProvider.setProgressService(progressService);
+        propertyIndexProvider.getIndex(doc);
+        verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
 
-		// Should be cached now, so progress service should not be touched
-		progressService = mock(ProgressService.class);
-		propertyIndexProvider.setProgressService(progressService);
-		propertyIndexProvider.getIndex(doc);
-		verify(progressService, never()).progressBegin(any(), any(), any());
+        // Should be cached now, so progress service should not be touched
+        progressService = mock(ProgressService.class);
+        propertyIndexProvider.setProgressService(progressService);
+        propertyIndexProvider.getIndex(doc);
+        verify(progressService, never()).progressBegin(any(), any(), any());
 
-		// Change POM file for the project
-		harness.changeFile(new File(directory, MavenCore.POM_XML).toURI().toString());
+        // Change POM file for the project
+        harness.changeFile(new File(directory, MavenCore.POM_XML).toURI().toString());
 
-		// POM has changed, hence project needs to be reloaded, cached value is cleared
-		progressService = mock(ProgressService.class);
-		propertyIndexProvider.setProgressService(progressService);
-		propertyIndexProvider.getIndex(doc);
-		verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
-	}
+        // POM has changed, hence project needs to be reloaded, cached value is cleared
+        progressService = mock(ProgressService.class);
+        propertyIndexProvider.setProgressService(progressService);
+        propertyIndexProvider.getIndex(doc);
+        verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
+    }
 
 }

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

@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.utils.SymbolCacheKey;
 
 /**
@@ -21,58 +21,58 @@ import org.springframework.ide.vscode.boot.java.utils.SymbolCacheKey;
  */
 public class SymbolCacheKeyTest {
 
-	@Test
-	public void testCacheKey() {
-		SymbolCacheKey key = new SymbolCacheKey("primary", "version");
+    @Test
+    void testCacheKey() {
+        SymbolCacheKey key = new SymbolCacheKey("primary", "version");
 
-		assertEquals("primary", key.getPrimaryIdentifier());
-		assertEquals("version", key.getVersion());
-		assertEquals("primary-version", key.toString());
-	}
+        assertEquals("primary", key.getPrimaryIdentifier());
+        assertEquals("version", key.getVersion());
+        assertEquals("primary-version", key.toString());
+    }
 
-	@Test
-	public void testCacheKeyParsingFromFileName() {
-		SymbolCacheKey key = SymbolCacheKey.parse("primary-version.json");
-		assertEquals("primary", key.getPrimaryIdentifier());
-		assertEquals("version", key.getVersion());
+    @Test
+    void testCacheKeyParsingFromFileName() {
+        SymbolCacheKey key = SymbolCacheKey.parse("primary-version.json");
+        assertEquals("primary", key.getPrimaryIdentifier());
+        assertEquals("version", key.getVersion());
 
-		key = SymbolCacheKey.parse("primary-name-with-separator-123ABC.json");
-		assertEquals("primary-name-with-separator", key.getPrimaryIdentifier());
-		assertEquals("123ABC", key.getVersion());
-	}
+        key = SymbolCacheKey.parse("primary-name-with-separator-123ABC.json");
+        assertEquals("primary-name-with-separator", key.getPrimaryIdentifier());
+        assertEquals("123ABC", key.getVersion());
+    }
 
-	@Test
-	public void testCacheKeyParsingWithoutFileExtension() {
-		SymbolCacheKey key = SymbolCacheKey.parse("primary-version");
-		assertEquals("primary", key.getPrimaryIdentifier());
-		assertEquals("version", key.getVersion());
+    @Test
+    void testCacheKeyParsingWithoutFileExtension() {
+        SymbolCacheKey key = SymbolCacheKey.parse("primary-version");
+        assertEquals("primary", key.getPrimaryIdentifier());
+        assertEquals("version", key.getVersion());
 
-		key = SymbolCacheKey.parse("primary-name-with-separator-123ABC");
-		assertEquals("primary-name-with-separator", key.getPrimaryIdentifier());
-		assertEquals("123ABC", key.getVersion());
-	}
+        key = SymbolCacheKey.parse("primary-name-with-separator-123ABC");
+        assertEquals("primary-name-with-separator", key.getPrimaryIdentifier());
+        assertEquals("123ABC", key.getVersion());
+    }
 
-	@Test
-	public void testCacheKeyEquals() {
-		SymbolCacheKey key1 = new SymbolCacheKey("primary", "1");
-		SymbolCacheKey key2 = new SymbolCacheKey("primary", "1");
+    @Test
+    void testCacheKeyEquals() {
+        SymbolCacheKey key1 = new SymbolCacheKey("primary", "1");
+        SymbolCacheKey key2 = new SymbolCacheKey("primary", "1");
 
-		SymbolCacheKey key3 = new SymbolCacheKey("primary", "2");
-		SymbolCacheKey key4 = new SymbolCacheKey("secondary", "1");
+        SymbolCacheKey key3 = new SymbolCacheKey("primary", "2");
+        SymbolCacheKey key4 = new SymbolCacheKey("secondary", "1");
 
-		assertEquals(key1, key1);
-		assertEquals(key2, key2);
-		assertEquals(key3, key3);
-		assertEquals(key4, key4);
+        assertEquals(key1, key1);
+        assertEquals(key2, key2);
+        assertEquals(key3, key3);
+        assertEquals(key4, key4);
 
-		assertEquals(key1, key2);
+        assertEquals(key1, key2);
 
-		assertNotEquals(key1, key3);
-		assertNotEquals(key2, key3);
-		assertNotEquals(key3, key4);
-		assertNotEquals(key1, key4);
-		assertNotEquals(key4, key1);
-		assertNotEquals(key4, key2);
-	}
+        assertNotEquals(key1, key3);
+        assertNotEquals(key2, key3);
+        assertNotEquals(key3, key4);
+        assertNotEquals(key1, key4);
+        assertNotEquals(key4, key1);
+        assertNotEquals(key4, key2);
+    }
 
 }

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

@@ -10,11 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -32,10 +28,9 @@ import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.SymbolKind;
 import org.eclipse.lsp4j.WorkspaceSymbol;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.handlers.EnhancedSymbolInformation;
 import org.springframework.ide.vscode.boot.java.handlers.SymbolAddOnInformation;
 import org.springframework.ide.vscode.boot.java.requestmapping.WebfluxElementsInformation;
@@ -54,319 +49,319 @@ public class SymbolCacheOnDiscTest {
 	private Path tempDir;
 	private SymbolCacheOnDisc cache;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		tempDir = Files.createTempDirectory("cachetest");
 		cache = new SymbolCacheOnDisc(tempDir.toFile());
 	}
 
-	@After
+	@AfterEach
 	public void deleteTempDir() throws Exception {
 		FileUtils.deleteDirectory(tempDir.toFile());
 	}
 
-	@Test
-	public void testEmptyCache() throws Exception {
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("something", "0"), new String[0]);
-		assertNull(result);
-	}
-
-	@Test
-	public void testSimpleValidCache() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
-		Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
-
-		Files.createFile(file1);
-		Files.createFile(file2);
-		Files.createFile(file3);
-
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toString(), file2.toString(), file3.toString()};
-
-		List<CachedSymbol> generatedSymbols = new ArrayList<>();
-		WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, null);
-		generatedSymbols.add(new CachedSymbol("", timeFile1.toMillis(), enhancedSymbol));
-
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, ImmutableMultimap.of(
-				file1.toString(), "file1dep1",
-				file2.toString(), "file2dep1",
-				file2.toString(), "file2dep2"
-		));
-
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
-		
-		CachedSymbol[] cachedSymbols = result.getLeft();
-		assertNotNull(cachedSymbols);
-		assertEquals(1, cachedSymbols.length);
-
-		assertEquals("symbol1", cachedSymbols[0].getEnhancedSymbol().getSymbol().getName());
-		assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getSymbol().getKind());
-		assertEquals(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getEnhancedSymbol().getSymbol().getLocation().getLeft());
-		assertNull(cachedSymbols[0].getEnhancedSymbol().getAdditionalInformation());
-		
-		Multimap<String, String> dependencies = result.getRight();
-		assertEquals(2, dependencies.keySet().size());
-		assertEquals(dependencies.get(file1.toString()), ImmutableSet.of("file1dep1"));
-		assertEquals(dependencies.get(file2.toString()), ImmutableSet.of("file2dep1", "file2dep2"));
-		
-		assertEquals(timeFile1.toMillis(), cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file1.toString()));
-		assertEquals(0, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), "random-non-existing-file"));
-	}
-
-	@Test
-	public void testDifferentCacheKey() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
-		Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
-
-		Files.createFile(file1);
-		Files.createFile(file2);
-		Files.createFile(file3);
-
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toString(), file2.toString(), file3.toString()};
-
-		List<CachedSymbol> generatedSymbols = new ArrayList<>();
-		WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, null);
-		generatedSymbols.add(new CachedSymbol("", timeFile1.toMillis(), enhancedSymbol));
-
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, null);
-
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("otherkey", "1"), files);
-		assertNull(result);
-	}
-
-	@Test
-	public void testFileTouched() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
-		Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
-
-		Files.createFile(file1);
-		Files.createFile(file2);
-		Files.createFile(file3);
-
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toString(), file2.toString(), file3.toString()};
-
-		List<CachedSymbol> generatedSymbols = new ArrayList<>();
-		WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, null);
-		generatedSymbols.add(new CachedSymbol("", timeFile1.toMillis(), enhancedSymbol));
-
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, ImmutableMultimap.of(
-				file1.toString(), "file1dep",
-				file2.toString(), "file2dep"
-		));
-
-		assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 1000));
-		
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
-		assertNull(result);
-	}
-
-	@Test
-	public void testMoreFiles() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
-		Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
-
-		Files.createFile(file1);
-		Files.createFile(file2);
-		Files.createFile(file3);
-
-		String[] files = {file1.toString(), file2.toString()};
-		cache.store(new SymbolCacheKey("somekey", "1"), files, new ArrayList<>(), null);
-
-		String[] moreFiles = {file1.toString(), file2.toString(), file3.toString()};
-		assertNull(cache.retrieve(new SymbolCacheKey("somekey", "1"), moreFiles));
-	}
-
-	@Test
-	public void testFewerFiles() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
-		Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
-
-		Files.createFile(file1);
-		Files.createFile(file2);
-		Files.createFile(file3);
-
-		String[] files = {file1.toString(), file2.toString(), file3.toString()};
-		cache.store(new SymbolCacheKey("somekey", "1"), files, new ArrayList<>(), null);
-
-		String[] fewerFiles = {file1.toString(), file2.toString()};
-		assertNull(cache.retrieve(new SymbolCacheKey("somekey", "1"), fewerFiles));
-	}
-
-	@Test
-	public void testDeleteOldCacheFileIfNewOneIsStored() throws Exception {
-		SymbolCacheKey key1 = new SymbolCacheKey("somekey", "1");
-		cache.store(key1, new String[0], new ArrayList<>(), null);
-		assertTrue(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
-
-		SymbolCacheKey key2 = new SymbolCacheKey("somekey", "2");
-		cache.store(key2, new String[0], new ArrayList<>(), null);
-		assertTrue(Files.exists(tempDir.resolve(Paths.get(key2.toString() + ".json"))));
-		assertFalse(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
-	}
-
-	@Test
-	public void testEnhancedInformationSubclasses() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Files.createFile(file1);
-
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toString()};
-		String doc1URI = UriUtil.toUri(file1.toFile()).toString();
-
-		List<CachedSymbol> generatedSymbols = new ArrayList<>();
+    @Test
+    void testEmptyCache() throws Exception {
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("something", "0"), new String[0]);
+        assertNull(result);
+    }
+
+    @Test
+    void testSimpleValidCache() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
+
+        Files.createFile(file1);
+        Files.createFile(file2);
+        Files.createFile(file3);
+
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toString(), file2.toString(), file3.toString()};
+
+        List<CachedSymbol> generatedSymbols = new ArrayList<>();
+        WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, null);
+        generatedSymbols.add(new CachedSymbol("", timeFile1.toMillis(), enhancedSymbol));
+
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, ImmutableMultimap.of(
+                file1.toString(), "file1dep1",
+                file2.toString(), "file2dep1",
+                file2.toString(), "file2dep2"
+        ));
+
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
+
+        CachedSymbol[] cachedSymbols = result.getLeft();
+        assertNotNull(cachedSymbols);
+        assertEquals(1, cachedSymbols.length);
+
+        assertEquals("symbol1", cachedSymbols[0].getEnhancedSymbol().getSymbol().getName());
+        assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getSymbol().getKind());
+        assertEquals(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getEnhancedSymbol().getSymbol().getLocation().getLeft());
+        assertNull(cachedSymbols[0].getEnhancedSymbol().getAdditionalInformation());
+
+        Multimap<String, String> dependencies = result.getRight();
+        assertEquals(2, dependencies.keySet().size());
+        assertEquals(dependencies.get(file1.toString()), ImmutableSet.of("file1dep1"));
+        assertEquals(dependencies.get(file2.toString()), ImmutableSet.of("file2dep1", "file2dep2"));
+
+        assertEquals(timeFile1.toMillis(), cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file1.toString()));
+        assertEquals(0, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), "random-non-existing-file"));
+    }
+
+    @Test
+    void testDifferentCacheKey() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
+
+        Files.createFile(file1);
+        Files.createFile(file2);
+        Files.createFile(file3);
+
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toString(), file2.toString(), file3.toString()};
+
+        List<CachedSymbol> generatedSymbols = new ArrayList<>();
+        WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, null);
+        generatedSymbols.add(new CachedSymbol("", timeFile1.toMillis(), enhancedSymbol));
+
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, null);
+
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("otherkey", "1"), files);
+        assertNull(result);
+    }
+
+    @Test
+    void testFileTouched() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
+
+        Files.createFile(file1);
+        Files.createFile(file2);
+        Files.createFile(file3);
+
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toString(), file2.toString(), file3.toString()};
+
+        List<CachedSymbol> generatedSymbols = new ArrayList<>();
+        WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, null);
+        generatedSymbols.add(new CachedSymbol("", timeFile1.toMillis(), enhancedSymbol));
+
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, ImmutableMultimap.of(
+                file1.toString(), "file1dep",
+                file2.toString(), "file2dep"
+        ));
+
+        assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 1000));
+
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
+        assertNull(result);
+    }
+
+    @Test
+    void testMoreFiles() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
 
-		WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		WebfluxElementsInformation addon = new WebfluxElementsInformation(new Range(new Position(4, 4), new Position(5, 5)), new Range(new Position(6, 6), new Position(7, 7)));
-		EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, new SymbolAddOnInformation[] {addon});
+        Files.createFile(file1);
+        Files.createFile(file2);
+        Files.createFile(file3);
 
-		generatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol));
+        String[] files = {file1.toString(), file2.toString()};
+        cache.store(new SymbolCacheKey("somekey", "1"), files, new ArrayList<>(), null);
 
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, null);
+        String[] moreFiles = {file1.toString(), file2.toString(), file3.toString()};
+        assertNull(cache.retrieve(new SymbolCacheKey("somekey", "1"), moreFiles));
+    }
 
-		CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
-		assertNotNull(cachedSymbols);
-		assertEquals(1, cachedSymbols.length);
-
-		assertEquals("symbol1", cachedSymbols[0].getEnhancedSymbol().getSymbol().getName());
-		assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getSymbol().getKind());
-		assertEquals(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getEnhancedSymbol().getSymbol().getLocation().getLeft());
-
-		SymbolAddOnInformation[] retrievedAddOns = cachedSymbols[0].getEnhancedSymbol().getAdditionalInformation();
-		assertNotNull(retrievedAddOns);
-		assertEquals(1, retrievedAddOns.length);
-		assertTrue(retrievedAddOns[0] instanceof WebfluxElementsInformation);
-
-		Range[] ranges = ((WebfluxElementsInformation)retrievedAddOns[0]).getRanges();
-		assertEquals(2, ranges.length);
-		assertEquals(new Range(new Position(4, 4), new Position(5, 5)), ranges[0]);
-		assertEquals(new Range(new Position(6, 6), new Position(7, 7)), ranges[1]);
-	}
-
-	@Test
-	public void testSymbolAddedToExistingFile() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-
-		Files.createFile(file1);
-
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toAbsolutePath().toString()};
-
-		String doc1URI = UriUtil.toUri(file1.toFile()).toString();
-
-		List<CachedSymbol> generatedSymbols1 = new ArrayList<>();
-		WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
-		generatedSymbols1.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
-
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, null);
-
-		List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
-		symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
-
-		WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Interface, Either.forLeft(new Location(doc1URI, new Range(new Position(5, 5), new Position(5, 10)))));
-		EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
-
-		generatedSymbols2.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, enhancedSymbol1));
-		generatedSymbols2.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, enhancedSymbol2));
-
-		assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
-		cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols2, null);
-
-		CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
-		assertNotNull(cachedSymbols);
-		assertEquals(2, cachedSymbols.length);
-		
-		assertEquals(timeFile1.toMillis() + 2000, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file1.toString()));
-	}
-
-	@Test
-	public void testSymbolsAddedToMultipleFiles() throws Exception {
-		
-		// create 3 files with one symbol each
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
-		Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
-
-		Files.createFile(file1);
-		Files.createFile(file2);
-		Files.createFile(file3);
-
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		FileTime timeFile2 = Files.getLastModifiedTime(file2);
-		FileTime timeFile3 = Files.getLastModifiedTime(file3);
-
-		String[] files = {file1.toAbsolutePath().toString(), file2.toAbsolutePath().toString(), file3.toAbsolutePath().toString()};
-
-		String doc1URI = UriUtil.toUri(file1.toFile()).toString();
-		String doc2URI = UriUtil.toUri(file2.toFile()).toString();
-		String doc3URI = UriUtil.toUri(file3.toFile()).toString();
-
-		List<CachedSymbol> generatedSymbols = new ArrayList<>();
-		WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
-		generatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
-
-		WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Field, Either.forLeft(new Location(doc2URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
-		generatedSymbols.add(new CachedSymbol(doc2URI, timeFile2.toMillis(), enhancedSymbol2));
-
-		WorkspaceSymbol symbol3 = new WorkspaceSymbol("symbol3", SymbolKind.Field, Either.forLeft(new Location(doc3URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol3 = new EnhancedSymbolInformation(symbol3, null);
-		generatedSymbols.add(new CachedSymbol(doc3URI, timeFile3.toMillis(), enhancedSymbol3));
-
-		// store original version of the symbols to the cache 
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, null);
-
-
-		// create updated and new symbols
-		List<CachedSymbol> updatedSymbols = new ArrayList<>();
-		
-		WorkspaceSymbol updatedSymbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation updatedEnhancedSymbol1 = new EnhancedSymbolInformation(updatedSymbol1, null);
-
-		WorkspaceSymbol newSymbol1 = new WorkspaceSymbol("symbol1-new", SymbolKind.Interface, Either.forLeft(new Location(doc1URI, new Range(new Position(5, 5), new Position(5, 10)))));
-		EnhancedSymbolInformation newEnhancedSymbol1 = new EnhancedSymbolInformation(newSymbol1, null);
-
-		updatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, updatedEnhancedSymbol1));
-		updatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, newEnhancedSymbol1));
-		assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
-
-		WorkspaceSymbol updatedSymbol2 = new WorkspaceSymbol("symbol2-updated", SymbolKind.Field, Either.forLeft(new Location(doc2URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation updatedEnhancedSymbol2 = new EnhancedSymbolInformation(updatedSymbol2, null);
-		updatedSymbols.add(new CachedSymbol(doc2URI, timeFile2.toMillis() + 3000, updatedEnhancedSymbol2));
-		assertTrue(file2.toFile().setLastModified(timeFile2.toMillis() + 3000));
-		
-		String[] updatedFiles = new String[] {file1.toAbsolutePath().toString(), file2.toAbsolutePath().toString()};
-		long[] updatedModificationTimestamps = new long[] {timeFile1.toMillis() + 2000, timeFile2.toMillis() + 3000};
-		
-		// update multiple files in the cache
-		cache.update(new SymbolCacheKey("somekey", "1"), updatedFiles, updatedModificationTimestamps, updatedSymbols, null);
-
-		// double check whether all changes got stored and retrieved correctly
-		CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
-		assertNotNull(cachedSymbols);
-		assertEquals(4, cachedSymbols.length);
-		
-		assertSymbol(updatedEnhancedSymbol1, cachedSymbols);
-		assertSymbol(newEnhancedSymbol1, cachedSymbols);
-		assertSymbol(updatedEnhancedSymbol2, cachedSymbols);
-		assertSymbol(enhancedSymbol3, cachedSymbols);
-
-		assertEquals(timeFile1.toMillis() + 2000, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file1.toString()));
-		assertEquals(timeFile2.toMillis() + 3000, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file2.toString()));
-		assertEquals(timeFile3.toMillis(), cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file3.toString()));
-	}
+    @Test
+    void testFewerFiles() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
+
+        Files.createFile(file1);
+        Files.createFile(file2);
+        Files.createFile(file3);
+
+        String[] files = {file1.toString(), file2.toString(), file3.toString()};
+        cache.store(new SymbolCacheKey("somekey", "1"), files, new ArrayList<>(), null);
+
+        String[] fewerFiles = {file1.toString(), file2.toString()};
+        assertNull(cache.retrieve(new SymbolCacheKey("somekey", "1"), fewerFiles));
+    }
+
+    @Test
+    void testDeleteOldCacheFileIfNewOneIsStored() throws Exception {
+        SymbolCacheKey key1 = new SymbolCacheKey("somekey", "1");
+        cache.store(key1, new String[0], new ArrayList<>(), null);
+        assertTrue(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
+
+        SymbolCacheKey key2 = new SymbolCacheKey("somekey", "2");
+        cache.store(key2, new String[0], new ArrayList<>(), null);
+        assertTrue(Files.exists(tempDir.resolve(Paths.get(key2.toString() + ".json"))));
+        assertFalse(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
+    }
+
+    @Test
+    void testEnhancedInformationSubclasses() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Files.createFile(file1);
+
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toString()};
+        String doc1URI = UriUtil.toUri(file1.toFile()).toString();
+
+        List<CachedSymbol> generatedSymbols = new ArrayList<>();
+
+        WorkspaceSymbol symbol = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        WebfluxElementsInformation addon = new WebfluxElementsInformation(new Range(new Position(4, 4), new Position(5, 5)), new Range(new Position(6, 6), new Position(7, 7)));
+        EnhancedSymbolInformation enhancedSymbol = new EnhancedSymbolInformation(symbol, new SymbolAddOnInformation[]{addon});
+
+        generatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol));
+
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, null);
+
+        CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
+        assertNotNull(cachedSymbols);
+        assertEquals(1, cachedSymbols.length);
+
+        assertEquals("symbol1", cachedSymbols[0].getEnhancedSymbol().getSymbol().getName());
+        assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getSymbol().getKind());
+        assertEquals(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getEnhancedSymbol().getSymbol().getLocation().getLeft());
+
+        SymbolAddOnInformation[] retrievedAddOns = cachedSymbols[0].getEnhancedSymbol().getAdditionalInformation();
+        assertNotNull(retrievedAddOns);
+        assertEquals(1, retrievedAddOns.length);
+        assertTrue(retrievedAddOns[0] instanceof WebfluxElementsInformation);
+
+        Range[] ranges = ((WebfluxElementsInformation) retrievedAddOns[0]).getRanges();
+        assertEquals(2, ranges.length);
+        assertEquals(new Range(new Position(4, 4), new Position(5, 5)), ranges[0]);
+        assertEquals(new Range(new Position(6, 6), new Position(7, 7)), ranges[1]);
+    }
+
+    @Test
+    void testSymbolAddedToExistingFile() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+
+        Files.createFile(file1);
+
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toAbsolutePath().toString()};
+
+        String doc1URI = UriUtil.toUri(file1.toFile()).toString();
+
+        List<CachedSymbol> generatedSymbols1 = new ArrayList<>();
+        WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
+        generatedSymbols1.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
+
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, null);
+
+        List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
+        symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
+
+        WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Interface, Either.forLeft(new Location(doc1URI, new Range(new Position(5, 5), new Position(5, 10)))));
+        EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
+
+        generatedSymbols2.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, enhancedSymbol1));
+        generatedSymbols2.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, enhancedSymbol2));
+
+        assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
+        cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols2, null);
+
+        CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
+        assertNotNull(cachedSymbols);
+        assertEquals(2, cachedSymbols.length);
+
+        assertEquals(timeFile1.toMillis() + 2000, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file1.toString()));
+    }
+
+    @Test
+    void testSymbolsAddedToMultipleFiles() throws Exception {
+
+        // create 3 files with one symbol each
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        Path file3 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile3");
+
+        Files.createFile(file1);
+        Files.createFile(file2);
+        Files.createFile(file3);
+
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        FileTime timeFile2 = Files.getLastModifiedTime(file2);
+        FileTime timeFile3 = Files.getLastModifiedTime(file3);
+
+        String[] files = {file1.toAbsolutePath().toString(), file2.toAbsolutePath().toString(), file3.toAbsolutePath().toString()};
+
+        String doc1URI = UriUtil.toUri(file1.toFile()).toString();
+        String doc2URI = UriUtil.toUri(file2.toFile()).toString();
+        String doc3URI = UriUtil.toUri(file3.toFile()).toString();
+
+        List<CachedSymbol> generatedSymbols = new ArrayList<>();
+        WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
+        generatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
+
+        WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Field, Either.forLeft(new Location(doc2URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
+        generatedSymbols.add(new CachedSymbol(doc2URI, timeFile2.toMillis(), enhancedSymbol2));
+
+        WorkspaceSymbol symbol3 = new WorkspaceSymbol("symbol3", SymbolKind.Field, Either.forLeft(new Location(doc3URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol3 = new EnhancedSymbolInformation(symbol3, null);
+        generatedSymbols.add(new CachedSymbol(doc3URI, timeFile3.toMillis(), enhancedSymbol3));
+
+        // store original version of the symbols to the cache 
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, null);
+
+
+        // create updated and new symbols
+        List<CachedSymbol> updatedSymbols = new ArrayList<>();
+
+        WorkspaceSymbol updatedSymbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation updatedEnhancedSymbol1 = new EnhancedSymbolInformation(updatedSymbol1, null);
+
+        WorkspaceSymbol newSymbol1 = new WorkspaceSymbol("symbol1-new", SymbolKind.Interface, Either.forLeft(new Location(doc1URI, new Range(new Position(5, 5), new Position(5, 10)))));
+        EnhancedSymbolInformation newEnhancedSymbol1 = new EnhancedSymbolInformation(newSymbol1, null);
+
+        updatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, updatedEnhancedSymbol1));
+        updatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis() + 2000, newEnhancedSymbol1));
+        assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
+
+        WorkspaceSymbol updatedSymbol2 = new WorkspaceSymbol("symbol2-updated", SymbolKind.Field, Either.forLeft(new Location(doc2URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation updatedEnhancedSymbol2 = new EnhancedSymbolInformation(updatedSymbol2, null);
+        updatedSymbols.add(new CachedSymbol(doc2URI, timeFile2.toMillis() + 3000, updatedEnhancedSymbol2));
+        assertTrue(file2.toFile().setLastModified(timeFile2.toMillis() + 3000));
+
+        String[] updatedFiles = new String[]{file1.toAbsolutePath().toString(), file2.toAbsolutePath().toString()};
+        long[] updatedModificationTimestamps = new long[]{timeFile1.toMillis() + 2000, timeFile2.toMillis() + 3000};
+
+        // update multiple files in the cache
+        cache.update(new SymbolCacheKey("somekey", "1"), updatedFiles, updatedModificationTimestamps, updatedSymbols, null);
+
+        // double check whether all changes got stored and retrieved correctly
+        CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
+        assertNotNull(cachedSymbols);
+        assertEquals(4, cachedSymbols.length);
+
+        assertSymbol(updatedEnhancedSymbol1, cachedSymbols);
+        assertSymbol(newEnhancedSymbol1, cachedSymbols);
+        assertSymbol(updatedEnhancedSymbol2, cachedSymbols);
+        assertSymbol(enhancedSymbol3, cachedSymbols);
+
+        assertEquals(timeFile1.toMillis() + 2000, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file1.toString()));
+        assertEquals(timeFile2.toMillis() + 3000, cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file2.toString()));
+        assertEquals(timeFile3.toMillis(), cache.getModificationTimestamp(new SymbolCacheKey("somekey", "1"), file3.toString()));
+    }
 
 	private void assertSymbol(EnhancedSymbolInformation enhancedSymbol, CachedSymbol[] cachedSymbols) {
 		for (CachedSymbol cachedSymbol : cachedSymbols) {
@@ -378,206 +373,206 @@ public class SymbolCacheOnDiscTest {
 		}
 		
 		
-		Assert.fail("symbol not found: " + enhancedSymbol.getSymbol().toString());
+		fail("symbol not found: " + enhancedSymbol.getSymbol().toString());
 	}
 
-	@Test
-	public void testDependencyAddedToExistingFile() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+    @Test
+    void testDependencyAddedToExistingFile() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
 
-		Files.createFile(file1);
+        Files.createFile(file1);
 
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toAbsolutePath().toString()};
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toAbsolutePath().toString()};
 
-		List<CachedSymbol> generatedSymbols = ImmutableList.of();
-		
-		Multimap<String, String> dependencies = ImmutableMultimap.of(file1.toString(), "dep1");
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, dependencies);
+        List<CachedSymbol> generatedSymbols = ImmutableList.of();
 
-		assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
-		Set<String> dependencies2 = ImmutableSet.of("dep1", "dep2");
-		cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols, dependencies2);
+        Multimap<String, String> dependencies = ImmutableMultimap.of(file1.toString(), "dep1");
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, dependencies);
 
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
-		assertNotNull(result);
-		assertEquals(ImmutableSet.of("dep1", "dep2"), result.getRight().get(file1.toString()));
-	}
+        assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
+        Set<String> dependencies2 = ImmutableSet.of("dep1", "dep2");
+        cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols, dependencies2);
 
-	@Test
-	public void testSymbolRemovedFromExistingFile() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
+        assertNotNull(result);
+        assertEquals(ImmutableSet.of("dep1", "dep2"), result.getRight().get(file1.toString()));
+    }
 
-		Files.createFile(file1);
+    @Test
+    void testSymbolRemovedFromExistingFile() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
 
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toAbsolutePath().toString()};
+        Files.createFile(file1);
 
-		String doc1URI = UriUtil.toUri(file1.toFile()).toString();
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toAbsolutePath().toString()};
 
-		List<CachedSymbol> generatedSymbols1 = new ArrayList<>();
-		WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
-		generatedSymbols1.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
+        String doc1URI = UriUtil.toUri(file1.toFile()).toString();
 
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, null);
+        List<CachedSymbol> generatedSymbols1 = new ArrayList<>();
+        WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
+        generatedSymbols1.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
 
-		List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
-		assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, null);
 
-		cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols2, null);
+        List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
+        assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
 
-		CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
-		assertNotNull(cachedSymbols);
-		assertEquals(0, cachedSymbols.length);
-	}
+        cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols2, null);
 
-	@Test
-	public void testDependencyRemovedFromExistingFile() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), files);
+        assertNotNull(cachedSymbols);
+        assertEquals(0, cachedSymbols.length);
+    }
 
-		Files.createFile(file1);
+    @Test
+    void testDependencyRemovedFromExistingFile() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
 
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		String[] files = {file1.toAbsolutePath().toString()};
+        Files.createFile(file1);
 
-		List<CachedSymbol> generatedSymbols1 = ImmutableList.of();
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        String[] files = {file1.toAbsolutePath().toString()};
 
-		ImmutableMultimap<String, String> dependencies1 = ImmutableMultimap.of(
-			file1.toString(), "dep1",
-			file1.toString(), "dep2"
-		);
-		
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, dependencies1);
+        List<CachedSymbol> generatedSymbols1 = ImmutableList.of();
 
-		List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
-		assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
+        ImmutableMultimap<String, String> dependencies1 = ImmutableMultimap.of(
+                file1.toString(), "dep1",
+                file1.toString(), "dep2"
+        );
 
-		Set<String> dependencies2 = ImmutableSet.of("dep2");
-		cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols2, dependencies2);
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, dependencies1);
 
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
-		assertNotNull(result);
-		assertEquals(ImmutableSet.of("dep2"), result.getRight().get(file1.toString()));
-	}
+        List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
+        assertTrue(file1.toFile().setLastModified(timeFile1.toMillis() + 2000));
 
-	@Test
-	public void testSymbolAddedToNewFile() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        Set<String> dependencies2 = ImmutableSet.of("dep2");
+        cache.update(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString(), timeFile1.toMillis() + 2000, generatedSymbols2, dependencies2);
 
-		Files.createFile(file1);
-		Files.createFile(file2);
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
+        assertNotNull(result);
+        assertEquals(ImmutableSet.of("dep2"), result.getRight().get(file1.toString()));
+    }
 
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		FileTime timeFile2 = Files.getLastModifiedTime(file2);
-		String[] files = {file1.toString()};
+    @Test
+    void testSymbolAddedToNewFile() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
 
-		String doc1URI = UriUtil.toUri(file1.toFile()).toString();
-		String doc2URI = UriUtil.toUri(file2.toFile()).toString();
+        Files.createFile(file1);
+        Files.createFile(file2);
 
-		List<CachedSymbol> generatedSymbols1 = new ArrayList<>();
-		WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
-		generatedSymbols1.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        FileTime timeFile2 = Files.getLastModifiedTime(file2);
+        String[] files = {file1.toString()};
 
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, null);
+        String doc1URI = UriUtil.toUri(file1.toFile()).toString();
+        String doc2URI = UriUtil.toUri(file2.toFile()).toString();
 
-		List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
-		WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Interface, Either.forLeft(new Location(doc2URI, new Range(new Position(5, 5), new Position(5, 10)))));
-		EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
+        List<CachedSymbol> generatedSymbols1 = new ArrayList<>();
+        WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
+        generatedSymbols1.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
 
-		generatedSymbols2.add(new CachedSymbol(doc2URI, timeFile2.toMillis(), enhancedSymbol2));
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, null);
 
-		cache.update(new SymbolCacheKey("somekey", "1"), file2.toString(), timeFile2.toMillis(), generatedSymbols2, null);
+        List<CachedSymbol> generatedSymbols2 = new ArrayList<>();
+        WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Interface, Either.forLeft(new Location(doc2URI, new Range(new Position(5, 5), new Position(5, 10)))));
+        EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
 
-		CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), new String[] {file1.toString(), file2.toString()});
-		assertNotNull(cachedSymbols);
-		assertEquals(2, cachedSymbols.length);
-	}
+        generatedSymbols2.add(new CachedSymbol(doc2URI, timeFile2.toMillis(), enhancedSymbol2));
 
-	@Test
-	public void testDependencyAddedToNewFile() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+        cache.update(new SymbolCacheKey("somekey", "1"), file2.toString(), timeFile2.toMillis(), generatedSymbols2, null);
 
-		Files.createFile(file1);
-		Files.createFile(file2);
+        CachedSymbol[] cachedSymbols = cache.retrieveSymbols(new SymbolCacheKey("somekey", "1"), new String[]{file1.toString(), file2.toString()});
+        assertNotNull(cachedSymbols);
+        assertEquals(2, cachedSymbols.length);
+    }
 
-		FileTime timeFile2 = Files.getLastModifiedTime(file2);
-		String[] files = {file1.toString()};
+    @Test
+    void testDependencyAddedToNewFile() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
 
-		List<CachedSymbol> generatedSymbols1 = ImmutableList.of();
-		Multimap<String, String> dependencies1 = ImmutableMultimap.of(
-				file1.toString(), "dep1"
-		);
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, dependencies1);
+        Files.createFile(file1);
+        Files.createFile(file2);
 
-		Set<String> dependencies2 = ImmutableSet.of("dep2");
-		cache.update(new SymbolCacheKey("somekey", "1"), file2.toString(), timeFile2.toMillis(), generatedSymbols1, dependencies2);
+        FileTime timeFile2 = Files.getLastModifiedTime(file2);
+        String[] files = {file1.toString()};
 
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), new String[] {file1.toString(), file2.toString()});
-		assertNotNull(result);
-		assertEquals(ImmutableSet.of("dep2"), result.getRight().get(file2.toString()));
-		assertEquals(ImmutableSet.of("dep1"), result.getRight().get(file1.toString()));
-	}
+        List<CachedSymbol> generatedSymbols1 = ImmutableList.of();
+        Multimap<String, String> dependencies1 = ImmutableMultimap.of(
+                file1.toString(), "dep1"
+        );
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols1, dependencies1);
 
-	@Test
-	public void testProjectDeleted() throws Exception {
-		SymbolCacheKey key1 = new SymbolCacheKey("somekey", "1");
-		cache.store(key1, new String[0], new ArrayList<>(), null);
-		assertTrue(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
+        Set<String> dependencies2 = ImmutableSet.of("dep2");
+        cache.update(new SymbolCacheKey("somekey", "1"), file2.toString(), timeFile2.toMillis(), generatedSymbols1, dependencies2);
 
-		cache.remove(key1);
-		assertFalse(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
-	}
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), new String[]{file1.toString(), file2.toString()});
+        assertNotNull(result);
+        assertEquals(ImmutableSet.of("dep2"), result.getRight().get(file2.toString()));
+        assertEquals(ImmutableSet.of("dep1"), result.getRight().get(file1.toString()));
+    }
 
-	@Test
-	public void testFileDeleted() throws Exception {
-		Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
-		Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
+    @Test
+    void testProjectDeleted() throws Exception {
+        SymbolCacheKey key1 = new SymbolCacheKey("somekey", "1");
+        cache.store(key1, new String[0], new ArrayList<>(), null);
+        assertTrue(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
 
-		Files.createFile(file1);
-		Files.createFile(file2);
+        cache.remove(key1);
+        assertFalse(Files.exists(tempDir.resolve(Paths.get(key1.toString() + ".json"))));
+    }
 
-		FileTime timeFile1 = Files.getLastModifiedTime(file1);
-		FileTime timeFile2 = Files.getLastModifiedTime(file2);
-		String[] files = {file1.toAbsolutePath().toString(), file2.toAbsolutePath().toString()};
+    @Test
+    void testFileDeleted() throws Exception {
+        Path file1 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile1");
+        Path file2 = Paths.get(tempDir.toAbsolutePath().toString(), "tempFile2");
 
-		String doc1URI = UriUtil.toUri(file1.toFile()).toString();
-		String doc2URI = UriUtil.toUri(file2.toFile()).toString();
+        Files.createFile(file1);
+        Files.createFile(file2);
 
-		List<CachedSymbol> generatedSymbols = new ArrayList<>();
+        FileTime timeFile1 = Files.getLastModifiedTime(file1);
+        FileTime timeFile2 = Files.getLastModifiedTime(file2);
+        String[] files = {file1.toAbsolutePath().toString(), file2.toAbsolutePath().toString()};
 
-		WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
-		EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
+        String doc1URI = UriUtil.toUri(file1.toFile()).toString();
+        String doc2URI = UriUtil.toUri(file2.toFile()).toString();
 
-		WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Field, Either.forLeft(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20)))));
-		EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
+        List<CachedSymbol> generatedSymbols = new ArrayList<>();
 
-		generatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
-		generatedSymbols.add(new CachedSymbol(doc2URI, timeFile2.toMillis(), enhancedSymbol2));
+        WorkspaceSymbol symbol1 = new WorkspaceSymbol("symbol1", SymbolKind.Field, Either.forLeft(new Location(doc1URI, new Range(new Position(3, 10), new Position(3, 20)))));
+        EnhancedSymbolInformation enhancedSymbol1 = new EnhancedSymbolInformation(symbol1, null);
 
-		Multimap<String, String> dependencies = ImmutableMultimap.of(
-				file1.toString(), "dep1",
-				file2.toString(), "dep2"
-		);
-		cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, dependencies);
-		cache.removeFile(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString());
+        WorkspaceSymbol symbol2 = new WorkspaceSymbol("symbol2", SymbolKind.Field, Either.forLeft(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20)))));
+        EnhancedSymbolInformation enhancedSymbol2 = new EnhancedSymbolInformation(symbol2, null);
 
-		files = new String[] {file2.toAbsolutePath().toString()};
-		Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
-		CachedSymbol[] cachedSymbols = result.getLeft();
-		assertNotNull(result);
-		assertEquals(1, cachedSymbols.length);
+        generatedSymbols.add(new CachedSymbol(doc1URI, timeFile1.toMillis(), enhancedSymbol1));
+        generatedSymbols.add(new CachedSymbol(doc2URI, timeFile2.toMillis(), enhancedSymbol2));
 
-		assertEquals("symbol2", cachedSymbols[0].getEnhancedSymbol().getSymbol().getName());
-		assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getSymbol().getKind());
-		assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getEnhancedSymbol().getSymbol().getLocation().getLeft());
-		assertNull(cachedSymbols[0].getEnhancedSymbol().getAdditionalInformation());
-		
-		Multimap<String, String> cachedDependencies = result.getRight();
-		assertEquals(ImmutableSet.of(), cachedDependencies.get(file1.toString()));
-		assertEquals(ImmutableSet.of("dep2"), cachedDependencies.get(file2.toString()));
-	}
+        Multimap<String, String> dependencies = ImmutableMultimap.of(
+                file1.toString(), "dep1",
+                file2.toString(), "dep2"
+        );
+        cache.store(new SymbolCacheKey("somekey", "1"), files, generatedSymbols, dependencies);
+        cache.removeFile(new SymbolCacheKey("somekey", "1"), file1.toAbsolutePath().toString());
+
+        files = new String[]{file2.toAbsolutePath().toString()};
+        Pair<CachedSymbol[], Multimap<String, String>> result = cache.retrieve(new SymbolCacheKey("somekey", "1"), files);
+        CachedSymbol[] cachedSymbols = result.getLeft();
+        assertNotNull(result);
+        assertEquals(1, cachedSymbols.length);
+
+        assertEquals("symbol2", cachedSymbols[0].getEnhancedSymbol().getSymbol().getName());
+        assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getSymbol().getKind());
+        assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getEnhancedSymbol().getSymbol().getLocation().getLeft());
+        assertNull(cachedSymbols[0].getEnhancedSymbol().getAdditionalInformation());
+
+        Multimap<String, String> cachedDependencies = result.getRight();
+        assertEquals(ImmutableSet.of(), cachedDependencies.get(file1.toString()));
+        assertEquals(ImmutableSet.of("dep2"), cachedDependencies.get(file2.toString()));
+    }
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.net.URI;
@@ -22,7 +22,7 @@ import java.util.Optional;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.gradle.internal.impldep.com.google.common.collect.ImmutableList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.links.VSCodeSourceLinks;
 import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -58,72 +58,72 @@ public class VSCodeSourceLinksTest {
 
 	});
 
-	@Test
-	public void testJavaSourceUrl() throws Exception {
-		MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
-		Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), null).sourceLinkUrlForFQName(project, "com.example.EmptyBoot15WebAppApplication");
-		assertTrue(url.isPresent());
-		Path projectPath = Paths.get(project.pom().getParent());
-		URI uri = URI.create(url.get());
+    @Test
+    void testJavaSourceUrl() throws Exception {
+        MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
+        Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), null).sourceLinkUrlForFQName(project, "com.example.EmptyBoot15WebAppApplication");
+        assertTrue(url.isPresent());
+        Path projectPath = Paths.get(project.pom().getParent());
+        URI uri = URI.create(url.get());
 
-		// Use File to get rid of the fragment parts of the URL. The URL may have fragments that indicate line and column numbers
-		uri = new File(uri.getPath()).toURI();
+        // Use File to get rid of the fragment parts of the URL. The URL may have fragments that indicate line and column numbers
+        uri = new File(uri.getPath()).toURI();
 
-		Path relativePath = projectPath.relativize(Paths.get(uri));
-		assertEquals(Paths.get("src/main/java/com/example/EmptyBoot15WebAppApplication.java"), relativePath);
-		String positionPart = url.get().substring(url.get().lastIndexOf('#'));
-		assertEquals("#7,14", positionPart);
-	}
+        Path relativePath = projectPath.relativize(Paths.get(uri));
+        assertEquals(Paths.get("src/main/java/com/example/EmptyBoot15WebAppApplication.java"), relativePath);
+        String positionPart = url.get().substring(url.get().lastIndexOf('#'));
+        assertEquals("#7,14", positionPart);
+    }
 
-	@Test
-	public void testClasspathResourceOnTomcatUrl() throws Exception {
-		MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
-		Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), new JavaProjectFinder() {
+    @Test
+    void testClasspathResourceOnTomcatUrl() throws Exception {
+        MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
+        Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), new JavaProjectFinder() {
 
-			@Override
-			public Optional<IJavaProject> find(TextDocumentIdentifier doc) {
-				return Optional.of(project);
-			}
+            @Override
+            public Optional<IJavaProject> find(TextDocumentIdentifier doc) {
+                return Optional.of(project);
+            }
 
-			@Override
-			public Collection<? extends IJavaProject> all() {
-				return ImmutableList.of(project);
-			}
-		})
-			.sourceLinkUrlForClasspathResource("Users/aboyko/pivotal-tc-server/instances/base/wtpwebapps/empty-boot-15-web-app/WEB-INF/classes/com/example/EmptyBoot15WebAppApplication.class");
-		assertTrue(url.isPresent());
-		Path projectPath = Paths.get(project.pom().getParent());
-		URI uri = URI.create(url.get());
+            @Override
+            public Collection<? extends IJavaProject> all() {
+                return ImmutableList.of(project);
+            }
+        })
+                .sourceLinkUrlForClasspathResource("Users/aboyko/pivotal-tc-server/instances/base/wtpwebapps/empty-boot-15-web-app/WEB-INF/classes/com/example/EmptyBoot15WebAppApplication.class");
+        assertTrue(url.isPresent());
+        Path projectPath = Paths.get(project.pom().getParent());
+        URI uri = URI.create(url.get());
 
-		// Use File to get rid of the fragment parts of the URL. The URL may have fragments that indicate line and column numbers
-		uri = new File(uri.getPath()).toURI();
+        // Use File to get rid of the fragment parts of the URL. The URL may have fragments that indicate line and column numbers
+        uri = new File(uri.getPath()).toURI();
 
-		Path relativePath = projectPath.relativize(Paths.get(uri));
-		assertEquals(Paths.get("src/main/java/com/example/EmptyBoot15WebAppApplication.java"), relativePath);
-		String positionPart = url.get().substring(url.get().lastIndexOf('#'));
-		assertEquals("#7,14", positionPart);
-	}
+        Path relativePath = projectPath.relativize(Paths.get(uri));
+        assertEquals(Paths.get("src/main/java/com/example/EmptyBoot15WebAppApplication.java"), relativePath);
+        String positionPart = url.get().substring(url.get().lastIndexOf('#'));
+        assertEquals("#7,14", positionPart);
+    }
 
-	@Test
-	public void testJarUrl() throws Exception {
-		MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
-		Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), null).sourceLinkUrlForFQName(project, "org.springframework.boot.autoconfigure.SpringBootApplication");
-		assertTrue(url.isPresent());
-		String headerPart = url.get().substring(0, url.get().indexOf('?'));
-		assertEquals("jdt://contents/spring-boot-autoconfigure-1.5.8.RELEASE.jar/org.springframework.boot.autoconfigure/SpringBootApplication.class", headerPart);
-		String positionPart = url.get().substring(url.get().lastIndexOf('#'));
-		assertEquals("#55,19", positionPart);
-	}
+    @Test
+    void testJarUrl() throws Exception {
+        MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
+        Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), null).sourceLinkUrlForFQName(project, "org.springframework.boot.autoconfigure.SpringBootApplication");
+        assertTrue(url.isPresent());
+        String headerPart = url.get().substring(0, url.get().indexOf('?'));
+        assertEquals("jdt://contents/spring-boot-autoconfigure-1.5.8.RELEASE.jar/org.springframework.boot.autoconfigure/SpringBootApplication.class", headerPart);
+        String positionPart = url.get().substring(url.get().lastIndexOf('#'));
+        assertEquals("#55,19", positionPart);
+    }
 
-	@Test
-	public void testJarUrlInnerType() throws Exception {
-		MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
-		Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), null).sourceLinkUrlForFQName(project, "org.springframework.web.client.RestTemplate$AcceptHeaderRequestCallback");
-		assertTrue(url.isPresent());
-		String headerPart = url.get().substring(0, url.get().indexOf('?'));
-		assertEquals("jdt://contents/spring-web-4.3.12.RELEASE.jar/org.springframework.web.client/RestTemplate$AcceptHeaderRequestCallback.class", headerPart);
-		String positionPart = url.get().substring(url.get().lastIndexOf('#'));
-		assertEquals("#747,16", positionPart);
-	}
+    @Test
+    void testJarUrlInnerType() throws Exception {
+        MavenJavaProject project = mavenProjectsCache.get("empty-boot-15-web-app");
+        Optional<String> url = new VSCodeSourceLinks(new CompilationUnitCache(null, null, null), null).sourceLinkUrlForFQName(project, "org.springframework.web.client.RestTemplate$AcceptHeaderRequestCallback");
+        assertTrue(url.isPresent());
+        String headerPart = url.get().substring(0, url.get().indexOf('?'));
+        assertEquals("jdt://contents/spring-web-4.3.12.RELEASE.jar/org.springframework.web.client/RestTemplate$AcceptHeaderRequestCallback.class", headerPart);
+        String positionPart = url.get().substring(url.get().lastIndexOf('#'));
+        assertEquals("#747,16", positionPart);
+    }
 
 }

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

@@ -23,9 +23,8 @@ import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.LocationLink;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -43,15 +42,12 @@ import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import com.google.gson.Gson;
 
 /**
  * @author Alex Boyko
  */
-@RunWith(SpringRunner.class)
-//@BootLanguageServerTest
 @OverrideAutoConfiguration(enabled=false)
 @Import({LanguageServerAutoConf.class, XmlBeansTestConf.class})
 @SpringBootTest(classes={
@@ -68,7 +64,7 @@ public class XmlBeansHyperlinkTest {
 	private ProjectsHarness projects = ProjectsHarness.INSTANCE;
 	private MavenJavaProject project;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		
@@ -92,210 +88,210 @@ public class XmlBeansHyperlinkTest {
 		CompletableFuture<Void> initProject = indexer.waitOperation();
 		initProject.get(5, TimeUnit.SECONDS);
 	}
-	
-	@Test
-	public void testBeanClassHyperlink() throws Exception {
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someId\" class=\"u.t.r.SimpleObj\"></bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		definitionLinkAsserts.assertLinkTargets(editor, "u.t.r.SimpleObj", project, editor.rangeOf("u.t.r.SimpleObj", "u.t.r.SimpleObj"), "u.t.r.SimpleObj");
-	}
 
-	@Test
-	public void testBeanPropertyNameHyperlink() throws Exception {
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
-				"<property name=\"age\" value=\"10\" />\n" +
-				"</bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		definitionLinkAsserts.assertLinkTargets(editor, "age", project,
-				editor.rangeOf("<property name=\"age\" value=\"10\" />", "age"),
-				DefinitionLinkAsserts.method("u.t.r.TestBean", "setAge", "int"));
-	}
-	
-	@Test
-	public void testBeanPropertyNameFromSuperClassHyperlink() throws Exception {
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
-				"<property name=\"message\" value=\"Hello\" />\n" +
-				"</bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		definitionLinkAsserts.assertLinkTargets(editor, "message", project,
-				editor.rangeOf("<property name=\"message\" value=\"Hello\" />", "message"),
-				DefinitionLinkAsserts.method("u.t.r.SuperTestBean", "setMessage", "java.lang.String"));
-	}
-	
-	@Test
-	public void testBeanRefHyperlink() throws Exception {
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
-				"<property name=\"simple\" ref=\"simpleObj\"></property>\n" +
-				"</bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		Path rootContextFilePath = Paths.get(project.getLocationUri()).resolve("src/main/webapp/WEB-INF/spring/root-context.xml");
-		Range targetRange = new Range(new Position(6,7), new Position(6, 21));
-		LocationLink expectedLocation = new LocationLink(
-				UriUtil.toUri(rootContextFilePath.toFile()).toString(),
-				targetRange,
-				targetRange,
-				editor.rangeOf("name=\"simple\" ref=\"simpleObj\"", "simpleObj")
-		);
-		editor.assertLinkTargets("simpleObj", Collections.singleton(expectedLocation));
-	}
-	
-	@Test
-	public void testBeanRefNoHyperlink_FolderNotScanned() throws Exception {
-		Map<String, Object> supportXML = new HashMap<>();
-		supportXML.put("on", true);
-		supportXML.put("hyperlinks", true);
-		supportXML.put("scan-folders", "  ");
-		Map<String, Object> bootJavaObj = new HashMap<>();
-		bootJavaObj.put("support-spring-xml-config", supportXML);
-		Map<String, Object> settings = new HashMap<>();
-		settings.put("boot-java", bootJavaObj);
-		
-		harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
-		
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
-				"<property name=\"simple\" ref=\"simpleObj\"></property>\n" +
-				"</bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		Path rootContextFilePath = Paths.get(project.getLocationUri()).resolve("src/main/webapp/WEB-INF/spring/root-context.xml");
-		Location expectedLocation = new Location();
-		expectedLocation.setUri(UriUtil.toUri(rootContextFilePath.toFile()).toString());
-		expectedLocation.setRange(new Range(new Position(6,7), new Position(6, 21)));
-		editor.assertNoLinkTargets("simpleObj");
-	}
-	
-	@Test
-	public void testBeanRefHyperlink_SpecifyScanFolderDifferently() throws Exception {
-		Map<String, Object> supportXML = new HashMap<>();
-		supportXML.put("on", true);
-		supportXML.put("hyperlinks", true);
-		supportXML.put("scan-folders", "  src/main/  ");
-		Map<String, Object> bootJavaObj = new HashMap<>();
-		bootJavaObj.put("support-spring-xml-config", supportXML);
-		Map<String, Object> settings = new HashMap<>();
-		settings.put("boot-java", bootJavaObj);
-		
-		harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
-		
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
-				"<property name=\"simple\" ref=\"simpleObj\"></property>\n" +
-				"</bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		Path rootContextFilePath = Paths.get(project.getLocationUri()).resolve("src/main/webapp/WEB-INF/spring/root-context.xml");
-		Range targetRange = new Range(new Position(6,7), new Position(6, 21));
-		LocationLink expectedLocation = new LocationLink(
-				UriUtil.toUri(rootContextFilePath.toFile()).toString(),
-				targetRange,
-				targetRange,
-				editor.rangeOf("name=\"simple\" ref=\"simpleObj\"", "simpleObj")
-		);
-		editor.assertLinkTargets("simpleObj", Collections.singleton(expectedLocation));
-	}
-	
-	@Test
-	public void testNoHyperlinkWhenXmlSupportOff() throws Exception {
-		Map<String, Object> supportXML = new HashMap<>();
-		supportXML.put("on", false);
-		supportXML.put("hyperlinks", true);
-		supportXML.put("scan-folders", "src/main");
-		Map<String, Object> bootJavaObj = new HashMap<>();
-		bootJavaObj.put("support-spring-xml-config", supportXML);
-		Map<String, Object> settings = new HashMap<>();
-		settings.put("boot-java", bootJavaObj);
-		
-		harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
+    @Test
+    void testBeanClassHyperlink() throws Exception {
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
 
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someId\" class=\"u.t.r.SimpleObj\"></bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		editor.assertNoLinkTargets("u.t.r.SimpleObj");
-	}
-	
-	@Test
-	public void testNoHyperlinkWhenHyperlinksOff() throws Exception {
-		Map<String, Object> supportXML = new HashMap<>();
-		supportXML.put("on", true);
-		supportXML.put("hyperlinks", false);
-		supportXML.put("scan-folders", "src/main");
-		Map<String, Object> bootJavaObj = new HashMap<>();
-		bootJavaObj.put("support-spring-xml-config", supportXML);
-		Map<String, Object> settings = new HashMap<>();
-		settings.put("boot-java", bootJavaObj);
-		
-		harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
+                        "<bean id=\"someId\" class=\"u.t.r.SimpleObj\"></bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        definitionLinkAsserts.assertLinkTargets(editor, "u.t.r.SimpleObj", project, editor.rangeOf("u.t.r.SimpleObj", "u.t.r.SimpleObj"), "u.t.r.SimpleObj");
+    }
 
-		Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
-		Editor editor = harness.newEditor(LanguageId.XML,
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-				"<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" + 
-				"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-				"xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
-				
-				"<bean id=\"someId\" class=\"u.t.r.SimpleObj\"></bean>\n" +
-				"</beans>\n",
-				UriUtil.toUri(xmlFilePath.toFile()).toString()
-		);
-		editor.assertNoLinkTargets("u.t.r.SimpleObj");
-	}
+    @Test
+    void testBeanPropertyNameHyperlink() throws Exception {
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
+
+                        "<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
+                        "<property name=\"age\" value=\"10\" />\n" +
+                        "</bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        definitionLinkAsserts.assertLinkTargets(editor, "age", project,
+                editor.rangeOf("<property name=\"age\" value=\"10\" />", "age"),
+                DefinitionLinkAsserts.method("u.t.r.TestBean", "setAge", "int"));
+    }
+
+    @Test
+    void testBeanPropertyNameFromSuperClassHyperlink() throws Exception {
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
+
+                        "<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
+                        "<property name=\"message\" value=\"Hello\" />\n" +
+                        "</bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        definitionLinkAsserts.assertLinkTargets(editor, "message", project,
+                editor.rangeOf("<property name=\"message\" value=\"Hello\" />", "message"),
+                DefinitionLinkAsserts.method("u.t.r.SuperTestBean", "setMessage", "java.lang.String"));
+    }
+
+    @Test
+    void testBeanRefHyperlink() throws Exception {
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
+
+                        "<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
+                        "<property name=\"simple\" ref=\"simpleObj\"></property>\n" +
+                        "</bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        Path rootContextFilePath = Paths.get(project.getLocationUri()).resolve("src/main/webapp/WEB-INF/spring/root-context.xml");
+        Range targetRange = new Range(new Position(6, 7), new Position(6, 21));
+        LocationLink expectedLocation = new LocationLink(
+                UriUtil.toUri(rootContextFilePath.toFile()).toString(),
+                targetRange,
+                targetRange,
+                editor.rangeOf("name=\"simple\" ref=\"simpleObj\"", "simpleObj")
+        );
+        editor.assertLinkTargets("simpleObj", Collections.singleton(expectedLocation));
+    }
+
+    @Test
+    void testBeanRefNoHyperlink_FolderNotScanned() throws Exception {
+        Map<String, Object> supportXML = new HashMap<>();
+        supportXML.put("on", true);
+        supportXML.put("hyperlinks", true);
+        supportXML.put("scan-folders", "  ");
+        Map<String, Object> bootJavaObj = new HashMap<>();
+        bootJavaObj.put("support-spring-xml-config", supportXML);
+        Map<String, Object> settings = new HashMap<>();
+        settings.put("boot-java", bootJavaObj);
+
+        harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
+
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
+
+                        "<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
+                        "<property name=\"simple\" ref=\"simpleObj\"></property>\n" +
+                        "</bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        Path rootContextFilePath = Paths.get(project.getLocationUri()).resolve("src/main/webapp/WEB-INF/spring/root-context.xml");
+        Location expectedLocation = new Location();
+        expectedLocation.setUri(UriUtil.toUri(rootContextFilePath.toFile()).toString());
+        expectedLocation.setRange(new Range(new Position(6, 7), new Position(6, 21)));
+        editor.assertNoLinkTargets("simpleObj");
+    }
+
+    @Test
+    void testBeanRefHyperlink_SpecifyScanFolderDifferently() throws Exception {
+        Map<String, Object> supportXML = new HashMap<>();
+        supportXML.put("on", true);
+        supportXML.put("hyperlinks", true);
+        supportXML.put("scan-folders", "  src/main/  ");
+        Map<String, Object> bootJavaObj = new HashMap<>();
+        bootJavaObj.put("support-spring-xml-config", supportXML);
+        Map<String, Object> settings = new HashMap<>();
+        settings.put("boot-java", bootJavaObj);
+
+        harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
+
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
+
+                        "<bean id=\"someBean\" class=\"u.t.r.TestBean\"\n" +
+                        "<property name=\"simple\" ref=\"simpleObj\"></property>\n" +
+                        "</bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        Path rootContextFilePath = Paths.get(project.getLocationUri()).resolve("src/main/webapp/WEB-INF/spring/root-context.xml");
+        Range targetRange = new Range(new Position(6, 7), new Position(6, 21));
+        LocationLink expectedLocation = new LocationLink(
+                UriUtil.toUri(rootContextFilePath.toFile()).toString(),
+                targetRange,
+                targetRange,
+                editor.rangeOf("name=\"simple\" ref=\"simpleObj\"", "simpleObj")
+        );
+        editor.assertLinkTargets("simpleObj", Collections.singleton(expectedLocation));
+    }
+
+    @Test
+    void testNoHyperlinkWhenXmlSupportOff() throws Exception {
+        Map<String, Object> supportXML = new HashMap<>();
+        supportXML.put("on", false);
+        supportXML.put("hyperlinks", true);
+        supportXML.put("scan-folders", "src/main");
+        Map<String, Object> bootJavaObj = new HashMap<>();
+        bootJavaObj.put("support-spring-xml-config", supportXML);
+        Map<String, Object> settings = new HashMap<>();
+        settings.put("boot-java", bootJavaObj);
+
+        harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
+
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
+
+                        "<bean id=\"someId\" class=\"u.t.r.SimpleObj\"></bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        editor.assertNoLinkTargets("u.t.r.SimpleObj");
+    }
+
+    @Test
+    void testNoHyperlinkWhenHyperlinksOff() throws Exception {
+        Map<String, Object> supportXML = new HashMap<>();
+        supportXML.put("on", true);
+        supportXML.put("hyperlinks", false);
+        supportXML.put("scan-folders", "src/main");
+        Map<String, Object> bootJavaObj = new HashMap<>();
+        bootJavaObj.put("support-spring-xml-config", supportXML);
+        Map<String, Object> settings = new HashMap<>();
+        settings.put("boot-java", bootJavaObj);
+
+        harness.getServer().getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(new Gson().toJsonTree(settings)));
+
+        Path xmlFilePath = Paths.get(project.getLocationUri()).resolve("beans.xml");
+        Editor editor = harness.newEditor(LanguageId.XML,
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                        "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
+                        "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                        "xsi:schemaLocation=\"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">\n" +
+
+                        "<bean id=\"someId\" class=\"u.t.r.SimpleObj\"></bean>\n" +
+                        "</beans>\n",
+                UriUtil.toUri(xmlFilePath.toFile()).toString()
+        );
+        editor.assertNoLinkTargets("u.t.r.SimpleObj");
+    }
 }

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

@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.value.test;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.springframework.ide.vscode.boot.java.value.test.MockProjects.MockProject;
 import org.springframework.ide.vscode.boot.metadata.AdHocSpringPropertyIndexProvider;
 import org.springframework.ide.vscode.boot.metadata.PropertyInfo;
@@ -29,140 +29,140 @@ public class AdHocSpringPropertyIndexProviderTest {
 	private MockProjects projects = new MockProjects();
 	private MockDocumentEvents documents = new MockDocumentEvents();
 
-	@Test
-	public void parseProperties() throws Exception {
-		MockProject project = projects.create("test-project");
-		project.ensureFile("src/main/resources/application.properties",
-				"some-adhoc-foo=somefoo\n" +
-				"some-adhoc-bar=somebar\n"
-		);
-		AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
+    @Test
+    void parseProperties() throws Exception {
+        MockProject project = projects.create("test-project");
+        project.ensureFile("src/main/resources/application.properties",
+                "some-adhoc-foo=somefoo\n" +
+                        "some-adhoc-bar=somebar\n"
+        );
+        AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
 
-		assertProperties(indexer.getIndex(project),
-				//alphabetic order
-				"some-adhoc-bar",
-				"some-adhoc-foo"
-		);
-	}
+        assertProperties(indexer.getIndex(project),
+                //alphabetic order
+                "some-adhoc-bar",
+                "some-adhoc-foo"
+        );
+    }
 
-	@Test
-	public void parseYamlWithList() throws Exception {
-		//Note: the LoggerNameProvider implementation relies on this behavior
-		MockProject project = projects.create("test-project");
-		project.ensureFile("src/main/resources/application.yml",
-			"from-yaml:\n" +
-			"  adhoc:\n" +
-			"    - one\n" +
-			"    - two\n"
-		);
-		AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
+    @Test
+    void parseYamlWithList() throws Exception {
+        //Note: the LoggerNameProvider implementation relies on this behavior
+        MockProject project = projects.create("test-project");
+        project.ensureFile("src/main/resources/application.yml",
+                "from-yaml:\n" +
+                        "  adhoc:\n" +
+                        "    - one\n" +
+                        "    - two\n"
+        );
+        AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
 
-		assertProperties(indexer.getIndex(project),
-				"from-yaml.adhoc"
-		);
+        assertProperties(indexer.getIndex(project),
+                "from-yaml.adhoc"
+        );
 
-	}
+    }
 
-	@Test
-	public void parseYaml() throws Exception {
-		MockProject project = projects.create("test-project");
-		project.ensureFile("src/main/resources/application.yml",
-			"from-yaml:\n" +
-			"  adhoc:\n" +
-			"    foo: somefoo\n" +
-			"    bar: somebar\n"
-		);
-		AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
+    @Test
+    void parseYaml() throws Exception {
+        MockProject project = projects.create("test-project");
+        project.ensureFile("src/main/resources/application.yml",
+                "from-yaml:\n" +
+                        "  adhoc:\n" +
+                        "    foo: somefoo\n" +
+                        "    bar: somebar\n"
+        );
+        AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
 
-		assertProperties(indexer.getIndex(project),
-				//alphabetic order
-				"from-yaml.adhoc.bar",
-				"from-yaml.adhoc.foo"
-		);
-	}
+        assertProperties(indexer.getIndex(project),
+                //alphabetic order
+                "from-yaml.adhoc.bar",
+                "from-yaml.adhoc.foo"
+        );
+    }
 
-	@Test
-	public void respondsToClasspathChanges() throws Exception {
-		MockProject project = projects.create("test-project");
-		project.ensureFile("src/main/resources/application.properties",
-				"initial-property=somefoo\n"
-		);
+    @Test
+    void respondsToClasspathChanges() throws Exception {
+        MockProject project = projects.create("test-project");
+        project.ensureFile("src/main/resources/application.properties",
+                "initial-property=somefoo\n"
+        );
 
-		AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
+        AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, null, documents);
 
-		assertProperties(indexer.getIndex(project),
-				"initial-property"
-		);
+        assertProperties(indexer.getIndex(project),
+                "initial-property"
+        );
 
-		project.ensureFile("new-sourcefolder/application.properties", "new-property=whatever");
-		assertProperties(indexer.getIndex(project),
-				"initial-property"
-		);
+        project.ensureFile("new-sourcefolder/application.properties", "new-property=whatever");
+        assertProperties(indexer.getIndex(project),
+                "initial-property"
+        );
 
-		project.createSourceFolder("new-sourcefolder");
-		assertProperties(indexer.getIndex(project),
-				"initial-property",
-				"new-property"
-		);
-	}
+        project.createSourceFolder("new-sourcefolder");
+        assertProperties(indexer.getIndex(project),
+                "initial-property",
+                "new-property"
+        );
+    }
 
-	@Test
-	public void respondsToFileChanges() throws Exception {
-		MockProject project = projects.create("test-project");
-		project.ensureFile("src/main/resources/application.properties",
-				"initial-property=somefoo\n"
-		);
+    @Test
+    void respondsToFileChanges() throws Exception {
+        MockProject project = projects.create("test-project");
+        project.ensureFile("src/main/resources/application.properties",
+                "initial-property=somefoo\n"
+        );
 
-		AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, projects.fileObserver, documents);
+        AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, projects.fileObserver, documents);
 
-		assertProperties(indexer.getIndex(project),
-				"initial-property"
-		);
+        assertProperties(indexer.getIndex(project),
+                "initial-property"
+        );
 
-		project.ensureFile("src/main/resources/application.properties", "from-properties=whatever");
-		assertProperties(indexer.getIndex(project),
-				"from-properties"
-		);
+        project.ensureFile("src/main/resources/application.properties", "from-properties=whatever");
+        assertProperties(indexer.getIndex(project),
+                "from-properties"
+        );
 
-		project.ensureFile("src/main/resources/application.yml", "from-yaml: whatever");
-		assertProperties(indexer.getIndex(project),
-				"from-properties",
-				"from-yaml"
-		);
-	}
+        project.ensureFile("src/main/resources/application.yml", "from-yaml: whatever");
+        assertProperties(indexer.getIndex(project),
+                "from-properties",
+                "from-yaml"
+        );
+    }
 
-	@Test
-	public void respondsToDocumentSave() throws Exception {
-		MockProject project = projects.create("test-project");
-		project.ensureFile("src/main/resources/application.properties",
-				"initial-property=somefoo\n"
-		);
+    @Test
+    void respondsToDocumentSave() throws Exception {
+        MockProject project = projects.create("test-project");
+        project.ensureFile("src/main/resources/application.properties",
+                "initial-property=somefoo\n"
+        );
 
-		AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, projects.fileObserver, documents);
+        AdHocSpringPropertyIndexProvider indexer = new AdHocSpringPropertyIndexProvider(projects.finder, projects.observer, projects.fileObserver, documents);
 
-		assertProperties(indexer.getIndex(project),
-				"initial-property"
-		);
+        assertProperties(indexer.getIndex(project),
+                "initial-property"
+        );
 
-		File propsFile = project.ensureFileNoEvents("src/main/resources/application.properties", "from-properties=whatever");
-		assertProperties(indexer.getIndex(project),
-				"initial-property" //not changed yet because didn't fire change events.
-		);
-		documents.fire(new TextDocumentSaveChange(new TextDocument(propsFile.toURI().toString(), LanguageId.BOOT_PROPERTIES)));
-		assertProperties(indexer.getIndex(project),
-				"from-properties"
-		);
+        File propsFile = project.ensureFileNoEvents("src/main/resources/application.properties", "from-properties=whatever");
+        assertProperties(indexer.getIndex(project),
+                "initial-property" //not changed yet because didn't fire change events.
+        );
+        documents.fire(new TextDocumentSaveChange(new TextDocument(propsFile.toURI().toString(), LanguageId.BOOT_PROPERTIES)));
+        assertProperties(indexer.getIndex(project),
+                "from-properties"
+        );
 
-		project.ensureFileNoEvents("src/main/resources/application.yml", "from-yaml: whatever");
-		assertProperties(indexer.getIndex(project),
-				"from-properties"
-		);
-		documents.fire(new TextDocumentSaveChange(new TextDocument(propsFile.toURI().toString(), LanguageId.BOOT_PROPERTIES_YAML)));
-		assertProperties(indexer.getIndex(project),
-				"from-properties",
-				"from-yaml"
-		);
-	}
+        project.ensureFileNoEvents("src/main/resources/application.yml", "from-yaml: whatever");
+        assertProperties(indexer.getIndex(project),
+                "from-properties"
+        );
+        documents.fire(new TextDocumentSaveChange(new TextDocument(propsFile.toURI().toString(), LanguageId.BOOT_PROPERTIES_YAML)));
+        assertProperties(indexer.getIndex(project),
+                "from-properties",
+                "from-yaml"
+        );
+    }
 
 	private void assertProperties(FuzzyMap<PropertyInfo> index, String... expectedProps) {
 		StringBuilder foundProps = new StringBuilder();

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

@@ -27,7 +27,10 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import org.springframework.ide.vscode.commons.java.ClasspathIndex;
 import org.springframework.ide.vscode.commons.java.IClasspath;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -101,7 +104,7 @@ public class MockProjects {
 
 		public MockProject(String name) {
 			synchronized (projectsByName) {
-				Assert.assertFalse(projectsByName.containsKey(name));
+				assertFalse(projectsByName.containsKey(name));
 				this.name = name;
 				this.root = Files.createTempDir();
 				createSourceFolder("src/main/java");
@@ -121,7 +124,7 @@ public class MockProjects {
 		}
 
 		private void createOutputFolder(String projectRelativePath) {
-			Assert.assertNull("Output folder already created", this.defaultOutputFolder);
+			assertNull(this.defaultOutputFolder, "Output folder already created");
 			File outFolder = new File(root, projectRelativePath);
 			outFolder.mkdirs();
 			this.defaultOutputFolder = outFolder;

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.value.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.InputStream;
 import java.util.Collection;
@@ -23,9 +23,9 @@ import org.apache.commons.io.IOUtils;
 import org.eclipse.lsp4j.CompletionItem;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.gradle.internal.impldep.com.google.common.collect.ImmutableList;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -52,12 +52,12 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import({AdHocPropertyHarnessTestConf.class, ValueCompletionTest.TestConf.class})
 public class ValueCompletionTest {
@@ -127,7 +127,7 @@ public class ValueCompletionTest {
 
 	}
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 	}
@@ -136,252 +136,252 @@ public class ValueCompletionTest {
 		return testProject;
 	}
 
-	@Test
-	public void testPrefixIdentification() {
-		ValueCompletionProcessor processor = new ValueCompletionProcessor(projectFinder, null, null);
+    @Test
+    void testPrefixIdentification() {
+        ValueCompletionProcessor processor = new ValueCompletionProcessor(projectFinder, null, null);
 
-		assertEquals("pre", processor.identifyPropertyPrefix("pre", 3));
-		assertEquals("pre", processor.identifyPropertyPrefix("prefix", 3));
-		assertEquals("", processor.identifyPropertyPrefix("", 0));
-		assertEquals("pre", processor.identifyPropertyPrefix("$pre", 4));
+        assertEquals("pre", processor.identifyPropertyPrefix("pre", 3));
+        assertEquals("pre", processor.identifyPropertyPrefix("prefix", 3));
+        assertEquals("", processor.identifyPropertyPrefix("", 0));
+        assertEquals("pre", processor.identifyPropertyPrefix("$pre", 4));
 
-		assertEquals("", processor.identifyPropertyPrefix("${pre", 0));
-		assertEquals("", processor.identifyPropertyPrefix("${pre", 1));
-		assertEquals("", processor.identifyPropertyPrefix("${pre", 2));
-		assertEquals("p", processor.identifyPropertyPrefix("${pre", 3));
-		assertEquals("pr", processor.identifyPropertyPrefix("${pre", 4));
-	}
+        assertEquals("", processor.identifyPropertyPrefix("${pre", 0));
+        assertEquals("", processor.identifyPropertyPrefix("${pre", 1));
+        assertEquals("", processor.identifyPropertyPrefix("${pre", 2));
+        assertEquals("p", processor.identifyPropertyPrefix("${pre", 3));
+        assertEquals("pr", processor.identifyPropertyPrefix("${pre", 4));
+    }
 
-	@Test
-	public void testEmptyBracketsCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(<*>)");
-		prepareDefaultIndexData();
+    @Test
+    void testEmptyBracketsCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(<*>)");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"${data.prop2}\"<*>)",
-				"@Value(\"${else.prop3}\"<*>)",
-				"@Value(\"${spring.prop1}\"<*>)");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"${data.prop2}\"<*>)",
+                "@Value(\"${else.prop3}\"<*>)",
+                "@Value(\"${spring.prop1}\"<*>)");
+    }
 
-	@Test
-	public void testEmptyBracketsCompletionWithParamName() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(value=<*>)");
-		prepareDefaultIndexData();
+    @Test
+    void testEmptyBracketsCompletionWithParamName() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(value=<*>)");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(value=\"${data.prop2}\"<*>)",
-				"@Value(value=\"${else.prop3}\"<*>)",
-				"@Value(value=\"${spring.prop1}\"<*>)");
-	}
+        assertAnnotationCompletions(
+                "@Value(value=\"${data.prop2}\"<*>)",
+                "@Value(value=\"${else.prop3}\"<*>)",
+                "@Value(value=\"${spring.prop1}\"<*>)");
+    }
 
-	@Test
-	public void testEmptyBracketsCompletionWithWrongParamName() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(another=<*>)");
-		prepareDefaultIndexData();
-		assertAnnotationCompletions();
-	}
+    @Test
+    void testEmptyBracketsCompletionWithWrongParamName() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(another=<*>)");
+        prepareDefaultIndexData();
+        assertAnnotationCompletions();
+    }
 
-	@Test
-	public void testOnlyDollarNoQoutesCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value($<*>)");
-		prepareDefaultIndexData();
+    @Test
+    void testOnlyDollarNoQoutesCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value($<*>)");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"${data.prop2}\"<*>)",
-				"@Value(\"${else.prop3}\"<*>)",
-				"@Value(\"${spring.prop1}\"<*>)");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"${data.prop2}\"<*>)",
+                "@Value(\"${else.prop3}\"<*>)",
+                "@Value(\"${spring.prop1}\"<*>)");
+    }
 
-	@Test
-	public void testOnlyDollarNoQoutesWithParamCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(value=$<*>)");
-		prepareDefaultIndexData();
+    @Test
+    void testOnlyDollarNoQoutesWithParamCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(value=$<*>)");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(value=\"${data.prop2}\"<*>)",
-				"@Value(value=\"${else.prop3}\"<*>)",
-				"@Value(value=\"${spring.prop1}\"<*>)");
-	}
+        assertAnnotationCompletions(
+                "@Value(value=\"${data.prop2}\"<*>)",
+                "@Value(value=\"${else.prop3}\"<*>)",
+                "@Value(value=\"${spring.prop1}\"<*>)");
+    }
 
-	@Test
-	public void testOnlyDollarCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"$<*>\")");
-		prepareDefaultIndexData();
+    @Test
+    void testOnlyDollarCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"$<*>\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"${data.prop2}<*>\")",
-				"@Value(\"${else.prop3}<*>\")",
-				"@Value(\"${spring.prop1}<*>\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"${data.prop2}<*>\")",
+                "@Value(\"${else.prop3}<*>\")",
+                "@Value(\"${spring.prop1}<*>\")");
+    }
 
-	@Test
-	public void testOnlyDollarWithParamCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(value=\"$<*>\")");
-		prepareDefaultIndexData();
+    @Test
+    void testOnlyDollarWithParamCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(value=\"$<*>\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(value=\"${data.prop2}<*>\")",
-				"@Value(value=\"${else.prop3}<*>\")",
-				"@Value(value=\"${spring.prop1}<*>\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(value=\"${data.prop2}<*>\")",
+                "@Value(value=\"${else.prop3}<*>\")",
+                "@Value(value=\"${spring.prop1}<*>\")");
+    }
 
-	@Test
-	public void testDollarWithBracketsCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"${<*>}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testDollarWithBracketsCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"${<*>}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"${data.prop2<*>}\")",
-				"@Value(\"${else.prop3<*>}\")",
-				"@Value(\"${spring.prop1<*>}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"${data.prop2<*>}\")",
+                "@Value(\"${else.prop3<*>}\")",
+                "@Value(\"${spring.prop1<*>}\")");
+    }
 
-	@Test
-	public void testDollarWithBracketsWithParamCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(value=\"${<*>}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testDollarWithBracketsWithParamCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(value=\"${<*>}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(value=\"${data.prop2<*>}\")",
-				"@Value(value=\"${else.prop3<*>}\")",
-				"@Value(value=\"${spring.prop1<*>}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(value=\"${data.prop2<*>}\")",
+                "@Value(value=\"${else.prop3<*>}\")",
+                "@Value(value=\"${spring.prop1<*>}\")");
+    }
 
-	@Test
-	public void testEmptyStringLiteralCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"<*>\")");
-		prepareDefaultIndexData();
+    @Test
+    void testEmptyStringLiteralCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"<*>\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"${data.prop2}<*>\")",
-				"@Value(\"${else.prop3}<*>\")",
-				"@Value(\"${spring.prop1}<*>\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"${data.prop2}<*>\")",
+                "@Value(\"${else.prop3}<*>\")",
+                "@Value(\"${spring.prop1}<*>\")");
+    }
 
-	@Test
-	public void testPlainPrefixCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(spri<*>)");
-		prepareDefaultIndexData();
+    @Test
+    void testPlainPrefixCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(spri<*>)");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"${spring.prop1}\"<*>)");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"${spring.prop1}\"<*>)");
+    }
 
-	@Test
-	public void testQoutedPrefixCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"spri<*>\")");
-		prepareDefaultIndexData();
+    @Test
+    void testQoutedPrefixCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"spri<*>\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"${spring.prop1}<*>\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"${spring.prop1}<*>\")");
+    }
 
-	@Test
-	public void testRandomSpelExpressionNoCompletion() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"#{<*>}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testRandomSpelExpressionNoCompletion() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"#{<*>}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"#{${data.prop2}<*>}\")",
-				"@Value(\"#{${else.prop3}<*>}\")",
-				"@Value(\"#{${spring.prop1}<*>}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"#{${data.prop2}<*>}\")",
+                "@Value(\"#{${else.prop3}<*>}\")",
+                "@Value(\"#{${spring.prop1}<*>}\")");
+    }
 
-	@Test
-	public void testRandomSpelExpressionWithPropertyDollar() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"#{345$<*>}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testRandomSpelExpressionWithPropertyDollar() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"#{345$<*>}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"#{345${data.prop2}<*>}\")",
-				"@Value(\"#{345${else.prop3}<*>}\")",
-				"@Value(\"#{345${spring.prop1}<*>}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"#{345${data.prop2}<*>}\")",
+                "@Value(\"#{345${else.prop3}<*>}\")",
+                "@Value(\"#{345${spring.prop1}<*>}\")");
+    }
 
-	@Test
-	public void testRandomSpelExpressionWithPropertyDollerWithoutClosindBracket() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"#{345${<*>}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testRandomSpelExpressionWithPropertyDollerWithoutClosindBracket() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"#{345${<*>}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"#{345${data.prop2}<*>}\")",
-				"@Value(\"#{345${else.prop3}<*>}\")",
-				"@Value(\"#{345${spring.prop1}<*>}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"#{345${data.prop2}<*>}\")",
+                "@Value(\"#{345${else.prop3}<*>}\")",
+                "@Value(\"#{345${spring.prop1}<*>}\")");
+    }
 
-	@Test
-	public void testRandomSpelExpressionWithPropertyDollerWithClosingBracket() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"#{345${<*>}}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testRandomSpelExpressionWithPropertyDollerWithClosingBracket() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"#{345${<*>}}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"#{345${data.prop2<*>}}\")",
-				"@Value(\"#{345${else.prop3<*>}}\")",
-				"@Value(\"#{345${spring.prop1<*>}}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"#{345${data.prop2<*>}}\")",
+                "@Value(\"#{345${else.prop3<*>}}\")",
+                "@Value(\"#{345${spring.prop1<*>}}\")");
+    }
 
-	@Test
-	public void testRandomSpelExpressionWithPropertyPrefixWithoutClosingBracket() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"#{345${spri<*>}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testRandomSpelExpressionWithPropertyPrefixWithoutClosingBracket() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"#{345${spri<*>}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"#{345${spring.prop1}<*>}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"#{345${spring.prop1}<*>}\")");
+    }
 
-	@Test
-	public void testRandomSpelExpressionWithPropertyPrefixWithClosingBracket() throws Exception {
-		prepareCase("@Value(\"onField\")", "@Value(\"#{345${spri<*>}}\")");
-		prepareDefaultIndexData();
+    @Test
+    void testRandomSpelExpressionWithPropertyPrefixWithClosingBracket() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(\"#{345${spri<*>}}\")");
+        prepareDefaultIndexData();
 
-		assertAnnotationCompletions(
-				"@Value(\"#{345${spring.prop1<*>}}\")");
-	}
+        assertAnnotationCompletions(
+                "@Value(\"#{345${spring.prop1<*>}}\")");
+    }
 
-	@Test
-	public void adHoc() throws Exception {
-		prepareDefaultIndexData();
-		Editor editor = harness.newEditor(LanguageId.JAVA,
-				"package org.test;\n" +
-				"\n" +
-				"import org.springframework.beans.factory.annotation.Value;\n" +
-				"\n" +
-				"public class TestValueCompletion {\n" +
-				"	\n" +
-				"	@Value(\"<*>\")\n" +
-				"	private String value1;\n" +
-				"}"
-		);
+    @Test
+    void adHoc() throws Exception {
+        prepareDefaultIndexData();
+        Editor editor = harness.newEditor(LanguageId.JAVA,
+                "package org.test;\n" +
+                        "\n" +
+                        "import org.springframework.beans.factory.annotation.Value;\n" +
+                        "\n" +
+                        "public class TestValueCompletion {\n" +
+                        "	\n" +
+                        "	@Value(\"<*>\")\n" +
+                        "	private String value1;\n" +
+                        "}"
+        );
 
-		//There are no 'ad-hoc' properties yet. So should only suggest the default ones.
-		editor.assertContextualCompletions(
-				"<*>"
-				, //==>
-				"${data.prop2}<*>",
-				"${else.prop3}<*>",
-				"${spring.prop1}<*>"
-		);
+        //There are no 'ad-hoc' properties yet. So should only suggest the default ones.
+        editor.assertContextualCompletions(
+                "<*>"
+        , //==>
+                "${data.prop2}<*>",
+                "${else.prop3}<*>",
+                "${spring.prop1}<*>"
+        );
 
-		adHocProperties.add("spring.ad-hoc.thingy");
-		adHocProperties.add("spring.ad-hoc.other-thingy");
-		adHocProperties.add("spring.prop1"); //should not suggest this twice!
-		editor.assertContextualCompletions(
-				"<*>"
-				, //==>
-				"${data.prop2}<*>",
-				"${else.prop3}<*>",
-				"${spring.ad-hoc.other-thingy}<*>",
-				"${spring.ad-hoc.thingy}<*>",
-				"${spring.prop1}<*>"
-		);
+        adHocProperties.add("spring.ad-hoc.thingy");
+        adHocProperties.add("spring.ad-hoc.other-thingy");
+        adHocProperties.add("spring.prop1"); //should not suggest this twice!
+        editor.assertContextualCompletions(
+                "<*>"
+        , //==>
+                "${data.prop2}<*>",
+                "${else.prop3}<*>",
+                "${spring.ad-hoc.other-thingy}<*>",
+                "${spring.ad-hoc.thingy}<*>",
+                "${spring.prop1}<*>"
+        );
 
-		editor.assertContextualCompletions(
-				"adhoc<*>"
-				, //==>
-				"${spring.ad-hoc.thingy}<*>",
-				"${spring.ad-hoc.other-thingy}<*>"
-		);
-	}
+        editor.assertContextualCompletions(
+                "adhoc<*>"
+        , //==>
+                "${spring.ad-hoc.thingy}<*>",
+                "${spring.ad-hoc.other-thingy}<*>"
+        );
+    }
 
 
 	private void prepareDefaultIndexData() {

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

@@ -10,43 +10,43 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.value.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.java.value.ValueHoverProvider;
 
 /**
  * @author Martin Lippert
  */
 public class ValueHoverTest {
-	
-	@Test
-	public void testGetPropertyFromValue() {
-		ValueHoverProvider provider = new ValueHoverProvider();
 
-		assertNull(provider.getPropertyKey("${spring}", 0));
-		assertNull(provider.getPropertyKey("${spring}", 1));
-		assertEquals("spring", provider.getPropertyKey("${spring}", 2));
-		assertEquals("spring", provider.getPropertyKey("${spring}", 3));
-		assertEquals("spring", provider.getPropertyKey("${spring}", 8));
-		assertNull(provider.getPropertyKey("${spring}", 9));
+    @Test
+    void testGetPropertyFromValue() {
+        ValueHoverProvider provider = new ValueHoverProvider();
 
-		assertNull(provider.getPropertyKey("abc ${spring} and other stuff", 0));
-		assertNull(provider.getPropertyKey("abc ${spring} and other stuff", 5));
-		assertEquals("spring", provider.getPropertyKey("abc ${spring} and other stuff", 6));
-		assertEquals("spring", provider.getPropertyKey("abc ${spring} and other stuff", 12));
-		assertNull(provider.getPropertyKey("abc ${spring} and other stuff", 13));
+        assertNull(provider.getPropertyKey("${spring}", 0));
+        assertNull(provider.getPropertyKey("${spring}", 1));
+        assertEquals("spring", provider.getPropertyKey("${spring}", 2));
+        assertEquals("spring", provider.getPropertyKey("${spring}", 3));
+        assertEquals("spring", provider.getPropertyKey("${spring}", 8));
+        assertNull(provider.getPropertyKey("${spring}", 9));
 
-		assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 5));
-		assertEquals("spring", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 6));
-		assertEquals("spring", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 12));
-		assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 13));
+        assertNull(provider.getPropertyKey("abc ${spring} and other stuff", 0));
+        assertNull(provider.getPropertyKey("abc ${spring} and other stuff", 5));
+        assertEquals("spring", provider.getPropertyKey("abc ${spring} and other stuff", 6));
+        assertEquals("spring", provider.getPropertyKey("abc ${spring} and other stuff", 12));
+        assertNull(provider.getPropertyKey("abc ${spring} and other stuff", 13));
 
-		assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 19));
-		assertEquals("boot", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 20));
-		assertEquals("boot", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 24));
-		assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 25));
-	}
+        assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 5));
+        assertEquals("spring", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 6));
+        assertEquals("spring", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 12));
+        assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 13));
+
+        assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 19));
+        assertEquals("boot", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 20));
+        assertEquals("boot", provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 24));
+        assertNull(provider.getPropertyKey("abc ${spring} and ${boot} other stuff", 25));
+    }
 	
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.value.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.net.URI;
@@ -27,10 +27,10 @@ import org.eclipse.lsp4j.DidOpenTextDocumentParams;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.TextDocumentItem;
 import org.gradle.internal.impldep.com.google.common.collect.ImmutableList;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+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.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -60,12 +60,12 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import({AdHocPropertyHarnessTestConf.class, ValueSpelExpressionValidationTest.TestConf.class})
 public class ValueSpelExpressionValidationTest {
@@ -137,7 +137,7 @@ public class ValueSpelExpressionValidationTest {
 
 	}
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		
@@ -150,167 +150,167 @@ public class ValueSpelExpressionValidationTest {
 		}, server.getTextDocumentService(), null);
 	}
 	
-	@After
+	@AfterEach
 	public void closeDoc() throws Exception {
 		TextDocumentIdentifier identifier = new TextDocumentIdentifier(docUri);
 		DidCloseTextDocumentParams closeParams = new DidCloseTextDocumentParams(identifier);
 		server.getTextDocumentService().didClose(closeParams);
 		server.getAsync().waitForAll();
 	}
-	
-	@Test
-	public void testNoSpelExpressionFound() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(\"something\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
 
-	@Test
-	public void testCorrectSpelExpressionFound() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(\"#{new String('hello world').toUpperCase()}\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
+    @Test
+    void testNoSpelExpressionFound() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(\"something\")");
+        assertNotNull(doc);
 
-	@Test
-	public void testCorrectSpelExpressionFoundWithParamName() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(value=\"#{new String('hello world').toUpperCase()}\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
+        reconcileEngine.reconcile(doc, problemCollector);
 
-	@Test
-	public void testIncorrectSpelExpressionFound() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(\"#{new String('hello world).toUpperCase()}\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
-	
-	@Test
-	public void testIncorrectSpelExpressionFoundWithParamName() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(value=\"#{new String('hello world).toUpperCase()}\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
-	
-	@Test
-	public void testIncorrectSpelExpressionFoundOnMethodParameter() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onParameter\")", "@Value(\"#{new String('hello world).toUpperCase()}\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
-	
-	@Test
-	public void testIncorrectSpelExpressionFoundOnMethodParameterWithParamName() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onParameter\")", "@Value(value=\"#{new String('hello world).toUpperCase()}\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
-	
-	@Test
-	public void testIncorrectSpelExpressionFoundOnSpelParamOfCachableAnnotation() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(condition=\"new String('hello world).toUpperCase()\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
-	
-	@Test
-	public void testIncorrectSpelExpressionNotFoundOnNonSpelParamOfCachableAnnotation() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(keyGenerator=\"new String('hello world).toUpperCase()\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
-	
-	@Test
-	public void testIncorrectSpelExpressionFoundOnSpelParamOfCachableAnnotationAmongOtherParams() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(keyGenerator=\"somekey\", condition=\"new String('hello world).toUpperCase()\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
-	
-	@Test
-	public void testIncorrectSpelExpressionFoundOnMultipleSpelParamsOfCachableAnnotation() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(unless=\"new String('hello world).toUpperCase()\", condition=\"new String('hello world).toUpperCase()\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(2, problems.size());
-	}
-	
-	@Test
-	public void testCorrectSpelExpressionFoundOnCustomAnnotation() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onMethod\")", "@CustomEventListener(condition=\"new String('hello world').toUpperCase()\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
 
-	@Test
-	public void testIncorrectSpelExpressionFoundOnCustomAnnotation() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onMethod\")", "@CustomEventListener(condition=\"new String('hello world).toUpperCase()\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
-	
-	@Test
-	public void testIgnoreSpelExpressionsWithPropertyPlaceholder() throws Exception {
-		TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(value=\"#{${property.hello:false}}\")");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
+    @Test
+    void testCorrectSpelExpressionFound() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(\"#{new String('hello world').toUpperCase()}\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
+
+    @Test
+    void testCorrectSpelExpressionFoundWithParamName() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(value=\"#{new String('hello world').toUpperCase()}\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFound() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(\"#{new String('hello world).toUpperCase()}\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFoundWithParamName() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(value=\"#{new String('hello world).toUpperCase()}\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFoundOnMethodParameter() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onParameter\")", "@Value(\"#{new String('hello world).toUpperCase()}\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFoundOnMethodParameterWithParamName() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onParameter\")", "@Value(value=\"#{new String('hello world).toUpperCase()}\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFoundOnSpelParamOfCachableAnnotation() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(condition=\"new String('hello world).toUpperCase()\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionNotFoundOnNonSpelParamOfCachableAnnotation() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(keyGenerator=\"new String('hello world).toUpperCase()\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFoundOnSpelParamOfCachableAnnotationAmongOtherParams() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(keyGenerator=\"somekey\", condition=\"new String('hello world).toUpperCase()\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFoundOnMultipleSpelParamsOfCachableAnnotation() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Cacheable(unless=\"new String('hello world).toUpperCase()\", condition=\"new String('hello world).toUpperCase()\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(2, problems.size());
+    }
+
+    @Test
+    void testCorrectSpelExpressionFoundOnCustomAnnotation() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onMethod\")", "@CustomEventListener(condition=\"new String('hello world').toUpperCase()\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFoundOnCustomAnnotation() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onMethod\")", "@CustomEventListener(condition=\"new String('hello world).toUpperCase()\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
+
+    @Test
+    void testIgnoreSpelExpressionsWithPropertyPlaceholder() throws Exception {
+        TextDocument doc = prepareDocument("@Value(\"onField\")", "@Value(value=\"#{${property.hello:false}}\")");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
 	
 	private TextDocument prepareDocument(String selectedAnnotation, String annotationStatementBeforeTest) throws Exception {
 		String content = IOUtils.toString(new URI(docUri));

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.value.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.net.URI;
@@ -26,10 +26,9 @@ import org.eclipse.lsp4j.DidCloseTextDocumentParams;
 import org.eclipse.lsp4j.DidOpenTextDocumentParams;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.TextDocumentItem;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -50,15 +49,12 @@ import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import com.google.gson.Gson;
 
 /**
  * @author Martin Lippert
  */
-@RunWith(SpringRunner.class)
-//@BootLanguageServerTest
 @OverrideAutoConfiguration(enabled=false)
 @Import({LanguageServerAutoConf.class, XmlBeansTestConf.class})
 @SpringBootTest(classes={
@@ -79,7 +75,7 @@ public class XMLSpelExpressionValidationTest {
 	private String docUri;
 	private TestProblemCollector problemCollector;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.intialize(null);
 		
@@ -104,46 +100,46 @@ public class XMLSpelExpressionValidationTest {
 		reconcileEngine = new SpringXMLReconcileEngine(projectFinder, config);
 	}
 	
-	@After
+	@AfterEach
 	public void closeDoc() throws Exception {
 		TextDocumentIdentifier identifier = new TextDocumentIdentifier(docUri);
 		DidCloseTextDocumentParams closeParams = new DidCloseTextDocumentParams(identifier);
 		server.getTextDocumentService().didClose(closeParams);
 		server.getAsync().waitForAll();
 	}
-	
-	@Test
-	public void testNoSpelExpressionFound() throws Exception {
-		TextDocument doc = prepareDocument("<SpEL>", "something");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
 
-	@Test
-	public void testCorrectSpelExpressionFound() throws Exception {
-		TextDocument doc = prepareDocument("<SpEL>", "#{new String('hello world').toUpperCase()}");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(0, problems.size());
-	}
+    @Test
+    void testNoSpelExpressionFound() throws Exception {
+        TextDocument doc = prepareDocument("<SpEL>", "something");
+        assertNotNull(doc);
 
-	@Test
-	public void testIncorrectSpelExpressionFound() throws Exception {
-		TextDocument doc = prepareDocument("<SpEL>", "#{new String('hello world).toUpperCase()}");
-		assertNotNull(doc);
-		
-		reconcileEngine.reconcile(doc, problemCollector);
-		
-		List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
-		assertEquals(1, problems.size());
-	}
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
+
+    @Test
+    void testCorrectSpelExpressionFound() throws Exception {
+        TextDocument doc = prepareDocument("<SpEL>", "#{new String('hello world').toUpperCase()}");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(0, problems.size());
+    }
+
+    @Test
+    void testIncorrectSpelExpressionFound() throws Exception {
+        TextDocument doc = prepareDocument("<SpEL>", "#{new String('hello world).toUpperCase()}");
+        assertNotNull(doc);
+
+        reconcileEngine.reconcile(doc, problemCollector);
+
+        List<ReconcileProblem> problems = problemCollector.getCollectedProblems();
+        assertEquals(1, problems.size());
+    }
 		
 	private TextDocument prepareDocument(String selectedAnnotation, String annotationStatementBeforeTest) throws Exception {
 		String content = IOUtils.toString(new URI(docUri));

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

@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.metadata;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.editor.harness.PropertyIndexHarness;
 
 /**
@@ -24,57 +24,57 @@ import org.springframework.ide.vscode.boot.editor.harness.PropertyIndexHarness;
  *
  */
 public class IndexNavigatorTest {
-	
-	@Test
-	public void testSimple() throws Exception {
-		PropertyIndexHarness harness = indexHarness();
-		harness.defaultTestData();
 
-		start(harness);
-		assertContinuable();
+    @Test
+    void testSimple() throws Exception {
+        PropertyIndexHarness harness = indexHarness();
+        harness.defaultTestData();
 
-		navigate("server");
-		assertContinuable();
+        start(harness);
+        assertContinuable();
 
-		navigate("port");
-		assertProperty();
+        navigate("server");
+        assertContinuable();
 
-		navigate("extracrap");
-		assertEmpty();
-	}
+        navigate("port");
+        assertProperty();
+
+        navigate("extracrap");
+        assertEmpty();
+    }
 
 	private PropertyIndexHarness indexHarness() {
 		return new PropertyIndexHarness(new ValueProviderRegistry());
 	}
 
-	@Test
-	public void testPartialName() throws Exception {
-		PropertyIndexHarness harness = indexHarness();
-		harness.defaultTestData();
+    @Test
+    void testPartialName() throws Exception {
+        PropertyIndexHarness harness = indexHarness();
+        harness.defaultTestData();
 
-		start(harness);
-		assertContinuable();
+        start(harness);
+        assertContinuable();
 
-		navigate("serv");
-		// As a plain string 'serv' is a prefix of 'server'
-		// but it shouldn't be treated as such since it doesn't continue with
-		// a '.'
-		assertEmpty();
-	}
+        navigate("serv");
+        // As a plain string 'serv' is a prefix of 'server'
+        // but it shouldn't be treated as such since it doesn't continue with
+        // a '.'
+        assertEmpty();
+    }
 
-	@Test
-	public void testAmbiguous() throws Exception {
-		PropertyIndexHarness harness = indexHarness();
-		harness.defaultTestData();
+    @Test
+    void testAmbiguous() throws Exception {
+        PropertyIndexHarness harness = indexHarness();
+        harness.defaultTestData();
 
-		harness.data("foo.bar", "java.lang.String", null, "Foo dot bar");
-		harness.data("foo", "java.lang.String", null, "Just foo");
-		harness.data("fooaaaa", "java.lang.String", null, "Confuse the foo match");
+        harness.data("foo.bar", "java.lang.String", null, "Foo dot bar");
+        harness.data("foo", "java.lang.String", null, "Just foo");
+        harness.data("fooaaaa", "java.lang.String", null, "Confuse the foo match");
 
-		start(harness);
-		navigate("foo");
-		assertAmbiguous();
-	}
+        start(harness);
+        navigate("foo");
+        assertAmbiguous();
+    }
 
 	/////////////// test harnes /////////////////////////////////////
 

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.metadata;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -22,9 +22,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.metadata.CachingValueProvider;
 import org.springframework.ide.vscode.boot.metadata.LoggerNameProvider;
 import org.springframework.ide.vscode.commons.maven.java.MavenJavaProject;
@@ -56,69 +56,69 @@ public class LoggerNameProviderTest {
 	private ProjectsHarness projects = ProjectsHarness.INSTANCE;
 	private MavenJavaProject project;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		CachingValueProvider.TIMEOUT = Duration.ofSeconds(20);
 		project = projects.mavenProject("tricky-getters-boot-1.3.1-app");
 	}
 
-	@After
+	@AfterEach
 	public void teardown() throws Exception {
 		CachingValueProvider.restoreDefaults();
 	}
 
-	@Test
-	public void directResults() throws Exception {
-		LoggerNameProvider p = create();
-		String query = "jboss";
-		List<String> directQueryResults = getResults(p, query);
+    @Test
+    void directResults() throws Exception {
+        LoggerNameProvider p = create();
+        String query = "jboss";
+        List<String> directQueryResults = getResults(p, query);
 
 //		dumpResults("jboss - DIRECT", directQueryResults);
 
-		/*
-		 * Commented out due to search results from JDK present
-		 */
-//		assertElements(directQueryResults, JBOSS_RESULTS);
-		assertElementsAtLeast(directQueryResults, JBOSS_RESULTS);
-	}
+        /*
+         * Commented out due to search results from JDK present
+         */
+        //		assertElements(directQueryResults, JBOSS_RESULTS);
+        assertElementsAtLeast(directQueryResults, JBOSS_RESULTS);
+    }
 
-	@Test
-	public void cachedResults() throws Exception {
-		LoggerNameProvider p = create();
-		for (int i = 0; i < 10; i++) {
-			long startTime = System.currentTimeMillis();
-			String query = "jboss";
-			List<String> directQueryResults = getResults(p, query);
+    @Test
+    void cachedResults() throws Exception {
+        LoggerNameProvider p = create();
+        for (int i = 0; i < 10; i++) {
+            long startTime = System.currentTimeMillis();
+            String query = "jboss";
+            List<String> directQueryResults = getResults(p, query);
 
-			/*
-			 * Commented out due to search results from JDK present
-			 */
+            /*
+             * Commented out due to search results from JDK present
+             */
 //			assertElements(directQueryResults, JBOSS_RESULTS);
-			assertElementsAtLeast(directQueryResults, JBOSS_RESULTS);
+            assertElementsAtLeast(directQueryResults, JBOSS_RESULTS);
 
-			long duration = System.currentTimeMillis() - startTime;
-			System.out.println(i+": "+duration+" ms");
-		}
-	}
+            long duration = System.currentTimeMillis() - startTime;
+            System.out.println(i + ": " + duration + " ms");
+        }
+    }
 
-	@Test
-	public void incrementalResults() throws Exception {
-		String fullQuery = "jboss";
+    @Test
+    void incrementalResults() throws Exception {
+        String fullQuery = "jboss";
 
-		LoggerNameProvider p = create();
-		for (int i = 0; i <= fullQuery.length(); i++) {
-			String query = fullQuery.substring(0, i);
-			List<String> results = getResults(p, query);
+        LoggerNameProvider p = create();
+        for (int i = 0; i <= fullQuery.length(); i++) {
+            String query = fullQuery.substring(0, i);
+            List<String> results = getResults(p, query);
 //			dumpResults(query, results);
-			if (i==fullQuery.length()) {
-				System.out.println("Verifying final result!");
-				//Not checking for exact equals because... quircks of JDT search engine means it
-				// will actually finds less results than if we derive them by filtering incrementally.
-				//If all works well, we should never find fewer results than Eclipse does.
-				assertElementsAtLeast(results, JBOSS_RESULTS);
-			}
-		}
-	}
+            if (i == fullQuery.length()) {
+                System.out.println("Verifying final result!");
+                //Not checking for exact equals because... quircks of JDT search engine means it
+                // will actually finds less results than if we derive them by filtering incrementally.
+                //If all works well, we should never find fewer results than Eclipse does.
+                assertElementsAtLeast(results, JBOSS_RESULTS);
+            }
+        }
+    }
 
 	private LoggerNameProvider create() {
 		return (LoggerNameProvider) LoggerNameProvider.factory(null, null).apply(ImmutableMap.of());
@@ -134,7 +134,7 @@ public class LoggerNameProviderTest {
 				hasMissing = true;
 			}
 		}
-		assertFalse("Missing elements:\n"+missing, hasMissing);
+		assertFalse(hasMissing, "Missing elements:\n"+missing);
 	}
 
 	@SuppressWarnings("unused")

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

@@ -10,11 +10,9 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.metadata;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.metadata.MetadataManipulator;
 
 /**
@@ -51,150 +49,150 @@ public class MetadataManipulatorTest {
 		}
 	}
 
-	@Test
-	public void testAddOneElementFromEmpty() throws Exception {
-		MockContent content = new MockContent("");
-		MetadataManipulator md = new MetadataManipulator(content);
+    @Test
+    void testAddOneElementFromEmpty() throws Exception {
+        MockContent content = new MockContent("");
+        MetadataManipulator md = new MetadataManipulator(content);
 
-		md.addDefaultInfo("test.property");
-		md.save();
+        md.addDefaultInfo("test.property");
+        md.save();
 
-		assertEquals(
-				"{\"properties\": [{\n" +
-				"  \"name\": \"test.property\",\n" +
-				"  \"type\": \"java.lang.String\",\n" +
-				"  \"description\": \"A description for 'test.property'\"\n" +
-				"}]}",
-				//================
-				content.toString());
+        assertEquals(
+                "{\"properties\": [{\n" +
+                        "  \"name\": \"test.property\",\n" +
+                        "  \"type\": \"java.lang.String\",\n" +
+                        "  \"description\": \"A description for 'test.property'\"\n" +
+                        "}]}",
+                //================
+                content.toString());
 
-		md.addDefaultInfo("another.property");
-		md.save();
+        md.addDefaultInfo("another.property");
+        md.save();
 
-		assertEquals(
-				"{\"properties\": [\n" +
-				"  {\n" +
-				"    \"name\": \"test.property\",\n" +
-				"    \"type\": \"java.lang.String\",\n" +
-				"    \"description\": \"A description for 'test.property'\"\n" +
-				"  },\n" +
-				"  {\n" +
-				"    \"name\": \"another.property\",\n" +
-				"    \"type\": \"java.lang.String\",\n" +
-				"    \"description\": \"A description for 'another.property'\"\n" +
-				"  }\n" +
-				"]}",
-				//================
-				content.toString());
+        assertEquals(
+                "{\"properties\": [\n" +
+                        "  {\n" +
+                        "    \"name\": \"test.property\",\n" +
+                        "    \"type\": \"java.lang.String\",\n" +
+                        "    \"description\": \"A description for 'test.property'\"\n" +
+                        "  },\n" +
+                        "  {\n" +
+                        "    \"name\": \"another.property\",\n" +
+                        "    \"type\": \"java.lang.String\",\n" +
+                        "    \"description\": \"A description for 'another.property'\"\n" +
+                        "  }\n" +
+                        "]}",
+                //================
+                content.toString());
 
-		assertTrue(md.isReliable());
+        assertTrue(md.isReliable());
 
-	}
+    }
 
-	@Test
-	public void testRawContent() throws Exception {
-		MockContent content = new MockContent("garbage");
-		MetadataManipulator md = new MetadataManipulator(content);
+    @Test
+    void testRawContent() throws Exception {
+        MockContent content = new MockContent("garbage");
+        MetadataManipulator md = new MetadataManipulator(content);
 
-		md.addDefaultInfo("test.property");
-		md.save();
+        md.addDefaultInfo("test.property");
+        md.save();
 
-		assertEquals(
-				"garbage{\n" +
-				"  \"name\": \"test.property\",\n" +
-				"  \"type\": \"java.lang.String\",\n" +
-				"  \"description\": \"A description for 'test.property'\"\n" +
-				"}\n",
-				//================
-				content.toString());
+        assertEquals(
+                "garbage{\n" +
+                        "  \"name\": \"test.property\",\n" +
+                        "  \"type\": \"java.lang.String\",\n" +
+                        "  \"description\": \"A description for 'test.property'\"\n" +
+                        "}\n",
+                //================
+                content.toString());
 
-		md.addDefaultInfo("another.property");
-		md.save();
+        md.addDefaultInfo("another.property");
+        md.save();
 
-		assertEquals(
-				"garbage{\n" +
-				"  \"name\": \"test.property\",\n" +
-				"  \"type\": \"java.lang.String\",\n" +
-				"  \"description\": \"A description for 'test.property'\"\n" +
-				"},\n" +
-				"{\n" +
-				"  \"name\": \"another.property\",\n" +
-				"  \"type\": \"java.lang.String\",\n" +
-				"  \"description\": \"A description for 'another.property'\"\n" +
-				"}\n",
-				//================
-				content.toString());
+        assertEquals(
+                "garbage{\n" +
+                        "  \"name\": \"test.property\",\n" +
+                        "  \"type\": \"java.lang.String\",\n" +
+                        "  \"description\": \"A description for 'test.property'\"\n" +
+                        "},\n" +
+                        "{\n" +
+                        "  \"name\": \"another.property\",\n" +
+                        "  \"type\": \"java.lang.String\",\n" +
+                        "  \"description\": \"A description for 'another.property'\"\n" +
+                        "}\n",
+                //================
+                content.toString());
 
-		assertFalse(md.isReliable());
-	}
+        assertFalse(md.isReliable());
+    }
 
-	@Test
-	public void testRawContent2() throws Exception {
-		MockContent content = new MockContent(
-				//almost correct content, its missing a comma
-				"{\"properties\": [\n" +
-				"  {\n" +
-				"    \"name\": \"test.property\",\n" +
-				"    \"type\": \"java.lang.String\",\n" +
-				"    \"description\": \"A description for 'test.property'\"\n" +
-				"  }\n" + //missing comma!
-				"  {\n" +
-				"    \"name\": \"another.property\",\n" +
-				"    \"type\": \"java.lang.String\",\n" +
-				"    \"description\": \"A description for 'another.property'\"\n" +
-				"  }\n" +
-				"]}"
-		);
-		MetadataManipulator md = new MetadataManipulator(content);
+    @Test
+    void testRawContent2() throws Exception {
+        MockContent content = new MockContent(
+                //almost correct content, its missing a comma
+                "{\"properties\": [\n" +
+                        "  {\n" +
+                        "    \"name\": \"test.property\",\n" +
+                        "    \"type\": \"java.lang.String\",\n" +
+                        "    \"description\": \"A description for 'test.property'\"\n" +
+                        "  }\n" + //missing comma!
+                        "  {\n" +
+                        "    \"name\": \"another.property\",\n" +
+                        "    \"type\": \"java.lang.String\",\n" +
+                        "    \"description\": \"A description for 'another.property'\"\n" +
+                        "  }\n" +
+                        "]}"
+        );
+        MetadataManipulator md = new MetadataManipulator(content);
 
-		md.addDefaultInfo("foo.bar");
-		md.save();
+        md.addDefaultInfo("foo.bar");
+        md.save();
 
-		assertEquals(
-				"{\"properties\": [\n" +
-				"  {\n" +
-				"    \"name\": \"test.property\",\n" +
-				"    \"type\": \"java.lang.String\",\n" +
-				"    \"description\": \"A description for 'test.property'\"\n" +
-				"  }\n" +
-				"  {\n" +
-				"    \"name\": \"another.property\",\n" +
-				"    \"type\": \"java.lang.String\",\n" +
-				"    \"description\": \"A description for 'another.property'\"\n" +
-				"  },\n" +
-				//TODO: The indentation is off... maybe this could be fixed
-				"{\n" +
-				"  \"name\": \"foo.bar\",\n" +
-				"  \"type\": \"java.lang.String\",\n" +
-				"  \"description\": \"A description for 'foo.bar'\"\n" +
-				"}\n" +
-				"]}",
-				//================
-				content.toString());
+        assertEquals(
+                "{\"properties\": [\n" +
+                        "  {\n" +
+                        "    \"name\": \"test.property\",\n" +
+                        "    \"type\": \"java.lang.String\",\n" +
+                        "    \"description\": \"A description for 'test.property'\"\n" +
+                        "  }\n" +
+                        "  {\n" +
+                        "    \"name\": \"another.property\",\n" +
+                        "    \"type\": \"java.lang.String\",\n" +
+                        "    \"description\": \"A description for 'another.property'\"\n" +
+                        "  },\n" +
+                        //TODO: The indentation is off... maybe this could be fixed
+                        "{\n" +
+                        "  \"name\": \"foo.bar\",\n" +
+                        "  \"type\": \"java.lang.String\",\n" +
+                        "  \"description\": \"A description for 'foo.bar'\"\n" +
+                        "}\n" +
+                        "]}",
+                //================
+                content.toString());
 
-		assertFalse(md.isReliable());
-	}
+        assertFalse(md.isReliable());
+    }
 
-	@Test
-	public void testDisallowRawContent() throws Exception {
-		MockContent content;
-		MetadataManipulator md;
+    @Test
+    void testDisallowRawContent() throws Exception {
+        MockContent content;
+        MetadataManipulator md;
 
-		// empty files can be reliabley manipulated?
-		content = new MockContent("");
-		md = new MetadataManipulator(content);
+        // empty files can be reliabley manipulated?
+        content = new MockContent("");
+        md = new MetadataManipulator(content);
 
-		md.addDefaultInfo("test.property");
-		md.save();
+        md.addDefaultInfo("test.property");
+        md.save();
 
-		assertEquals(
-				"{\"properties\": [{\n" +
-				"  \"name\": \"test.property\",\n" +
-				"  \"type\": \"java.lang.String\",\n" +
-				"  \"description\": \"A description for 'test.property'\"\n" +
-				"}]}",
-				//================
-				content.toString());
-	}
+        assertEquals(
+                "{\"properties\": [{\n" +
+                        "  \"name\": \"test.property\",\n" +
+                        "  \"type\": \"java.lang.String\",\n" +
+                        "  \"description\": \"A description for 'test.property'\"\n" +
+                        "}]}",
+                //================
+                content.toString());
+    }
 
 }

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

@@ -10,11 +10,9 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.metadata;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.ProgressService;
 import org.springframework.ide.vscode.commons.util.FuzzyMap;
@@ -33,37 +31,37 @@ public class PropertiesIndexTest {
 	private ProjectsHarness projects = ProjectsHarness.INSTANCE;
 	private ProgressService progressService = ProgressService.NO_PROGRESS;
 
-	@Test
-	public void springStandardPropertyPresent_Maven() throws Exception {
-		SpringPropertiesIndexManager indexManager = new SpringPropertiesIndexManager(
-				new ValueProviderRegistry(), null, null);
-		IJavaProject mavenProject = projects.mavenProject(CUSTOM_PROPERTIES_PROJECT);
-		FuzzyMap<PropertyInfo> index = indexManager.get(mavenProject, progressService).getProperties();
-		PropertyInfo propertyInfo = index.get("server.port");
-		assertNotNull(propertyInfo);
-		assertEquals(Integer.class.getName(), propertyInfo.getType());
-		assertEquals("port", propertyInfo.getName());
-	}
+    @Test
+    void springStandardPropertyPresent_Maven() throws Exception {
+        SpringPropertiesIndexManager indexManager = new SpringPropertiesIndexManager(
+                new ValueProviderRegistry(), null, null);
+        IJavaProject mavenProject = projects.mavenProject(CUSTOM_PROPERTIES_PROJECT);
+        FuzzyMap<PropertyInfo> index = indexManager.get(mavenProject, progressService).getProperties();
+        PropertyInfo propertyInfo = index.get("server.port");
+        assertNotNull(propertyInfo);
+        assertEquals(Integer.class.getName(), propertyInfo.getType());
+        assertEquals("port", propertyInfo.getName());
+    }
 
-	@Test
-	public void customPropertyPresent_Maven() throws Exception {
-		SpringPropertiesIndexManager indexManager = new SpringPropertiesIndexManager(
-				new ValueProviderRegistry(), null, null);
-		IJavaProject mavenProject = projects.mavenProject(CUSTOM_PROPERTIES_PROJECT);
-		FuzzyMap<PropertyInfo> index = indexManager.get(mavenProject, progressService).getProperties();
-		PropertyInfo propertyInfo = index.get("demo.settings.user");
-		assertNotNull(propertyInfo);
-		assertEquals(String.class.getName(), propertyInfo.getType());
-		assertEquals("user", propertyInfo.getName());
-	}
+    @Test
+    void customPropertyPresent_Maven() throws Exception {
+        SpringPropertiesIndexManager indexManager = new SpringPropertiesIndexManager(
+                new ValueProviderRegistry(), null, null);
+        IJavaProject mavenProject = projects.mavenProject(CUSTOM_PROPERTIES_PROJECT);
+        FuzzyMap<PropertyInfo> index = indexManager.get(mavenProject, progressService).getProperties();
+        PropertyInfo propertyInfo = index.get("demo.settings.user");
+        assertNotNull(propertyInfo);
+        assertEquals(String.class.getName(), propertyInfo.getType());
+        assertEquals("user", propertyInfo.getName());
+    }
 
-	@Test
-	public void propertyNotPresent_Maven() throws Exception {
-		SpringPropertiesIndexManager indexManager = new SpringPropertiesIndexManager(
-				new ValueProviderRegistry(), null, null);
-		IJavaProject mavenProject = projects.mavenProject(CUSTOM_PROPERTIES_PROJECT);
-		FuzzyMap<PropertyInfo> index = indexManager.get(mavenProject, progressService).getProperties();
-		PropertyInfo propertyInfo = index.get("my.server.port");
-		assertNull(propertyInfo);
-	}
+    @Test
+    void propertyNotPresent_Maven() throws Exception {
+        SpringPropertiesIndexManager indexManager = new SpringPropertiesIndexManager(
+                new ValueProviderRegistry(), null, null);
+        IJavaProject mavenProject = projects.mavenProject(CUSTOM_PROPERTIES_PROJECT);
+        FuzzyMap<PropertyInfo> index = indexManager.get(mavenProject, progressService).getProperties();
+        PropertyInfo propertyInfo = index.get("my.server.port");
+        assertNull(propertyInfo);
+    }
 }

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

@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.metadata;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.metadata.types.Type;
 import org.springframework.ide.vscode.boot.metadata.types.TypeParser;
 
@@ -23,61 +23,61 @@ import org.springframework.ide.vscode.boot.metadata.types.TypeParser;
  */
 public class TypeParserTest {
 
-	@Test
-	public void testNonGeneric() throws Exception {
-		Type type = TypeParser.parse("java.lang.String");
-		assertEquals("java.lang.String", type.getErasure());
-		assertFalse(type.isGeneric());
-		assertEquals("java.lang.String", type.toString());
-	}
+    @Test
+    void testNonGeneric() throws Exception {
+        Type type = TypeParser.parse("java.lang.String");
+        assertEquals("java.lang.String", type.getErasure());
+        assertFalse(type.isGeneric());
+        assertEquals("java.lang.String", type.toString());
+    }
 
-	@Test
-	public void testSimpleGeneric() throws Exception {
-		Type type = TypeParser.parse("List<Foo>");
-		assertEquals("List", type.getErasure());
-		assertTrue(type.isGeneric());
+    @Test
+    void testSimpleGeneric() throws Exception {
+        Type type = TypeParser.parse("List<Foo>");
+        assertEquals("List", type.getErasure());
+        assertTrue(type.isGeneric());
 
-		Type[] params = type.getParams();
-		assertEquals(1, params.length);
-		type = params[0];
-		assertEquals("Foo", type.getErasure());
-		assertFalse(type.isGeneric());
-	}
+        Type[] params = type.getParams();
+        assertEquals(1, params.length);
+        type = params[0];
+        assertEquals("Foo", type.getErasure());
+        assertFalse(type.isGeneric());
+    }
 
-	@Test
-	public void testMultipleParams() throws Exception {
-		Type type = TypeParser.parse("Map<Foo,Bar>");
-		assertEquals("Map", type.getErasure());
-		assertTrue(type.isGeneric());
+    @Test
+    void testMultipleParams() throws Exception {
+        Type type = TypeParser.parse("Map<Foo,Bar>");
+        assertEquals("Map", type.getErasure());
+        assertTrue(type.isGeneric());
 
-		Type[] params = type.getParams();
-		assertEquals(2, params.length);
+        Type[] params = type.getParams();
+        assertEquals(2, params.length);
 
-		type = params[0];
-		assertEquals("Foo", type.getErasure());
-		assertFalse(type.isGeneric());
+        type = params[0];
+        assertEquals("Foo", type.getErasure());
+        assertFalse(type.isGeneric());
 
-		type = params[1];
-		assertEquals("Bar", type.getErasure());
-		assertFalse(type.isGeneric());
-	}
+        type = params[1];
+        assertEquals("Bar", type.getErasure());
+        assertFalse(type.isGeneric());
+    }
 
-	@Test
-	public void testNestedGenerics() throws Exception {
-		Type type = TypeParser.parse("Map<Foo,List<Bar>>");
-		assertEquals("Map", type.getErasure());
-		assertTrue(type.isGeneric());
+    @Test
+    void testNestedGenerics() throws Exception {
+        Type type = TypeParser.parse("Map<Foo,List<Bar>>");
+        assertEquals("Map", type.getErasure());
+        assertTrue(type.isGeneric());
 
-		assertEquals("Map<Foo,List<Bar>>", type.toString());
-	}
+        assertEquals("Map<Foo,List<Bar>>", type.toString());
+    }
 
-	@Test
-	public void testTypeEquality() throws Exception {
-		Type type1 = TypeParser.parse("Map<Foo,List<Bar>>");
-		Type type2 = TypeParser.parse("Map<Foo,List<Bar>>");
-		Type type3 = TypeParser.parse("Map<Bar,List<Bar>>");
-		assertEquals(type1, type2);
-		assertNotEquals(type1, type3);
-	}
+    @Test
+    void testTypeEquality() throws Exception {
+        Type type1 = TypeParser.parse("Map<Foo,List<Bar>>");
+        Type type2 = TypeParser.parse("Map<Foo,List<Bar>>");
+        Type type3 = TypeParser.parse("Map<Bar,List<Bar>>");
+        assertEquals(type1, type2);
+        assertNotEquals(type1, type3);
+    }
 	
 }

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

@@ -10,14 +10,12 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.metadata;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.ide.vscode.boot.metadata.types.Type;
 import org.springframework.ide.vscode.boot.metadata.types.TypeParser;
 import org.springframework.ide.vscode.boot.metadata.types.TypeUtil;
@@ -55,70 +53,70 @@ public class TypeUtilTest {
 		return typeUtil.getProperties(type, enumMode, beanMode);
 	}
 
-	@Test
-	public void testGetTrickyProperties() throws Exception {
-		useProject("tricky-getters-boot-1.3.1-app");
-		List<TypedProperty> props = getProperties(TypeParser.parse("demo.TrickyGetters"), EnumCaseMode.LOWER_CASE, BeanPropertyNameMode.HYPHENATED);
-		assertNotNull(props);
-		List<String> names = props.stream().map(p -> p.getName()).collect(Collectors.toList());
-		assertEquals(1, names.size());
-		assertEquals("public-property", names.get(0));
-	}
+    @Test
+    void testGetTrickyProperties() throws Exception {
+        useProject("tricky-getters-boot-1.3.1-app");
+        List<TypedProperty> props = getProperties(TypeParser.parse("demo.TrickyGetters"), EnumCaseMode.LOWER_CASE, BeanPropertyNameMode.HYPHENATED);
+        assertNotNull(props);
+        List<String> names = props.stream().map(p -> p.getName()).collect(Collectors.toList());
+        assertEquals(1, names.size());
+        assertEquals("public-property", names.get(0));
+    }
 
-	@Test
-	public void testGetProperties() throws Exception {
-		useProject("enums-boot-1.3.2-app");
-		assertNotNull(project.getIndex().findType("demo.Color"));
-		assertNotNull(project.getIndex().findType("demo.ColorData"));
+    @Test
+    void testGetProperties() throws Exception {
+        useProject("enums-boot-1.3.2-app");
+        assertNotNull(project.getIndex().findType("demo.Color"));
+        assertNotNull(project.getIndex().findType("demo.ColorData"));
 
 
-		Type data = TypeParser.parse("demo.ColorData");
+        Type data = TypeParser.parse("demo.ColorData");
 
-		assertType("java.lang.Double",
-				getPropertyType(data, "wavelen"));
-		assertType("java.lang.String",
-				getPropertyType(data, "name"));
-		assertType("demo.Color",
-				getPropertyType(data, "next"));
-		assertType("demo.ColorData",
-				getPropertyType(data, "nested"));
-		assertType("java.util.List<java.lang.String>",
-				getPropertyType(data, "tags"));
-		assertType("java.util.Map<java.lang.String,demo.ColorData>",
-				getPropertyType(data, "mapped-children"));
-		assertType("java.util.Map<demo.Color,demo.ColorData>",
-				getPropertyType(data, "color-children"));
+        assertType("java.lang.Double",
+                getPropertyType(data, "wavelen"));
+        assertType("java.lang.String",
+                getPropertyType(data, "name"));
+        assertType("demo.Color",
+                getPropertyType(data, "next"));
+        assertType("demo.ColorData",
+                getPropertyType(data, "nested"));
+        assertType("java.util.List<java.lang.String>",
+                getPropertyType(data, "tags"));
+        assertType("java.util.Map<java.lang.String,demo.ColorData>",
+                getPropertyType(data, "mapped-children"));
+        assertType("java.util.Map<demo.Color,demo.ColorData>",
+                getPropertyType(data, "color-children"));
 
-		//Also gets aliased as camelCased names?
-		assertType("java.util.Map<demo.Color,demo.ColorData>",
-				getPropertyType(data, "colorChildren"));
-		assertType("java.util.Map<java.lang.String,demo.ColorData>",
-				getPropertyType(data, "mappedChildren"));
+        //Also gets aliased as camelCased names?
+        assertType("java.util.Map<demo.Color,demo.ColorData>",
+                getPropertyType(data, "colorChildren"));
+        assertType("java.util.Map<java.lang.String,demo.ColorData>",
+                getPropertyType(data, "mappedChildren"));
 
-		//Gets aliased names only if asked for it?
-		assertType("java.util.Map<java.lang.String,demo.ColorData>",
-				getPropertyType(data, "mappedChildren", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.CAMEL_CASE));
-		assertType(null,
-				getPropertyType(data, "mappedChildren", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.HYPHENATED));
-		assertType(null,
-				getPropertyType(data, "mapped-children", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.CAMEL_CASE));
-		assertType("java.util.Map<java.lang.String,demo.ColorData>",
-				getPropertyType(data, "mapped-children", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.HYPHENATED));
+        //Gets aliased names only if asked for it?
+        assertType("java.util.Map<java.lang.String,demo.ColorData>",
+                getPropertyType(data, "mappedChildren", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.CAMEL_CASE));
+        assertType(null,
+                getPropertyType(data, "mappedChildren", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.HYPHENATED));
+        assertType(null,
+                getPropertyType(data, "mapped-children", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.CAMEL_CASE));
+        assertType("java.util.Map<java.lang.String,demo.ColorData>",
+                getPropertyType(data, "mapped-children", EnumCaseMode.ORIGNAL, BeanPropertyNameMode.HYPHENATED));
 
-	}
+    }
 
-	@Test
-	public void testGetEnumKeyedProperties() throws Exception {
-		useProject("enums-boot-1.3.2-app");
-		Type data = TypeParser.parse("java.util.Map<demo.Color,Something>");
-		assertType("Something", getPropertyType(data, "red"));
-		assertType("Something", getPropertyType(data, "green"));
-		assertType("Something", getPropertyType(data, "blue"));
-		assertType("Something", getPropertyType(data, "RED"));
-		assertType("Something", getPropertyType(data, "GREEN"));
-		assertType("Something", getPropertyType(data, "BLUE"));
-		assertNull(getPropertyType(data, "not-a-color"));
-	}
+    @Test
+    void testGetEnumKeyedProperties() throws Exception {
+        useProject("enums-boot-1.3.2-app");
+        Type data = TypeParser.parse("java.util.Map<demo.Color,Something>");
+        assertType("Something", getPropertyType(data, "red"));
+        assertType("Something", getPropertyType(data, "green"));
+        assertType("Something", getPropertyType(data, "blue"));
+        assertType("Something", getPropertyType(data, "RED"));
+        assertType("Something", getPropertyType(data, "GREEN"));
+        assertType("Something", getPropertyType(data, "BLUE"));
+        assertNull(getPropertyType(data, "not-a-color"));
+    }
 
 	private Type getPropertyType(Type type, String propName) {
 		return getPropertyType(type, propName, EnumCaseMode.ALIASED, BeanPropertyNameMode.ALIASED);

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

@@ -1,18 +1,18 @@
 package org.springframework.ide.vscode.boot.test;
 
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Disabled;
+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.bootiful.BootLanguageServerTest;
 import org.springframework.ide.vscode.boot.bootiful.HoverTestConf;
 import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
-@Ignore
+@Disabled
 public class DynamicRequestMappingSymbolTest {
 
 	@Autowired LanguageServerHarness harness;

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

@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.test;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -26,6 +24,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.io.FileUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.springframework.ide.vscode.boot.java.Boot2JavaProblemType;
 import org.springframework.ide.vscode.boot.java.Boot3JavaProblemType;
 import org.springframework.ide.vscode.boot.java.SpelProblemType;

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

@@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify;
 
 import java.io.File;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.bootiful.BootLanguageServerTest;
@@ -31,7 +31,7 @@ import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Tests for Boot properties index
@@ -39,7 +39,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @author Alex Boyko
  *
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(SymbolProviderTestConf.class)
 public class SpringPropertiesIndexTest {
@@ -50,36 +50,36 @@ public class SpringPropertiesIndexTest {
 	@Autowired
 	private DefaultSpringPropertyIndexProvider propertyIndexProvider;
 
-	@Test
-	public void testPropertiesIndexRefreshOnProjectChange() throws Exception {
-		harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/boot-1.2.0-properties-live-metadta/").toURI()));
+    @Test
+    void testPropertiesIndexRefreshOnProjectChange() throws Exception {
+        harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/boot-1.2.0-properties-live-metadta/").toURI()));
 
-		File directory = new File(ProjectsHarness.class.getResource("/test-projects/boot-1.2.0-properties-live-metadta/").toURI());
+        File directory = new File(ProjectsHarness.class.getResource("/test-projects/boot-1.2.0-properties-live-metadta/").toURI());
 
-		File javaFile = new File(directory, "/src/main/java/demo/Application.java");
+        File javaFile = new File(directory, "/src/main/java/demo/Application.java");
 
-		TextDocument doc = new TextDocument(javaFile.toURI().toString(), LanguageId.JAVA);
+        TextDocument doc = new TextDocument(javaFile.toURI().toString(), LanguageId.JAVA);
 
-		// Not cached yet, hence progress service invoked
-		ProgressService progressService = mock(ProgressService.class);
-		propertyIndexProvider.setProgressService(progressService);
-		propertyIndexProvider.getIndex(doc);
-		verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
+        // Not cached yet, hence progress service invoked
+        ProgressService progressService = mock(ProgressService.class);
+        propertyIndexProvider.setProgressService(progressService);
+        propertyIndexProvider.getIndex(doc);
+        verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
 
-		// Should be cached now, so progress service should not be touched
-		progressService = mock(ProgressService.class);
-		propertyIndexProvider.setProgressService(progressService);
-		propertyIndexProvider.getIndex(doc);
-		verify(progressService, never()).progressBegin(any(), any(), any());
+        // Should be cached now, so progress service should not be touched
+        progressService = mock(ProgressService.class);
+        propertyIndexProvider.setProgressService(progressService);
+        propertyIndexProvider.getIndex(doc);
+        verify(progressService, never()).progressBegin(any(), any(), any());
 
-		// Change POM file for the project
-		harness.changeFile(new File(directory, MavenCore.POM_XML).toURI().toString());
+        // Change POM file for the project
+        harness.changeFile(new File(directory, MavenCore.POM_XML).toURI().toString());
 
-		// POM has changed, hence project needs to be reloaded, cached value is cleared
-		progressService = mock(ProgressService.class);
-		propertyIndexProvider.setProgressService(progressService);
-		propertyIndexProvider.getIndex(doc);
-		verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
-	}
+        // POM has changed, hence project needs to be reloaded, cached value is cleared
+        progressService = mock(ProgressService.class);
+        propertyIndexProvider.setProgressService(progressService);
+        propertyIndexProvider.getIndex(doc);
+        verify(progressService, atLeastOnce()).progressBegin(any(), any(), any());
+    }
 
 }

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

@@ -10,16 +10,13 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.validation.test;
 
-import static org.junit.Assert.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.bootiful.BootLanguageServerTest;
@@ -35,9 +32,9 @@ import org.springframework.ide.vscode.commons.java.SpringProjectUtil;
 import org.springframework.ide.vscode.commons.java.Version;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @BootLanguageServerTest
 @Import(HoverTestConf.class)
 public class ProjectGenerationsValidationTest {
@@ -47,124 +44,124 @@ public class ProjectGenerationsValidationTest {
 	private ProjectsHarness projects = ProjectsHarness.INSTANCE;
 
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		harness.useProject(projects.mavenProject("empty-boot-1.3.0-app"));
 		harness.intialize(null);
 	}
-	
 
-	@Test
-	public void testProjectsInfoFromSpringIo() throws Exception {
-		String url = "https://spring.io/api/projects";
-		SpringProjectsClient client = new SpringProjectsClient(url);
-		SpringProjectsProvider cache = new SpringIoProjectsProvider(client);
 
-		SpringProject project = cache.getProject("spring-boot");
-		assertNotNull(project);
-		assertEquals("Spring Boot", project.getName());
-		assertEquals("spring-boot", project.getSlug());
-		Link generationsUrl = project.get_links().getGenerations();
-		assertNotNull(generationsUrl);
-		assertEquals("https://spring.io/api/projects/spring-boot/generations", generationsUrl.getHref());
+    @Test
+    void testProjectsInfoFromSpringIo() throws Exception {
+        String url = "https://spring.io/api/projects";
+        SpringProjectsClient client = new SpringProjectsClient(url);
+        SpringProjectsProvider cache = new SpringIoProjectsProvider(client);
 
-		project = cache.getProject("spring-integration");
-		assertNotNull(project);
-		assertEquals("Spring Integration", project.getName());
-		assertEquals("spring-integration", project.getSlug());
-		generationsUrl = project.get_links().getGenerations();
-		assertNotNull(generationsUrl);
-		assertEquals("https://spring.io/api/projects/spring-integration/generations", generationsUrl.getHref());
-	
-		// Enable when generations is  actually available  from  spring.io
+        SpringProject project = cache.getProject("spring-boot");
+        assertNotNull(project);
+        assertEquals("Spring Boot", project.getName());
+        assertEquals("spring-boot", project.getSlug());
+        Link generationsUrl = project.get_links().getGenerations();
+        assertNotNull(generationsUrl);
+        assertEquals("https://spring.io/api/projects/spring-boot/generations", generationsUrl.getHref());
+
+        project = cache.getProject("spring-integration");
+        assertNotNull(project);
+        assertEquals("Spring Integration", project.getName());
+        assertEquals("spring-integration", project.getSlug());
+        generationsUrl = project.get_links().getGenerations();
+        assertNotNull(generationsUrl);
+        assertEquals("https://spring.io/api/projects/spring-integration/generations", generationsUrl.getHref());
+
+        // Enable when generations is  actually available  from  spring.io
 //		Generations generations = cache.getGenerations("spring-boot");
 //		assertNotNull(generations);
-	}
+    }
 
-	@Test
-	public void testGenerationsFromSample() throws Exception {
+    @Test
+    void testGenerationsFromSample() throws Exception {
 
-		SampleProjectsProvider provider = new SampleProjectsProvider();
+        SampleProjectsProvider provider = new SampleProjectsProvider();
 
-		ResolvedSpringProject project = provider.getProject("spring-boot");
-		assertNotNull(project);
+        ResolvedSpringProject project = provider.getProject("spring-boot");
+        assertNotNull(project);
 
-		List<Generation> genList = project.getGenerations();
+        List<Generation> genList = project.getGenerations();
 
-		assertNotNull(genList);
-		assertTrue(genList.size() > 0);
+        assertNotNull(genList);
+        assertTrue(genList.size() > 0);
 
-		Generation generation = genList.get(0);
-		assertEquals("1.3.x", generation.getName());
-		assertEquals("2019-01-01", generation.getInitialReleaseDate());
-		assertEquals("2020-01-01", generation.getOssSupportEndDate());
-		assertEquals("2021-01-01", generation.getCommercialSupportEndDate());
-	}
-	
-	@Test
-	public void testDependencyVersionCalculation() throws Exception {
-		Version version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3.jar", "spring-boot");
-		assertEquals(1, version.getMajor(), 1);
-		assertEquals(2, version.getMinor(), 2);
-		assertEquals(3, version.getPatch());
-		assertNull(version.getQualifier());
+        Generation generation = genList.get(0);
+        assertEquals("1.3.x", generation.getName());
+        assertEquals("2019-01-01", generation.getInitialReleaseDate());
+        assertEquals("2020-01-01", generation.getOssSupportEndDate());
+        assertEquals("2021-01-01", generation.getCommercialSupportEndDate());
+    }
 
-		version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3-RELEASE.jar", "spring-boot");
-		assertEquals(version.getMajor(), 1);
-		assertEquals(version.getMinor(), 2);
-		assertEquals(version.getPatch(), 3);
-		assertEquals(version.getQualifier(), "RELEASE");
+    @Test
+    void testDependencyVersionCalculation() throws Exception {
+        Version version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3.jar", "spring-boot");
+        assertEquals(1, version.getMajor(), 1);
+        assertEquals(2, version.getMinor(), 2);
+        assertEquals(3, version.getPatch());
+        assertNull(version.getQualifier());
 
-		version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3.RELEASE.jar", "spring-boot");
-		assertEquals(1, version.getMajor(), 1);
-		assertEquals(2, version.getMinor(), 2);
-		assertEquals(3, version.getPatch());
-		assertEquals("RELEASE", version.getQualifier());
+        version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3-RELEASE.jar", "spring-boot");
+        assertEquals(version.getMajor(), 1);
+        assertEquals(version.getMinor(), 2);
+        assertEquals(version.getPatch(), 3);
+        assertEquals(version.getQualifier(), "RELEASE");
 
-		version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3.BUILD-SNAPSHOT.jar", "spring-boot");
-		assertEquals(1, version.getMajor(), 1);
-		assertEquals(2, version.getMinor(), 2);
-		assertEquals(3, version.getPatch());
-		assertEquals("BUILD-SNAPSHOT", version.getQualifier());
+        version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3.RELEASE.jar", "spring-boot");
+        assertEquals(1, version.getMajor(), 1);
+        assertEquals(2, version.getMinor(), 2);
+        assertEquals(3, version.getPatch());
+        assertEquals("RELEASE", version.getQualifier());
 
-		version = SpringProjectUtil.getDependencyVersion("spring-boot-actuator-1.2.3.BUILD-SNAPSHOT.jar", "spring-boot");
-		assertNull(version);
-	}
-	
-	@Test
-	public void testVersionCalculation1() throws Exception {
-		Version version = SpringProjectUtil.getVersion("2.7.5");
-		assertEquals(2, version.getMajor());
-		assertEquals(7, version.getMinor());
-		assertEquals(5, version.getPatch());
-		assertNull(version.getQualifier());
+        version = SpringProjectUtil.getDependencyVersion("spring-boot-1.2.3.BUILD-SNAPSHOT.jar", "spring-boot");
+        assertEquals(1, version.getMajor(), 1);
+        assertEquals(2, version.getMinor(), 2);
+        assertEquals(3, version.getPatch());
+        assertEquals("BUILD-SNAPSHOT", version.getQualifier());
 
-		version = SpringProjectUtil.getVersion("3.0.0-SNAPSHOT");		
-		assertEquals(3, version.getMajor());
-		assertEquals(0, version.getMinor());
-		assertEquals(0, version.getPatch());
-		assertEquals(version.getQualifier(), "SNAPSHOT");
+        version = SpringProjectUtil.getDependencyVersion("spring-boot-actuator-1.2.3.BUILD-SNAPSHOT.jar", "spring-boot");
+        assertNull(version);
+    }
 
-		
-		version = SpringProjectUtil.getVersion("2.6.14-RC2");		
-		assertEquals(2, version.getMajor());
-		assertEquals(6, version.getMinor());
-		assertEquals(14, version.getPatch());
-		assertEquals(version.getQualifier(), "RC2");		
-	}
+    @Test
+    void testVersionCalculation1() throws Exception {
+        Version version = SpringProjectUtil.getVersion("2.7.5");
+        assertEquals(2, version.getMajor());
+        assertEquals(7, version.getMinor());
+        assertEquals(5, version.getPatch());
+        assertNull(version.getQualifier());
 
-	@Test
-	public void testVersionCalculation2() throws Exception {
-		Version version = SpringProjectUtil.getVersion("2.7");		
-		assertEquals(2, version.getMajor());
-		assertEquals(7, version.getMinor());
-		assertEquals(0, version.getPatch());
-		assertNull(version.getQualifier());
+        version = SpringProjectUtil.getVersion("3.0.0-SNAPSHOT");
+        assertEquals(3, version.getMajor());
+        assertEquals(0, version.getMinor());
+        assertEquals(0, version.getPatch());
+        assertEquals(version.getQualifier(), "SNAPSHOT");
 
-		version = SpringProjectUtil.getVersion("2");		
-		assertEquals(2, version.getMajor());
-		assertEquals(0, version.getMinor());
-		assertEquals(0, version.getPatch());
-		assertNull(version.getQualifier());
-	}
+
+        version = SpringProjectUtil.getVersion("2.6.14-RC2");
+        assertEquals(2, version.getMajor());
+        assertEquals(6, version.getMinor());
+        assertEquals(14, version.getPatch());
+        assertEquals(version.getQualifier(), "RC2");
+    }
+
+    @Test
+    void testVersionCalculation2() throws Exception {
+        Version version = SpringProjectUtil.getVersion("2.7");
+        assertEquals(2, version.getMajor());
+        assertEquals(7, version.getMinor());
+        assertEquals(0, version.getPatch());
+        assertNull(version.getQualifier());
+
+        version = SpringProjectUtil.getVersion("2");
+        assertEquals(2, version.getMajor());
+        assertEquals(0, version.getMinor());
+        assertEquals(0, version.getPatch());
+        assertNull(version.getQualifier());
+    }
 }

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

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.validation.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Arrays;
 import java.util.List;

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/BootLanguageServerHarness.java

@@ -15,7 +15,8 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.springframework.ide.vscode.boot.app.BootLanguageServerParams;
 import org.springframework.ide.vscode.boot.editor.harness.PropertyIndexHarness;
 import org.springframework.ide.vscode.boot.java.links.SourceLinks;
@@ -142,7 +143,7 @@ public class BootLanguageServerHarness extends LanguageServerHarness {
 	}
 
 	public PropertyIndexHarness getPropertyIndexHarness() {
-		Assert.assertNotNull(indexHarness); //only supported in some types of instantations of the harness (i.e. when indexer is controlled by indexer harness.
+		assertNotNull(indexHarness); //only supported in some types of instantations of the harness (i.e. when indexer is controlled by indexer harness.
 		return indexHarness;
 	}
 

headless-services/spring-boot-language-server/src/test/resources/logback-test.xml

@@ -9,7 +9,10 @@
     </encoder>
   </appender>
 
+<!--
   <root level="info">
     <appender-ref ref="STDOUT" />
   </root>
+-->
+
 </configuration>

headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-2.4.4-app/src/main/resources/application.yml

@@ -1,4 +1,5 @@
 logging:
-  file: aaa
+  file: 
+    name: aaa
 spring:
   profiles: bono

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-hyperlinks/pom.xml

@@ -128,6 +128,14 @@
                 <configuration>
                     <mainClass>org.test.int1.Main</mainClass>
                 </configuration>
+            </plugin>
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
             </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-validations/pom.xml

@@ -95,24 +95,10 @@
 	</dependencies>
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.9</version>
-                <configuration>
-                    <additionalProjectnatures>
-                        <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
-                    </additionalProjectnatures>
-                    <additionalBuildcommands>
-                        <buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
-                    </additionalBuildcommands>
-                    <downloadSources>true</downloadSources>
-                    <downloadJavadocs>true</downloadJavadocs>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -128,6 +114,14 @@
                 <configuration>
                     <mainClass>org.test.int1.Main</mainClass>
                 </configuration>
+            </plugin>
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
             </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>