display nice request mapping symbol labels in the jmolecules struture view

Author: martinlippert

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/commands/SpringIndexCommands.java

@@ -23,6 +23,7 @@
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.commands.ToolsJsonNodeHandler.Node;
+import org.springframework.ide.vscode.boot.java.requestmapping.RequestMappingIndexElement;
 import org.springframework.ide.vscode.boot.java.stereotypes.IndexBasedStereotypeFactory;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeCatalogRegistry;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeClassElement;
@@ -38,7 +39,11 @@ public class SpringIndexCommands {
 	private static final String SPRING_STRUCTURE_CMD = "sts/spring-boot/structure";
 	private static final String SPRING_STRUCTURE_CMD_2 = "sts/spring-boot/structure2";
 
+	private final SpringMetamodelIndex springIndex;
+	
 	public SpringIndexCommands(SimpleLanguageServer server, SpringMetamodelIndex springIndex, JavaProjectFinder projectFinder, StereotypeCatalogRegistry stereotypeCatalogRegistry) {
+		this.springIndex = springIndex;
+		
 		server.onCommand(SPRING_STRUCTURE_CMD, params -> server.getAsync().invoke(() -> springIndex.getProjects()));
 		server.onCommand(SPRING_STRUCTURE_CMD_2, params -> server.getAsync().invoke(() -> {
 			return projectFinder.all().stream().map(project -> nodeFrom(stereotypeCatalogRegistry, springIndex, project)).filter(Objects::nonNull).collect(Collectors.toList());
@@ -55,7 +60,7 @@ private Node nodeFrom(StereotypeCatalogRegistry stereotypeCatalogRegistry, Sprin
 		var labelProvider = new SimpleLabelProvider<>(StereotypePackageElement::getPackageName, StereotypePackageElement::getPackageName, StereotypeClassElement::getType,
 				(StereotypeMethodElement m, StereotypeClassElement __) -> m.getMethodName(), Object::toString)
 				.withTypeLabel(it -> abbreviate(mainApplicationPackage, it))
-				.withMethodLabel((m, c) -> getMethodLabel(m, c));
+				.withMethodLabel((m, c) -> getMethodLabel(project, m, c));
 
 		var structureProvider = new ToolsStructureProvider(springIndex, project);
 
@@ -86,9 +91,20 @@ private String abbreviate(StereotypePackageElement mainApplicationPackage, Stere
 		}
 	}
 
-	private String getMethodLabel(StereotypeMethodElement method, StereotypeClassElement clazz) {
+	private String getMethodLabel(IJavaProject project, StereotypeMethodElement method, StereotypeClassElement clazz) {
 		// TODO: special treatment for methods that have specific index elements with specific labels (e.g. mapping methods)
-		return method.getMethodLabel();
+		
+		Optional<RequestMappingIndexElement> mapping = springIndex.getNodesOfType(project.getElementName(), RequestMappingIndexElement.class).stream()
+			.filter(mappingElement -> mappingElement.getMethodSignature() != null && mappingElement.getMethodSignature().equals(method.getMethodSignature()))
+			.findAny();
+		
+		if (mapping.isPresent()) {
+			return mapping.get().getDocumentSymbol().getName();
+		}
+		else {
+			return method.getMethodLabel();
+		}
+		
 	}
 
 	public StereotypePackageElement identifyMainApplicationPackage(IJavaProject project, SpringMetamodelIndex springIndex) {

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingIndexElement.java

@@ -13,8 +13,16 @@
 import org.eclipse.lsp4j.Range;
 
 public class RequestMappingIndexElement extends WebEndpointIndexElement {
+	
+	private String methodSignature;
 
-	public RequestMappingIndexElement(String path, String[] httpMethods, String[] contentTypes, String[] acceptTypes, Range range, String symbolLabel) {
+	public RequestMappingIndexElement(String path, String[] httpMethods, String[] contentTypes, String[] acceptTypes, Range range, String symbolLabel, String methodSignature) {
 		super(path, httpMethods, contentTypes, acceptTypes, range, symbolLabel);
+		this.methodSignature = methodSignature;
 	}
+	
+	public String getMethodSignature() {
+		return methodSignature;
+	}
+
 }

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingIndexer.java

@@ -87,6 +87,8 @@ public static void indexRequestMapping(Bean controller, Annotation node, SpringI
 
 		if (node.getParent() instanceof MethodDeclaration) {
 			try {
+				String methodSignature = ASTUtils.getMethodSignature((MethodDeclaration) node.getParent(), true);
+				
 				Location location = new Location(doc.getUri(), doc.toRange(node.getStartPosition(), node.getLength()));
 				String[] path = getPath(node, context);
 				String[] parentPath = getParentPath(node, context);
@@ -105,7 +107,7 @@ public static void indexRequestMapping(Bean controller, Annotation node, SpringI
 							WorkspaceSymbol symbol = RouteUtils.createRouteSymbol(location, p, methods, contentTypes, acceptTypes);
 
 							// index element for request mapping
-							RequestMappingIndexElement requestMappingIndexElement = new RequestMappingIndexElement(p, methods, contentTypes, acceptTypes, location.getRange(), symbol.getName());
+							RequestMappingIndexElement requestMappingIndexElement = new RequestMappingIndexElement(p, methods, contentTypes, acceptTypes, location.getRange(), symbol.getName(), methodSignature);
 							controller.addChild(requestMappingIndexElement);
 						});
 

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxHandlerMethodIndexElement.java

@@ -19,7 +19,7 @@ public class WebfluxHandlerMethodIndexElement extends RequestMappingIndexElement
 
 	public WebfluxHandlerMethodIndexElement(String handlerClass, String handlerMethod, String path, String[] httpMethods, String[] contentTypes, String[] acceptTypes,
 			Range range, String symbolLabel) {
-		super(path, httpMethods, contentTypes, acceptTypes, range, symbolLabel);
+		super(path, httpMethods, contentTypes, acceptTypes, range, symbolLabel, null);
 
 		this.handlerClass = handlerClass;
 		this.handlerMethod = handlerMethod;

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java

@@ -94,7 +94,7 @@ public class SpringIndexerJava implements SpringIndexer {
 
 	// whenever the implementation of the indexer changes in a way that the stored data in the cache is no longer valid,
 	// we need to change the generation - this will result in a re-indexing due to no up-to-date cache data being found
-	private static final String GENERATION = "GEN-24";
+	private static final String GENERATION = "GEN-25";
 	private static final String INDEX_FILES_TASK_ID = "index-java-source-files-task-";
 
 	private static final String SYMBOL_KEY = "symbols";