Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moved the spring bean index updates out of the indexers into the handler

Browse Source
This commit is contained in:
Martin Lippert
2023-04-14 10:16:19 +02:00
parent a8e649112f
commit 4ea0313ea7
8 changed files with 400 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexTest.java Normal file
View File

@@ -0,0 +1,213 @@
/*******************************************************************************
* 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.assertFalse;
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.util.List;
import org.assertj.core.util.Arrays;
import org.eclipse.lsp4j.Location;
import org.eclipse.lsp4j.Position;
import org.eclipse.lsp4j.Range;
import org.junit.jupiter.api.Test;
import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
import org.springframework.ide.vscode.commons.protocol.spring.Bean;
import org.springframework.ide.vscode.commons.protocol.spring.InjectionPoint;
public class SpringMetamodelIndexTest {
private InjectionPoint[] emptyInjectionPoints = new InjectionPoint[0];
private String[] emptySupertypes = new String[0];
private Location locationForDoc1 = new Location("docURI1", new Range(new Position(1, 1), new Position(1, 10)));
private Location locationForDoc2 = new Location("docURI2", new Range(new Position(2, 1), new Position(2, 10)));
@Test
void testEmptyIndex() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
assertNull(index.getBeansOfProject("someProject"));
assertNull(index.getBeansWithName("someProject", "someBeanName"));
}
@Test
void testSimpleProjectWithBeansPerProject() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
Bean bean1 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean2 = new Bean("beanName2", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean3 = new Bean("beanName3", "beanType", locationForDoc2, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", new Bean[] {bean1, bean2, bean3});
Bean[] beans = index.getBeansOfProject("someProject");
assertNotNull(beans);
assertEquals(3, beans.length);
List<Object> beansList = Arrays.asList(beans);
assertTrue(beansList.contains(bean1));
assertTrue(beansList.contains(bean2));
assertTrue(beansList.contains(bean3));
Bean anotherBean = new Bean("anotherBean", "beanType", null, emptyInjectionPoints, emptySupertypes);
assertFalse(beansList.contains(anotherBean));
}
@Test
void testSimpleProjectWithBeansPerDocument() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
Bean bean1 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean2 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean3 = new Bean("beanWithDifferentName", "beanType", locationForDoc2, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", new Bean[] {bean1, bean2, bean3});
Bean[] beansByLocation1 = index.getBeansOfDocument(locationForDoc1.getUri());
assertNotNull(beansByLocation1);
assertEquals(2, beansByLocation1.length);
List<Object> beansList = Arrays.asList(beansByLocation1);
assertTrue(beansList.contains(bean1));
assertTrue(beansList.contains(bean2));
assertFalse(beansList.contains(bean3));
Bean[] beansByLocation2 = index.getBeansOfDocument(locationForDoc2.getUri());
assertNotNull(beansByLocation2);
assertEquals(1, beansByLocation2.length);
assertEquals(bean3, beansByLocation2[0]);
Bean[] beansOfNonExistingLocation = index.getBeansOfDocument("otherDocURI");
assertEquals(0, beansOfNonExistingLocation.length);
}
@Test
void testSimpleProjectWithBeansPerName() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
Bean bean1 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean2 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean3 = new Bean("beanWithDifferentName", "beanType", locationForDoc2, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", new Bean[] {bean1, bean2, bean3});
Bean[] beansByName = index.getBeansWithName("someProject", "beanName1");
assertNotNull(beansByName);
assertEquals(2, beansByName.length);
List<Object> beansList = Arrays.asList(beansByName);
assertTrue(beansList.contains(bean1));
assertTrue(beansList.contains(bean2));
assertFalse(beansList.contains(bean3));
assertNull(index.getBeansWithName("nonExistingProject", "beanName1"));
}
@Test
void testUpdateBeansForSpecificDoc() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
Bean bean1 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean2 = new Bean("beanName2", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean3 = new Bean("beanName3", "beanType", locationForDoc2, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", locationForDoc1.getUri(), new Bean[] {bean1, bean2});
index.updateBeans("someProject", locationForDoc2.getUri(), new Bean[] {bean3});
Bean updatedBean1 = new Bean("updated1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean updatedBean2 = new Bean("updated2", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", locationForDoc1.getUri(), new Bean[] {updatedBean1, updatedBean2});
Bean[] beans = index.getBeansOfProject("someProject");
assertNotNull(beans);
assertEquals(3, beans.length);
List<Object> beansList = Arrays.asList(beans);
assertTrue(beansList.contains(updatedBean1));
assertTrue(beansList.contains(updatedBean2));
assertTrue(beansList.contains(bean3));
assertFalse(beansList.contains(bean1));
assertFalse(beansList.contains(bean2));
Bean anotherBean = new Bean("anotherBean", "beanType", null, emptyInjectionPoints, emptySupertypes);
assertFalse(beansList.contains(anotherBean));
}
@Test
void testUpdateAllBeansForSpecificProject() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
Bean bean1 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean2 = new Bean("beanName2", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", new Bean[] {bean1, bean2});
Bean bean3 = new Bean("beanName3", "beanType", locationForDoc2, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", new Bean[] {bean3});
Bean[] beans = index.getBeansOfProject("someProject");
assertNotNull(beans);
assertEquals(1, beans.length);
List<Object> beansList = Arrays.asList(beans);
assertFalse(beansList.contains(bean1));
assertFalse(beansList.contains(bean2));
assertTrue(beansList.contains(bean3));
}
@Test
void testRemoveAllBeansForSpecificProject() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
Bean bean1 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean2 = new Bean("beanName2", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean3 = new Bean("beanName3", "beanType", locationForDoc2, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject1", new Bean[] {bean1, bean2});
index.updateBeans("someProject2", new Bean[] {bean3});
index.removeBeans("someProject1");
Bean[] beans = index.getBeansOfProject("someProject2");
assertNotNull(beans);
assertEquals(1, beans.length);
List<Object> beansList = Arrays.asList(beans);
assertFalse(beansList.contains(bean1));
assertFalse(beansList.contains(bean2));
assertTrue(beansList.contains(bean3));
assertNull(index.getBeansOfProject("someProject1"));
}
@Test
void testRemoveAllBeansForSpecificDocument() {
SpringMetamodelIndex index = new SpringMetamodelIndex();
Bean bean1 = new Bean("beanName1", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean2 = new Bean("beanName2", "beanType", locationForDoc1, emptyInjectionPoints, emptySupertypes);
Bean bean3 = new Bean("beanName3", "beanType", locationForDoc2, emptyInjectionPoints, emptySupertypes);
index.updateBeans("someProject", new Bean[] {bean1, bean2, bean3});
index.removeBeans("someProject", locationForDoc1.getUri());
Bean[] beans = index.getBeansOfProject("someProject");
assertNotNull(beans);
assertEquals(1, beans.length);
List<Object> beansList = Arrays.asList(beans);
assertFalse(beansList.contains(bean1));
assertFalse(beansList.contains(bean2));
assertTrue(beansList.contains(bean3));
}
}

24
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metamodel/test/SpringMetamodelIndexerBeansTest.java
View File

@@ -83,7 +83,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeansNameAndTypeFromBeanAnnotatedMethod() {
Bean[] beans = springIndex.getBeans("bean1");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "bean1");
assertEquals(1, beans.length);
assertEquals("bean1", beans[0].getName());
@@ -92,7 +92,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeansDefintionLocationFromBeanAnnotatedMethod() {
Bean[] beans = springIndex.getBeans("bean1");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "bean1");
String docUri = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
Location location = new Location(docUri, new Range(new Position(13, 1), new Position(13, 6)));
@@ -101,7 +101,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeansNameAndTypeFromComponentAnnotatedClassExists() {
Bean[] beans = springIndex.getBeans("constructorInjectionService");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "constructorInjectionService");
assertEquals(1, beans.length);
assertEquals("constructorInjectionService", beans[0].getName());
@@ -110,7 +110,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeansDefintionLocationFromComponentAnnotatedClass() {
Bean[] beans = springIndex.getBeans("constructorInjectionService");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "constructorInjectionService");
String docUri = directory.toPath().resolve("src/main/java/org/test/injections/ConstructorInjectionService.java").toUri().toString();
Location location = new Location(docUri, new Range(new Position(6, 0), new Position(6, 8)));
@@ -119,7 +119,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeansNameAndTypeFromConfigurationAnnotatedClassExists() {
Bean[] beans = springIndex.getBeans("configurationWithoutInjection");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "configurationWithoutInjection");
assertEquals(1, beans.length);
assertEquals("configurationWithoutInjection", beans[0].getName());
@@ -128,7 +128,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeansDefinitionLocationFromConfigurationAnnotatedClass() {
Bean[] beans = springIndex.getBeans("configurationWithoutInjection");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "configurationWithoutInjection");
assertEquals(1, beans.length);
String docUri = directory.toPath().resolve("src/main/java/org/test/injections/ConfigurationWithoutInjection.java").toUri().toString();
@@ -137,7 +137,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeanNoInjectionPointsFromBeanAnnotatedMethod() {
Bean[] beans = springIndex.getBeans("beanWithoutInjections");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "beanWithoutInjections");
assertEquals(1, beans.length);
InjectionPoint[] injectionPoints = beans[0].getInjectionPoints();
@@ -146,7 +146,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeanInjectionPointsFromBeanAnnotatedMethod() {
Bean[] beans = springIndex.getBeans("manualBeanWithConstructor");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "manualBeanWithConstructor");
assertEquals(1, beans.length);
String docUri = directory.toPath().resolve("src/main/java/org/test/injections/ConfigurationWithInjections.java").toUri().toString();
@@ -167,7 +167,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeanInjectionPointsFromConstructor() {
Bean[] beans = springIndex.getBeans("constructorInjectionService");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "constructorInjectionService");
assertEquals(1, beans.length);
String docUri = directory.toPath().resolve("src/main/java/org/test/injections/ConstructorInjectionService.java").toUri().toString();
@@ -188,7 +188,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeanInjectionPointsFromAutowiredFields() {
Bean[] beans = springIndex.getBeans("autowiredInjectionService");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "autowiredInjectionService");
assertEquals(1, beans.length);
String docUri = directory.toPath().resolve("src/main/java/org/test/injections/AutowiredInjectionService.java").toUri().toString();
@@ -209,7 +209,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeanFromSpringDataRepository() {
Bean[] beans = springIndex.getBeans("customerRepository");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "customerRepository");
assertEquals(1, beans.length);
assertEquals("customerRepository", beans[0].getName());
@@ -221,7 +221,7 @@ public class SpringMetamodelIndexerBeansTest {
@Test
void testBeansWithSupertypes() {
Bean[] beans = springIndex.getBeans("beanWithSupertypes");
Bean[] beans = springIndex.getBeansWithName("test-spring-indexing", "beanWithSupertypes");
assertEquals(1, beans.length);
assertTrue(beans[0].isTypeCompatibleWith("java.lang.Object"));