support record types when indexing nodes for stereotypes

martinlippert · martinlippert · commit ec4920dfa802 · 2025-08-22T13:36:18.000+02:00
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java
@@ -16,6 +16,7 @@
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.PackageDeclaration;
+import org.eclipse.jdt.core.dom.RecordDeclaration;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.springframework.ide.vscode.boot.java.utils.SpringIndexerJavaContext;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
@@ -28,6 +29,7 @@ public interface SymbolProvider {
 
 	default void addSymbols(Annotation node, ITypeBinding typeBinding, Collection<ITypeBinding> metaAnnotations, SpringIndexerJavaContext context, TextDocument doc) {};
 	default void addSymbols(TypeDeclaration typeDeclaration, SpringIndexerJavaContext context, TextDocument doc) {};
+	default void addSymbols(RecordDeclaration typeDeclaration, SpringIndexerJavaContext context, TextDocument doc) {};
 	default void addSymbols(MethodDeclaration methodDeclaration, SpringIndexerJavaContext context, TextDocument doc) {};
 	default void addSymbols(PackageDeclaration packageDeclaration, SpringIndexerJavaContext context, TextDocument doc) {};
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/stereotypes/StereotypesIndexer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/stereotypes/StereotypesIndexer.java
@@ -19,13 +19,15 @@
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
 import org.eclipse.jdt.core.dom.IAnnotationBinding;
 import org.eclipse.jdt.core.dom.IPackageBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.PackageDeclaration;
+import org.eclipse.jdt.core.dom.RecordDeclaration;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.lsp4j.Location;
@@ -74,6 +76,16 @@ public void addSymbols(MethodDeclaration methodDeclaration, SpringIndexerJavaCon
 		// TODO
 	}
 	
+	@Override
+	public void addSymbols(RecordDeclaration recordDeclaration, SpringIndexerJavaContext context, TextDocument doc) {
+		try {
+			createStereotypeElementForType(recordDeclaration, context, doc);
+		}
+		catch (BadLocationException e) {
+			log.error("error identifying location of type declaration", e);
+		}
+	}
+	
 	@Override
 	public void addSymbols(PackageDeclaration packageDeclaration, SpringIndexerJavaContext context, TextDocument doc) {
 		if (!context.getDocURI().endsWith("package-info.java")) {
@@ -108,14 +120,14 @@ public void addSymbols(TypeDeclaration typeDeclaration, SpringIndexerJavaContext
 		}
 	}
 	
-	private void createStereotypeElementForType(TypeDeclaration typeDeclaration, SpringIndexerJavaContext context, TextDocument doc) throws BadLocationException {
+	private void createStereotypeElementForType(AbstractTypeDeclaration typeDeclaration, SpringIndexerJavaContext context, TextDocument doc) throws BadLocationException {
 		ITypeBinding typeBinding = typeDeclaration.resolveBinding();
 		if (typeBinding == null) {
 			return;
 		}
 		
 		// identify stereotype definitions themselves
-		if (typeDeclaration.isInterface()) {
+		if (typeDeclaration instanceof TypeDeclaration && ((TypeDeclaration) typeDeclaration).isInterface()) {
 			Collection<Annotation> annotations = ASTUtils.getAnnotations(typeDeclaration);
 			boolean isStereotypeAnnotated = annotations.stream()
 				.anyMatch(annotation -> annotation.resolveTypeBinding().getQualifiedName().equals(Annotations.JMOLECULES_STEREOTYPE));
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
@@ -47,6 +47,7 @@
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.NormalAnnotation;
 import org.eclipse.jdt.core.dom.PackageDeclaration;
+import org.eclipse.jdt.core.dom.RecordDeclaration;
 import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.lsp4j.Diagnostic;
@@ -751,6 +752,22 @@ public boolean visit(TypeDeclaration node) {
 					return super.visit(node);
 				}
 	
+				@Override
+				public boolean visit(RecordDeclaration node) {
+					try {
+						context.addScannedType(node.resolveBinding());
+						extractSymbolInformation(node, context);
+					}
+					catch (RequiredCompleteAstException e) {
+						throw e;
+					}
+					catch (Exception e) {
+						log.error("error extracting symbol information in project '" + context.getProject().getElementName() + "' - for docURI '" + context.getDocURI() + "' - on node: " + node.toString(), e);
+					}
+					
+					return super.visit(node);
+				}
+	
 				@Override
 				public boolean visit(MethodDeclaration node) {
 					try {
@@ -898,6 +915,16 @@ private void extractSymbolInformation(TypeDeclaration typeDeclaration, final Spr
 		}
 	}
 
+	private void extractSymbolInformation(RecordDeclaration typeDeclaration, final SpringIndexerJavaContext context) throws Exception {
+		Collection<SymbolProvider> providers = symbolProviders.getAll();
+		if (!providers.isEmpty()) {
+			TextDocument doc = DocumentUtils.getTempTextDocument(context.getDocURI(), context.getDocRef(), context.getContent());
+			for (SymbolProvider provider : providers) {
+				provider.addSymbols(typeDeclaration, context, doc);
+			}
+		}
+	}
+
 	private void extractSymbolInformation(MethodDeclaration methodDeclaration, final SpringIndexerJavaContext context) throws Exception {
 		Collection<SymbolProvider> providers = symbolProviders.getAll();
 		if (!providers.isEmpty()) {
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/stereotypes/StereotypesIndexerTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/stereotypes/StereotypesIndexerTest.java
@@ -108,6 +108,27 @@ void testInnerClassElements() throws Exception {
     	assertTrue(list.contains("example.application.TypeWithInnerClass$InnerClass$InnerClassInInnerClass"));
     }
     
+    @Test
+    void testInnerRecordElements() throws Exception {
+    	List<StereotypeClassElement> stereotypeNodes = springIndex.getNodesOfType(StereotypeClassElement.class);
+    	
+    	List<String> list = stereotypeNodes.stream()
+    		.filter(node -> node.getType().startsWith("example.application.ClassWithInnerRecordImplementingInterface"))
+    		.map(node -> node.getType())
+    		.toList();
+    	
+    	assertEquals(2, list.size());
+    	assertTrue(list.contains("example.application.ClassWithInnerRecordImplementingInterface"));
+    	assertTrue(list.contains("example.application.ClassWithInnerRecordImplementingInterface$InnerRecord"));
+    	
+    	StereotypeClassElement recordElement = stereotypeNodes.stream()
+        		.filter(node -> node.getType().startsWith("example.application.ClassWithInnerRecordImplementingInterface$InnerRecord"))
+        		.findAny().get();
+    	
+    	assertNotNull(recordElement);
+    	assertTrue(recordElement.doesImplement("example.application.RandomInterface"));
+    }
+    
     @Test
     void testLocationInformationForTypeElement() throws Exception {
 		String docUri = directory.toPath().resolve("src/main/java/example/application/SampleController.java").toUri().toString();
diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-stereotypes-support/src/main/java/example/application/ClassWithInnerRecordImplementingInterface.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-stereotypes-support/src/main/java/example/application/ClassWithInnerRecordImplementingInterface.java
@@ -0,0 +1,9 @@
+package example.application;
+
+public class ClassWithInnerRecordImplementingInterface {
+	
+	public record InnerRecord(String someProp) implements RandomInterface {
+		
+	}
+
+}
diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-stereotypes-support/src/main/java/example/application/RandomInterface.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-stereotypes-support/src/main/java/example/application/RandomInterface.java
@@ -0,0 +1,5 @@
+package example.application;
+
+public interface RandomInterface {
+
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package example.application;
++
 +public interface RandomInterface {
++
 +}