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

support constant value extraction for request mapping symbols for constants from the same class than the request mapping

Browse Source
This commit is contained in:
Martin Lippert
2019-05-02 09:36:29 +02:00
parent 5ac515cc3a
commit 473c8a1b78
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
View File

@@ -192,6 +192,14 @@ public class ASTUtils {
}
return getExpressionValueAsString(((QualifiedName) exp).getName());
} else if (exp instanceof SimpleName) {
IBinding binding = ((SimpleName) exp).resolveBinding();
if (binding != null && binding.getKind() == IBinding.VARIABLE) {
IVariableBinding varBinding = (IVariableBinding) binding;
Object constValue = varBinding.getConstantValue();
if (constValue != null) {
return constValue.toString();
}
}
return ((SimpleName) exp).getIdentifier();
} else {
return null;

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

@@ -71,13 +71,21 @@ public class RequestMappingSymbolProviderTest {
}
@Test
public void testSimpleRequestMappingSymbolFromConstant() throws Exception {
String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstant.java").toUri().toString();
public void testSimpleRequestMappingSymbolFromConstantInDifferentClass() throws Exception {
String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java").toUri().toString();
List<? extends SymbolInformation> symbols = indexer.getSymbols(docUri);
assertEquals(1, symbols.size());
assertTrue(containsSymbol(symbols, "@/path/from/constant", docUri, 6, 1, 6, 48));
}
@Test
public void testSimpleRequestMappingSymbolFromConstantInSameClass() throws Exception {
String docUri = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClassWithConstantInSameClass.java").toUri().toString();
List<? extends SymbolInformation> symbols = indexer.getSymbols(docUri);
assertEquals(1, symbols.size());
assertTrue(containsSymbol(symbols, "@/request/mapping/path/from/same/class/constant", docUri, 8, 1, 8, 52));
}
@Test
public void testParentRequestMappingSymbol() throws Exception {
String docUri = directory.toPath().resolve("src/main/java/org/test/ParentMappingClass.java").toUri().toString();

2
headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/SimpleMappingClassWithConstant.java → headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/SimpleMappingClassWithConstantInDifferentClass.java
View File

@@ -2,7 +2,7 @@ package org.test;
import org.springframework.web.bind.annotation.RequestMapping;
public class SimpleMappingClassWithConstant {
public class SimpleMappingClassWithConstantInDifferentClass {
@RequestMapping(Constants.REQUEST_MAPPING_PATH)
public String hello() {

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

@@ -0,0 +1,14 @@
package org.test;
import org.springframework.web.bind.annotation.RequestMapping;
public class SimpleMappingClassWithConstantInSameClass {
private static final String REQUEST_MAPPING_PATH_IN_SAME_CLASS = "/request/mapping/path/from/same/class/constant";
@RequestMapping(REQUEST_MAPPING_PATH_IN_SAME_CLASS)
public String hello() {
return "Hello";
}
}