diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java index 1ba30a1ff..6cfa94615 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java @@ -358,6 +358,7 @@ public class SpringSymbolIndex implements InitializingBean, SpringModelService { } else { removeSymbolsByProject(project); + springIndex.removeBeans(project.getElementName()); @SuppressWarnings("unchecked") CompletableFuture[] futures = new CompletableFuture[this.indexers.length]; @@ -856,6 +857,7 @@ public class SpringSymbolIndex implements InitializingBean, SpringModelService { try { for (String doc : this.docURIs) { removeSymbolsByDoc(project, doc); + springIndex.removeBeans(project.getElementName(), doc); } for (SpringIndexer index : this.indexer) { @@ -886,6 +888,8 @@ public class SpringSymbolIndex implements InitializingBean, SpringModelService { for (SpringIndexer index : this.indexer) { index.removeProject(project); } + springIndex.removeBeans(project.getElementName()); + log.debug("{} completed", this); } catch (Throwable e) { log.error("{} threw exception", this, e); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexerBeansTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexerBeansTest.java index 579728380..59213eff2 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexerBeansTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexerBeansTest.java @@ -47,20 +47,13 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; @Import(SymbolProviderTestConf.class) public class SpringMetamodelIndexerBeansTest { - @Autowired - private BootLanguageServerHarness harness; - - @Autowired - private JavaProjectFinder projectFinder; + @Autowired private BootLanguageServerHarness harness; + @Autowired private JavaProjectFinder projectFinder; + @Autowired private SpringMetamodelIndex springIndex; + @Autowired private SpringSymbolIndex indexer; private File directory; - @Autowired - private SpringMetamodelIndex springIndex; - - @Autowired - private SpringSymbolIndex indexer; - @BeforeEach public void setup() throws Exception { harness.intialize(null); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexingTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexingTest.java new file mode 100644 index 000000000..169e0ab4c --- /dev/null +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexingTest.java @@ -0,0 +1,177 @@ +/******************************************************************************* + * Copyright (c) 2023 VMware, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * VMware, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.metamodel.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.io.File; +import java.net.URI; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; + +import org.apache.commons.io.FileUtils; +import org.eclipse.lsp4j.TextDocumentIdentifier; +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; +import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest; +import org.springframework.ide.vscode.boot.bootiful.SymbolProviderTestConf; +import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; +import org.springframework.ide.vscode.commons.protocol.spring.Bean; +import org.springframework.ide.vscode.commons.protocol.spring.InjectionPoint; +import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness; +import org.springframework.ide.vscode.project.harness.ProjectsHarness; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +/** + * @author Martin Lippert + */ +@ExtendWith(SpringExtension.class) +@BootLanguageServerTest +@Import(SymbolProviderTestConf.class) +public class SpringMetamodelIndexingTest { + + @Autowired private BootLanguageServerHarness harness; + @Autowired private JavaProjectFinder projectFinder; + @Autowired private SpringMetamodelIndex springIndex; + @Autowired private SpringSymbolIndex indexer; + + private File directory; + private IJavaProject project; + + @BeforeEach + public void setup() throws Exception { + harness.intialize(null); + + directory = new File(ProjectsHarness.class.getResource("/test-projects/test-spring-indexing/").toURI()); + + String projectDir = directory.toURI().toString(); + project = projectFinder.find(new TextDocumentIdentifier(projectDir)).get(); + + CompletableFuture initProject = indexer.waitOperation(); + initProject.get(5, TimeUnit.SECONDS); + } + + @Test + void testDeleteProject() throws Exception { + Bean[] beans = springIndex.getBeansOfProject("test-spring-indexing"); + assertEquals(11, beans.length); + + CompletableFuture deleteProject = indexer.deleteProject(project); + deleteProject.get(5, TimeUnit.SECONDS); + + Bean[] noBeansAnymore = springIndex.getBeansOfProject("test-spring-indexing"); + assertNull(noBeansAnymore); + } + + @Test + void testRemoveSymbolsFromDeletedDocument() throws Exception { + // update document and update index + String deletedDocURI = directory.toPath().resolve("src/main/java/org/test/injections/ConstructorInjectionService.java").toUri().toString(); + + Bean[] allBeansOfProject = springIndex.getBeansOfProject("test-spring-indexing"); + assertEquals(11, allBeansOfProject.length); + + Bean[] beans = springIndex.getBeansOfDocument(deletedDocURI); + assertEquals(1, beans.length); + + CompletableFuture deleteFuture = indexer.deleteDocument(deletedDocURI); + deleteFuture.get(5, TimeUnit.HOURS); + + // check for updated index per document + Bean[] noBeansAnymore = springIndex.getBeansOfDocument(deletedDocURI); + assertEquals(0, noBeansAnymore.length); + + // check for updated index in all symbols + Bean[] lessBeansOfProject = springIndex.getBeansOfProject("test-spring-indexing"); + assertEquals(10, lessBeansOfProject.length); + } + + @Test + void testUpdateChangedDocument() throws Exception { + // update document and update index + String changedDocURI = directory.toPath().resolve("src/main/java/org/test/injections/ConfigurationWithoutInjection.java").toUri().toString(); + + Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "beanWithoutInjections"); + assertEquals(1, beans.length); + assertEquals(0, beans[0].getInjectionPoints().length); + + String newContent = FileUtils.readFileToString(new File(new URI(changedDocURI))).replace("beanWithoutInjections()", "beanNowWithOneInjection(BeanClass1 bean1)"); + CompletableFuture updateFuture = indexer.updateDocument(changedDocURI, newContent, "test triggered"); + updateFuture.get(5, TimeUnit.SECONDS); + + Bean[] oldBeans = springIndex.getBeansWithName("test-spring-indexing", "beanWithoutInjections"); + assertEquals(0, oldBeans.length); + + Bean[] updatedBeans = springIndex.getBeansWithName("test-spring-indexing", "beanNowWithOneInjection"); + assertEquals(1, updatedBeans.length); + assertEquals("beanNowWithOneInjection", updatedBeans[0].getName()); + assertEquals("org.test.BeanClass1", updatedBeans[0].getType()); + + InjectionPoint[] updatedInjectionPoints = updatedBeans[0].getInjectionPoints(); + assertEquals(1, updatedInjectionPoints.length); + assertEquals("org.test.BeanClass1", updatedInjectionPoints[0].getType()); + assertEquals("bean1", updatedInjectionPoints[0].getName()); + } + + @Test + void testNewDocumentCreated() throws Exception { + + // TODO + + String createdDocURI = directory.toPath().resolve("src/main/java/org/test/CreatedClass.java").toUri().toString(); + + try { + // create document and update index + String content = "package org.test;\n" + + "\n" + + "import org.springframework.context.annotation.Bean;\n" + + "import org.springframework.context.annotation.Configuration;\n" + + "import org.test.BeanClass1;\n" + + "\n" + + "@Configuration\n" + + "public class CreatedClass {\n" + + "\n" + + " @Bean\n" + + " BeanClass1 createdClassBean() {\n" + + " return new BeanClass1();\n" + + " }\n" + + "\n" + + "}\n" + + "" + + ""; + FileUtils.write(new File(new URI(createdDocURI)), content); + CompletableFuture createFuture = indexer.createDocument(createdDocURI); + createFuture.get(5, TimeUnit.SECONDS); + + // check for updated index per document + Bean[] newBeans = springIndex.getBeansOfDocument(createdDocURI); + assertEquals(2, newBeans.length); + + assertEquals("createdClass", newBeans[0].getName()); + assertEquals("org.test.CreatedClass", newBeans[0].getType()); + + assertEquals("createdClassBean", newBeans[1].getName()); + assertEquals("org.test.BeanClass1", newBeans[1].getType()); + } + finally { + FileUtils.deleteQuietly(new File(new URI(createdDocURI))); + } + } + + +}