GH-1812: avoid duplicate index elements and symbols for spring data repositories

Signed-off-by: Martin Lippert <martin.lippert@broadcom.com>

Author: martinlippert

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

@@ -101,11 +101,12 @@ public void addSymbols(TypeDeclaration typeDeclaration, SpringIndexerJavaContext
 				|| annotationHierarchies.isAnnotatedWith(typeDeclaration.resolveBinding(), Annotations.NAMED_JAKARTA)
 				|| annotationHierarchies.isAnnotatedWith(typeDeclaration.resolveBinding(), Annotations.NAMED_JAVAX);
 
-		// check for event listener implementations on classes that are not annotated with component, but created via bean methods (for example)
 		if (isComponment) {
 			indexComponent(typeDeclaration, context, context.getDoc());
 		}
 		else {
+			// check for event listener implementations on classes that are not annotated with component, but created via bean methods (for example)
+
 			indexEventListenerInterfaceImplementation(null, typeDeclaration, context, context.getDoc());
 			indexBeanRegistrarImplementation(null, typeDeclaration, context, context.getDoc());
 			indexBeanMethods(null, typeDeclaration, context, context.getDoc());
@@ -130,6 +131,12 @@ private void createSymbol(TypeDeclaration type, SpringIndexerJavaContext context
 		Location location = new Location(doc.getUri(), doc.toRange(nameNode.getStartPosition(), nameNode.getLength()));
 
 		boolean isConfiguration = annotationHierarchies.isAnnotatedWith(beanType, Annotations.CONFIGURATION);
+		boolean isRepository = annotationHierarchies.isAnnotatedWith(beanType, Annotations.REPOSITORY);
+		
+		// defer repository indexing to repository symbol provider
+		if (isRepository) {
+			return;
+		}
 
 		InjectionPoint[] injectionPoints = ASTUtils.findInjectionPoints(type, doc);
 		Set<String> supertypes = ASTUtils.findSupertypes(beanType);
@@ -212,7 +219,6 @@ private void createSymbol(RecordDeclaration record, Annotation node, ITypeBindin
 	}
 
 	private void createSymbol(AnnotationTypeDeclaration annotationDeclaration, SpringIndexerJavaContext context, TextDocument doc) {
-		
 		SpringBootApplicationIndexer.createIndexElement(annotationDeclaration, annotationDeclaration.resolveBinding(), context);
 	}
 

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

@@ -84,9 +84,25 @@ void testSimpleRepositoryElements() throws Exception {
         assertEquals("org.test.CustomerRepository", repoBean[0].getType());
 
         Bean[] matchingBeans = springIndex.getMatchingBeans("test-spring-data-symbols", "org.springframework.data.repository.CrudRepository");
-        assertEquals(5, matchingBeans.length);
+        assertEquals(6, matchingBeans.length);
         ArrayUtils.contains(matchingBeans, repoBean[0]);
     }
+    
+    @Test
+    void testRepositoryWithAdditionalRepositoryAnnotation() throws Exception {
+        String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepositoryWithAdditionalRepositoryAnnotation.java").toUri().toString();
+        
+        DocumentElement document = springIndex.getDocument(docUri);
+        List<Bean> children = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
+        assertEquals(1, children.size());
+        
+        Bean repositoryElement = children.get(0);
+        assertEquals("customerRepositoryWithAdditionalRepositoryAnnotation", repositoryElement.getName());
+        assertEquals(1, children.size());
+        
+        Bean[] repoBean = this.springIndex.getBeansWithName("test-spring-data-symbols", "customerRepositoryWithAdditionalRepositoryAnnotation");
+        assertEquals(1, repoBean.length);
+    }
 
     @Test
     void testSimpleQueryMethodElements() throws Exception {

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/CustomerRepositoryWithAdditionalRepositoryAnnotation.java

@@ -0,0 +1,15 @@
+package org.test;
+
+import java.util.List;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CustomerRepositoryWithAdditionalRepositoryAnnotation extends CrudRepository<Customer, Long> {
+
+    List<Customer> findByLastName(String lastName);
+    
+    default List<Customer> findByWhatever(String lastName) {return null;}
+    
+}