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

isCompatibleWith now takes bean type itself into account as well

Browse Source
This commit is contained in:
Martin Lippert
2023-05-24 13:11:40 +02:00
parent 14d2556e71
commit c9b526f2f6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/Bean.java
View File

@@ -58,7 +58,7 @@ public class Bean {
}
public boolean isTypeCompatibleWith(String type) {
return supertypes.contains(type);
return type != null && ((this.type != null && this.type.equals(type)) || (supertypes.contains(type)));
}
@Override

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

@@ -230,6 +230,7 @@ public class SpringMetamodelIndexerBeansTest {
assertTrue(beans[0].isTypeCompatibleWith("org.test.supertypes.Interface2OfBeanWithSupertypes"));
assertTrue(beans[0].isTypeCompatibleWith("org.test.supertypes.InterfaceOfAbstractBean"));
assertTrue(beans[0].isTypeCompatibleWith("org.test.supertypes.BaseClassOfAbstractBeanWithSupertypes"));
assertTrue(beans[0].isTypeCompatibleWith("org.test.BeanWithSupertypes"));
assertFalse(beans[0].isTypeCompatibleWith("java.lang.String"));
assertFalse(beans[0].isTypeCompatibleWith("java.util.Comparator"));