GH-1829: take all seterotype annotations into account when looking up bean name for dependson completion

Author: martinlippert

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

@@ -30,6 +30,8 @@ public class Annotations {
 
 	public static final String COMPONENT = "org.springframework.stereotype.Component";
 	public static final String CONTROLLER = "org.springframework.stereotype.Controller";
+	public static final String SERVICE = "org.springframework.stereotype.Service";
+	public static final String REPOSITORY = "org.springframework.stereotype.Repository";
 
 	public static final String SCOPE = "org.springframework.context.annotation.Scope";
 	public static final String DEPENDS_ON = "org.springframework.context.annotation.DependsOn";
@@ -179,7 +181,6 @@ public class Annotations {
 
 	// Data
 
-	public static final String REPOSITORY = "org.springframework.stereotype.Repository";
 	public static final String REPOSITORY_DEFINITION = "org.springframework.data.repository.RepositoryDefinition";
 	public static final String NO_REPO_BEAN = "org.springframework.data.repository.NoRepositoryBean";
 	public static final String SPRING_ENTITY_ID = "org.springframework.data.annotation.Id";

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

@@ -56,6 +56,8 @@ public class BeanUtils {
 	private static final Set<String> ANNOTATIONS_THAT_DEFINE_NAME_OF_BEAN_AS_VALUE = Set.of(
 			Annotations.COMPONENT,
 			Annotations.CONFIGURATION,
+			Annotations.SERVICE,
+			Annotations.REPOSITORY,
 			Annotations.CONTROLLER,
 			Annotations.REST_CONTROLLER,
 			Annotations.NAMED_JAKARTA,
@@ -111,7 +113,7 @@ public static List<String> getBeanNamesFromType(AbstractTypeDeclaration type, Li
 		if (annotationMetadata != null) {
 			for (AnnotationMetadata annotation : annotationMetadata) {
 
-				if (ANNOTATIONS_THAT_DEFINE_NAME_OF_BEAN_AS_VALUE.contains(annotation.getAnnotationType())) {
+				if (isComponentNamingAnnotation(annotation.getAnnotationType())) {
 					Map<String, AnnotationAttributeValue[]> attributes = annotation.getAttributes();
 					if (attributes != null) {
 						AnnotationAttributeValue[] values = attributes.get("value");
@@ -144,22 +146,26 @@ public static String getBeanNameFromType(AbstractTypeDeclaration type, List<Anno
 		}
 	}
 
+	/**
+	 * Returns true if the given type of an annotation is one of the annotations that
+	 * can define the name of the bean via the default valule attribute (used to infer the bean
+	 * name)
+	 */
+	public static boolean isComponentNamingAnnotation(String annotationFqName) {
+		return ANNOTATIONS_THAT_DEFINE_NAME_OF_BEAN_AS_VALUE.contains(annotationFqName);
+	}
+
 	public static String getBeanNameFromComponentAnnotation(Annotation annotation, AbstractTypeDeclaration type) {
 
 		// try to extract name from annotation attribute
 		IAnnotationBinding binding = annotation.resolveAnnotationBinding();
 		if (binding != null) {
 			ITypeBinding annotationType = binding.getAnnotationType();
-			if (annotationType != null) {
-				if (Annotations.COMPONENT.equals(annotationType.getQualifiedName())
-						|| Annotations.CONFIGURATION.equals(annotationType.getQualifiedName())
-						|| Annotations.NAMED_JAKARTA.equals(annotationType.getQualifiedName())
-						|| Annotations.NAMED_JAVAX.equals(annotationType.getQualifiedName())) {
-
-					Optional<Expression> attribute = ASTUtils.getAttribute(annotation, "value");
-					if (attribute.isPresent()) {
-						return ASTUtils.getExpressionValueAsString(attribute.get(), (a) -> {});
-					}
+			if (annotationType != null && isComponentNamingAnnotation(annotationType.getQualifiedName())) {
+
+				Optional<Expression> attribute = ASTUtils.getAttribute(annotation, "value");
+				if (attribute.isPresent()) {
+					return ASTUtils.getExpressionValueAsString(attribute.get(), (a) -> {});
 				}
 			}
 		}

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024, 2025 Broadcom
+ * Copyright (c) 2024, 2026 Broadcom
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,10 +17,10 @@
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Annotation;
+import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
-import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
@@ -60,8 +60,20 @@ private Collection<String> getBeanNameFromSourceCodePosition(ASTNode node) {
 			return BeanUtils.getBeanNamesFromBeanAnnotation(beanAnnotation);
 		}
 		else if (parent instanceof TypeDeclaration type) {
-			Annotation componentAnnotation = ASTUtils.getAnnotation(type, Annotations.COMPONENT);
-			return List.of(BeanUtils.getBeanNameFromComponentAnnotation(componentAnnotation, type));
+			Collection<Annotation> annotations = ASTUtils.getAnnotations(type);
+			List<String> beanNames = annotations.stream()
+					.filter(annotation -> {
+						ITypeBinding typeBinding = annotation.resolveTypeBinding();
+						return typeBinding != null && BeanUtils.isComponentNamingAnnotation(typeBinding.getQualifiedName());
+					})
+					.map(annotation -> BeanUtils.getBeanNameFromComponentAnnotation(annotation, type))
+					.toList();
+			
+			if (beanNames.size() > 0) {
+				return beanNames;
+			} else {
+				return List.of(BeanUtils.getBeanNameFromType(type.getName().toString()));
+			}
 		}
 
 		return List.of();

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024, 2025 Broadcom
+ * Copyright (c) 2024, 2026 Broadcom
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at