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

PT #151123837 - take parent path into account for request mapping symbols

Browse Source
This commit is contained in:
Martin Lippert
2017-09-18 19:58:11 +02:00
parent 6845d937ca
commit dadb6cf85a
3 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java
View File

@@ -13,13 +13,16 @@ package org.springframework.ide.vscode.boot.java.requestmapping;
import java.util.Iterator;
import java.util.List;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.Annotation;
import org.eclipse.jdt.core.dom.Expression;
import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.MemberValuePair;
import org.eclipse.jdt.core.dom.NormalAnnotation;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
import org.eclipse.jdt.core.dom.StringLiteral;
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.lsp4j.Location;
import org.eclipse.lsp4j.SymbolInformation;
import org.eclipse.lsp4j.SymbolKind;
@@ -35,8 +38,13 @@ public class RequestMappingSymbolProvider implements SymbolProvider {
public SymbolInformation getSymbol(Annotation node, TextDocument doc) {
try {
String path = getPath(node);
String parentPath = getParentPath(node);
String method = getMethod(node);
if (path != null && parentPath != null) {
String separator = !parentPath.endsWith("/") && !path.startsWith("/") ? "/" : "";
path = parentPath + separator + path;
}
if (path != null && !path.startsWith("/")) {
path = "/" + path;
}
@@ -113,4 +121,29 @@ public class RequestMappingSymbolProvider implements SymbolProvider {
return null;
}
private String getParentPath(Annotation node) {
ASTNode parent = node.getParent();
while (parent != null && !(parent instanceof TypeDeclaration)) {
parent = parent.getParent();
}
if (parent != null) {
TypeDeclaration type = (TypeDeclaration) parent;
List<?> modifiers = type.modifiers();
Iterator<?> iterator = modifiers.iterator();
while (iterator.hasNext()) {
Object modifier = iterator.next();
if (modifier instanceof Annotation) {
Annotation annotation = (Annotation) modifier;
ITypeBinding resolvedType = annotation.resolveTypeBinding();
String annotationType = resolvedType.getQualifiedName();
if (annotationType != null && Constants.SPRING_REQUEST_MAPPING.equals(annotationType)) {
return getPath(annotation);
}
}
}
}
return null;
}
}

14
headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSymbolProviderTest.java
View File

@@ -83,6 +83,20 @@ public class RequestMappingSymbolProviderTest {
assertTrue(containsSymbol(symbols, "@/greeting -- (no method defined)", uriPrefix + "/src/main/java/org/test/SimpleMappingClass.java", 6, 1, 6, 29));
}
@Test
public void testParentRequestMappingSymbol() throws Exception {
harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-request-mapping-symbols/").toURI()));
SpringIndexer indexer = new SpringIndexer(harness.getServer(), projectFinder, symbolProviders);
File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-request-mapping-symbols/").toURI());
indexer.scanFiles(directory);
String uriPrefix = "file://" + directory.getAbsolutePath();
List<? extends SymbolInformation> symbols = indexer.getSymbols(uriPrefix + "/src/main/java/org/test/ParentMappingClass.java");
assertEquals(2, symbols.size());
assertTrue(containsSymbol(symbols, "@/parent/greeting -- (no method defined)", uriPrefix + "/src/main/java/org/test/ParentMappingClass.java", 7, 1, 7, 29));
}
private boolean containsSymbol(List<? extends SymbolInformation> symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {
for (Iterator<? extends SymbolInformation> iterator = symbols.iterator(); iterator.hasNext();) {
SymbolInformation symbol = iterator.next();

13
headless-services/boot-java-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass.java Normal file
View File

@@ -0,0 +1,13 @@
package org.test;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping("parent")
public class ParentMappingClass {
@RequestMapping("/greeting")
public String hello() {
return "Hello";
}
}