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

Trim down generic parameters when matching autowired beans

Browse Source
This commit is contained in:
BoykoAlex
2018-12-12 13:43:11 -05:00
parent db429f9c21
commit 89ab018588
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
View File

@@ -241,9 +241,9 @@ public class AutowiredHoverProvider implements HoverProvider {
// Raw collections shouldn't match any beans
return type.getTypeArguments().length == 1 ? matchBeansByType(project, beans, type.getTypeArguments()[0].getQualifiedName(), false) : ImmutableList.of();
} else if (type.isArray() && type.getDimensions() == 1) {
return matchBeansByType(project, beans, type.getElementType().getQualifiedName(), false);
return matchBeansByType(project, beans, type.getElementType().getErasure().getQualifiedName(), false);
} else {
return matchBeansByType(project, beans, type.getQualifiedName(), true);
return matchBeansByType(project, beans, type.getErasure().getQualifiedName(), true);
}
}
@@ -263,7 +263,10 @@ public class AutowiredHoverProvider implements HoverProvider {
}
private static boolean isCompatibleBeanType(IJavaProject jp, LiveBean bean, String bindingQualifiedName) {
String liveBeanTypeFQName = bean.getType();
String rawLiveBeanFqName = bean.getType();
int idx = rawLiveBeanFqName.indexOf('<');
// Trim the generic parameters part if it's present
String liveBeanTypeFQName = idx < 0 ? rawLiveBeanFqName : rawLiveBeanFqName.substring(0, idx);
if (liveBeanTypeFQName != null) {
if (liveBeanTypeFQName.replace('$', '.').equals(bindingQualifiedName)) {
return true;