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

Fixed data symbols provider tests

Browse Source
This commit is contained in:
BoykoAlex
2022-02-15 20:15:40 -05:00
parent 30d153eebc
commit 457423e005
2 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java
View File

@@ -95,39 +95,46 @@ public class DataRepositorySymbolProvider extends AbstractSymbolProvider {
private static Tuple4<String, String, String, DocumentRegion> getRepositoryBean(ClassDeclaration typeDeclaration, TextDocument doc,
FullyQualified resolvedType) {
for (FullyQualified resolvedInterface : resolvedType.getInterfaces()) {
if (Constants.REPOSITORY_TYPE.equals(resolvedInterface.getFullyQualifiedName())) {
String beanName = getBeanName(typeDeclaration);
String beanType = ORAstUtils.getSimpleNameWithParamTypes(resolvedInterface);
String domainType = null;
if (resolvedInterface instanceof Parameterized) {
List<JavaType> typeParams = ((Parameterized)resolvedInterface).getTypeParameters();
if (typeParams != null && !typeParams.isEmpty()) {
FullyQualified typeParam = TypeUtils.asFullyQualified(typeParams.get(0));
domainType = typeParam == null ? null : ORAstUtils.getSimpleNameWithParamTypes(typeParam);
}
}
DocumentRegion region = ORAstUtils.nodeRegion(doc, typeDeclaration.getName());
return Tuples.of(beanName, beanType.toString(), domainType, region);
} else {
Tuple4<String, String, String, DocumentRegion> result = getRepositoryBean(typeDeclaration, doc, resolvedInterface);
if (result != null) {
return result;
if (TypeUtils.isAssignableTo(Constants.REPOSITORY_TYPE, resolvedType)) {
List<JavaType> typeParams = calculateTypeParams(resolvedType);
String domainType = null;
String beanName = getBeanName(typeDeclaration);
StringBuilder beanType = new StringBuilder(Constants.REPOSITORY_TYPE.substring(Constants.REPOSITORY_TYPE.lastIndexOf('.') + 1));
if (typeParams != null) {
beanType.append(typeParams.stream().map(ORAstUtils::getSimpleNameWithParamTypes).collect(Collectors.joining(",", "<", ">")));
if (!typeParams.isEmpty()) {
FullyQualified typeParam = TypeUtils.asFullyQualified(typeParams.get(0));
domainType = typeParam == null ? null : ORAstUtils.getSimpleNameWithParamTypes(typeParam);
}
}
DocumentRegion region = ORAstUtils.nodeRegion(doc, typeDeclaration.getName());
return Tuples.of(beanName, beanType.toString(), domainType, region);
}
FullyQualified superclass = resolvedType.getSupertype();
if (superclass != null) {
return getRepositoryBean(typeDeclaration, doc, superclass);
} else {
return null;
return null;
}
private static List<JavaType> calculateTypeParams(JavaType type) {
if (type instanceof FullyQualified) {
if (type instanceof Parameterized) {
return ((Parameterized) type).getTypeParameters();
}
FullyQualified fqType = (FullyQualified) type;
for (FullyQualified i : fqType.getInterfaces()) {
List<JavaType> res = calculateTypeParams(i);
if (res != null) {
return res;
}
}
FullyQualified superType = fqType.getSupertype();
if (superType != null) {
return calculateTypeParams(superType);
}
}
return null;
}
private static String getBeanName(ClassDeclaration typeDeclaration) {

2
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java
View File

@@ -61,7 +61,7 @@ public class DataRepositorySymbolProviderTest {
projectFinder.find(new TextDocumentIdentifier(projectDir)).get();
CompletableFuture<Void> initProject = indexer.waitOperation();
initProject.get(25000000L, TimeUnit.SECONDS);
initProject.get(20, TimeUnit.SECONDS);
}
@Test