include multiple names in bean label and eliminate duplicate meta annotations from it

Author: martinlippert

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

@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.beans;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -71,26 +72,27 @@ public static String createBeanLabel(List<AnnotationMetadata> annotations, Strin
 		symbolLabel.append('\'');
 
 		if (annotations != null) {
-			List<AnnotationMetadata> directAnnotations = annotations.stream()
+			List<String> directAnnotations = annotations.stream()
 					.filter(annotation -> ANNOTATIONS_TO_INCLUDE_IN_LABEL.contains(annotation.getAnnotationType()))
-					.filter(annotation -> !annotation.isMetaAnnotation()).toList();
+					.filter(annotation -> !annotation.isMetaAnnotation())
+					.map(annotation -> "@" + annotation.getAnnotationName())
+					.toList();
 
-			List<AnnotationMetadata> metaAnnotations = annotations.stream()
+			List<String> metaAnnotationNames = annotations.stream()
 					.filter(annotation -> ANNOTATIONS_TO_INCLUDE_IN_LABEL.contains(annotation.getAnnotationType()))
-					.filter(annotation -> annotation.isMetaAnnotation()).toList();
+					.filter(annotation -> annotation.isMetaAnnotation())
+					.map(annotation -> "@" + annotation.getAnnotationName())
+					.distinct()
+					.toList();
 
 			if (directAnnotations.size() > 0) {
 				symbolLabel.append(' ');
 				symbolLabel.append('(');
-				symbolLabel.append(String.join(", ", directAnnotations.stream()
-						.map(annotation -> "@" + annotation.getAnnotationName())
-						.toList()));
+				symbolLabel.append(String.join(", ", directAnnotations));
 
-				if (metaAnnotations.size() > 0) {
+				if (metaAnnotationNames.size() > 0) {
 					symbolLabel.append(" <: ");
-					symbolLabel.append(String.join(", ", metaAnnotations.stream()
-						.map(annotation -> "@" + annotation.getAnnotationName())
-						.toList()));
+					symbolLabel.append(String.join(", ", metaAnnotationNames));
 				}
 
 				symbolLabel.append(')');
@@ -102,7 +104,8 @@ public static String createBeanLabel(List<AnnotationMetadata> annotations, Strin
 		return symbolLabel.toString();
 	}
 
-	public static String getBeanNameFromType(AbstractTypeDeclaration type, List<AnnotationMetadata> annotationMetadata) {
+	public static List<String> getBeanNamesFromType(AbstractTypeDeclaration type, List<AnnotationMetadata> annotationMetadata) {
+		List<String> result = new ArrayList<>();
 
 		// annotation-defined names
 		if (annotationMetadata != null) {
@@ -112,17 +115,33 @@ public static String getBeanNameFromType(AbstractTypeDeclaration type, List<Anno
 					Map<String, AnnotationAttributeValue[]> attributes = annotation.getAttributes();
 					if (attributes != null) {
 						AnnotationAttributeValue[] values = attributes.get("value");
-						if (values != null && values.length > 0) {
-							return values[0].getName();
+						if (values != null) {
+							for (int i = 0; i < values.length; i++) {
+								result.add(values[i].getName());
+							}
 						}
 					}
 				}
 			}
 		}
 
 		// otherwise fall back to type name;
-		String beanType = type.getName().toString();
-		return BeanUtils.getBeanNameFromType(beanType);
+		if (result.size() == 0 && type.getName() != null) {
+			String beanType = type.getName().toString();
+			result.add(BeanUtils.getBeanNameFromType(beanType));
+		}
+		
+		return result;
+	}
+
+	public static String getBeanNameFromType(AbstractTypeDeclaration type, List<AnnotationMetadata> annotationMetadata) {
+		List<String> beanNames = getBeanNamesFromType(type, annotationMetadata);
+		if (beanNames.size() == 1) {
+			return beanNames.get(0);
+		}
+		else {
+			return "(" + String.join(", ", beanNames) + ")";
+		}
 	}
 
 	public static String getBeanNameFromComponentAnnotation(Annotation annotation, AbstractTypeDeclaration type) {

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java

@@ -233,5 +233,13 @@ void testCustomAnnotationClass() throws Exception {
                 SpringIndexerHarness.symbol("@AliasFor(annotation = Component.class)", "@AliasFor(annotation=Component.class)")
         );
     }
+    
+    @Test
+    void testScanControllerWithTwoNames() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/ControllerWithTwoNames.java").toUri().toString();
+        SpringIndexerHarness.assertDocumentSymbols(indexer, docUri,
+                SpringIndexerHarness.symbol("ControllerWithTwoNames", "@+ '(controllerName, configName)' (@Controller, @Configuration <: @Component) ControllerWithTwoNames")
+        );
+    }
 
 }

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/ControllerWithTwoNames.java

@@ -0,0 +1,9 @@
+package org.test;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Controller;
+
+@Controller("controllerName")
+@Configuration("configName")
+public class ControllerWithTwoNames {
+}