Attempt to fix failing XML HyperLink unit test

Author: BoykoAlex

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

@@ -387,28 +387,29 @@ private CompletableFuture<Void> _initializeProject(IJavaProject project, boolean
 					log.debug("Project with NULL name is being initialized");
 					return CompletableFuture.completedFuture(null);
 				} else {
+					synchronized(this) { // synchronized since the `indexers` array can change via a settings change
+						@SuppressWarnings("unchecked")
+						CompletableFuture<Void>[] futures = new CompletableFuture[this.indexers.length + 1];
+
+						// clean future
+						futures[0] = CompletableFuture.runAsync(() -> {
+							removeSymbolsByProject(project);
+							springIndex.removeBeans(project.getElementName());
+						}, this.updateQueue);
+						
+						// index futures
+						for (int i = 0; i < this.indexers.length; i++) {
+							InitializeProject initializeItem = new InitializeProject(project, this.indexers[i], clean);
+							futures[i + 1] = CompletableFuture.runAsync(initializeItem, this.updateQueue);
+						}
+						
+						CompletableFuture<Void> future = CompletableFuture.allOf(futures);
+						
+						future = future.thenAccept(v -> server.getClient().indexUpdated()).thenAccept(v -> listeners.fire(v));
 
-					@SuppressWarnings("unchecked")
-					CompletableFuture<Void>[] futures = new CompletableFuture[this.indexers.length + 1];
-
-					// clean future
-					futures[0] = CompletableFuture.runAsync(() -> {
-						removeSymbolsByProject(project);
-						springIndex.removeBeans(project.getElementName());
-					}, this.updateQueue);
-					
-					// index futures
-					for (int i = 0; i < this.indexers.length; i++) {
-						InitializeProject initializeItem = new InitializeProject(project, this.indexers[i], clean);
-						futures[i + 1] = CompletableFuture.runAsync(initializeItem, this.updateQueue);
+						this.latestScheduledTaskByProject.put(project.getElementName(), future);
+						return future;
 					}
-					
-					CompletableFuture<Void> future = CompletableFuture.allOf(futures);
-					
-					future = future.thenAccept(v -> server.getClient().indexUpdated()).thenAccept(v -> listeners.fire(v));
-
-					this.latestScheduledTaskByProject.put(project.getElementName(), future);
-					return future;
 				}
 			} else {
 				return deleteProject(project);
@@ -715,15 +716,17 @@ public List<? extends WorkspaceSymbol> getSymbols(String docURI) {
 			ImmutableList.Builder<WorkspaceSymbol> builder = ImmutableList.builder();
 			if (project != null && doc != null) {
 				// Collect symbols from the opened document
-				for (SpringIndexer indexer : this.indexers) {
-					if (indexer.isInterestedIn(docURI)) {
-						try {
-							for (EnhancedSymbolInformation enhanced : indexer.computeSymbols(project, docURI,
-									doc.get())) {
-								builder.add(enhanced.getSymbol());
+				synchronized(this) {
+					for (SpringIndexer indexer : this.indexers) {
+						if (indexer.isInterestedIn(docURI)) {
+							try {
+								for (EnhancedSymbolInformation enhanced : indexer.computeSymbols(project, docURI,
+										doc.get())) {
+									builder.add(enhanced.getSymbol());
+								}
+							} catch (Exception e) {
+								log.error("{}", e);
 							}
-						} catch (Exception e) {
-							log.error("{}", e);
 						}
 					}
 				}

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

@@ -73,6 +73,8 @@ public void setup() throws Exception {
 		settings.put("boot-java", bootJavaObj);
 
 		harness.changeConfiguration(new Settings(new Gson().toJsonTree(settings)));
+		// Configuration change updates indexer hence we need to wait until this occurs as well
+		indexer.waitOperation();
 
 		directory = new File(ProjectsHarness.class.getResource("/test-projects/test-xml-hyperlinks/").toURI());
 

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

@@ -100,6 +100,8 @@ public void setup() throws Exception {
 		settings.put("boot-java", bootJavaObj);
 
 		harness.changeConfiguration(new Settings(new Gson().toJsonTree(settings)));
+		// Configuration change updates indexer hence we need to wait until this occurs as well
+		indexer.waitOperation();
 
 		project = projects.mavenProject("test-xml-hyperlinks");
 
@@ -178,8 +180,9 @@ void testBeanPropertyNameFromSuperClassHyperlink() throws Exception {
     @Test
 //    @Disabled
     void testBeanRefHyperlink() throws Exception {
+		assertEquals(springIndex.getBeans().length, 4);
+		
 		Bean[] beans = springIndex.getBeansWithName(project.getElementName(), "simpleObj");
-
 		assertEquals(1, beans.length);
 		assertEquals("simpleObj", beans[0].getName());
 		assertEquals("u.t.r.SimpleObj", beans[0].getType());

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

@@ -78,6 +78,8 @@ public void setup() throws Exception {
 		settings.put("boot-java", bootJavaObj);
 
 		harness.changeConfiguration(new Settings(new Gson().toJsonTree(settings)));
+		// Configuration change updates indexer hence we need to wait until this occurs as well
+		indexer.waitOperation();
 
 		project = projects.mavenProject("test-xml-hyperlinks");