create type and package nodes for package-info declarations

Author: martinlippert

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

@@ -26,6 +26,7 @@
 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.Name;
 import org.eclipse.jdt.core.dom.PackageDeclaration;
 import org.eclipse.jdt.core.dom.RecordDeclaration;
 import org.eclipse.jdt.core.dom.SimpleName;
@@ -83,6 +84,15 @@ public void addSymbols(RecordDeclaration recordDeclaration, SpringIndexerJavaCon
 
 	@Override
 	public void addSymbols(PackageDeclaration packageDeclaration, SpringIndexerJavaContext context, TextDocument doc) {
+		try {
+			createStereotypeElementForPackage(packageDeclaration, context, doc);
+		}
+		catch (BadLocationException e) {
+			log.error("error identifying location of type declaration", e);
+		}
+	}
+	
+	private void createStereotypeElementForPackage(PackageDeclaration packageDeclaration, SpringIndexerJavaContext context, TextDocument doc) throws BadLocationException {
 		if (!context.getDocURI().endsWith("package-info.java")) {
 			return;
 		}
@@ -103,6 +113,11 @@ public void addSymbols(PackageDeclaration packageDeclaration, SpringIndexerJavaC
 
 		StereotypePackageElement packageElement = new StereotypePackageElement(packageBinding.getName(), annotationTypes);
 		context.getBeans().add(new CachedBean(context.getDocURI(), packageElement));
+		
+		Name astNodeForLocation = packageDeclaration.getName();
+		Location location = new Location(doc.getUri(), doc.toRange(astNodeForLocation.getStartPosition(), astNodeForLocation.getLength()));
+		StereotypeClassElement classElement = new StereotypeClassElement(packageBinding.getName() + ".package-info", location, Set.of(), annotationTypes);
+		context.getBeans().add(new CachedBean(context.getDocURI(), classElement));
 	}
 
 	@Override

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-25";
+	private static final String GENERATION = "GEN-26";
 	private static final String INDEX_FILES_TASK_ID = "index-java-source-files-task-";
 
 	private static final String SYMBOL_KEY = "symbols";

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

@@ -91,8 +91,33 @@ void testOverallExistenceOfTypeElements() throws Exception {
 
     @Test
     void testPackageElement() throws Exception {
+    	// check package elements for package-info
     	List<StereotypePackageElement> packages = springIndex.getNodesOfType(StereotypePackageElement.class);
     	assertEquals(2, packages.size()); // package nodes are created for package declarations in package-info.java files only
+    	
+    	StereotypePackageElement packageElement1 = packages.stream().filter(packageElement -> packageElement.getPackageName().equals(("example"))).findFirst().get();
+    	StereotypePackageElement packageElement2 = packages.stream().filter(packageElement -> packageElement.getPackageName().equals(("example.application"))).findFirst().get();
+    	
+    	List<String> annotationTypes1 = packageElement1.getAnnotationTypes();
+    	assertEquals(1, annotationTypes1.size());
+    	assertEquals("org.jmolecules.architecture.hexagonal.Port", annotationTypes1.get(0));
+    	
+    	List<String> annotationTypes2 = packageElement2.getAnnotationTypes();
+    	assertEquals(1, annotationTypes2.size());
+    	assertEquals("org.jmolecules.architecture.hexagonal.Application", annotationTypes2.get(0));
+    	
+    	// check type elements for package-info
+    	List<StereotypeClassElement> packagesTypeElements = springIndex.getNodesOfType(StereotypeClassElement.class);
+    	StereotypeClassElement packageClassElement1 = packagesTypeElements.stream().filter(packageType -> packageType.getType().equals(("example.package-info"))).findFirst().get();
+    	StereotypeClassElement packageClassElement2 = packagesTypeElements.stream().filter(packageType -> packageType.getType().equals(("example.application.package-info"))).findFirst().get();
+    	
+    	List<String> packageTypeAnnotations1 = packageClassElement1.getAnnotationTypes();
+    	assertEquals(1, packageTypeAnnotations1.size());
+    	assertEquals("org.jmolecules.architecture.hexagonal.Port", packageTypeAnnotations1.get(0));
+
+    	List<String> packageTypeAnnotations2 = packageClassElement2.getAnnotationTypes();
+    	assertEquals(1, packageTypeAnnotations2.size());
+    	assertEquals("org.jmolecules.architecture.hexagonal.Application", packageTypeAnnotations2.get(0));
     }
 
     @Test