identify main package of spring boot application as the root for creating the structure tree

Author: martinlippert

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

@@ -13,6 +13,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
@@ -21,12 +22,14 @@
 import org.jmolecules.stereotype.tooling.SimpleLabelProvider;
 import org.jmolecules.stereotype.tooling.StructureProvider.SimpleStructureProvider;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.commands.ToolsJsonNodeHandler.Node;
 import org.springframework.ide.vscode.boot.java.stereotypes.IndexBasedStereotypeFactory;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeCatalogRegistry;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeClassElement;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeMethodElement;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypePackageElement;
+import org.springframework.ide.vscode.boot.modulith.ModulithService;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
@@ -85,9 +88,40 @@ public Collection<StereotypeClassElement> extractTypes(StereotypePackageElement
 				.withGrouper("org.jmolecules.architecture")
 				.withGrouper("org.jmolecules.ddd", "org.jmolecules.event", "spring", "jpa", "java");
 
-		jsonTree.process(new StereotypePackageElement(project.getElementName(), null));
+		jsonTree.process(identifyMainApplicationPackage(project, springIndex));
 
 		return jsonHandler.getRoot();
 	}
 
+	public StereotypePackageElement identifyMainApplicationPackage(IJavaProject project, SpringMetamodelIndex springIndex) {
+		List<StereotypeClassElement> classNodes = springIndex.getNodesOfType(project.getElementName(), StereotypeClassElement.class);
+		
+		StereotypePackageElement packageElement = classNodes.stream()
+			.filter(node -> node.getAnnotationTypes().contains(Annotations.BOOT_APP))
+			.map(node -> getPackage(node.getType()))
+			.map(packageName -> findPackageNode(packageName, project, springIndex))
+			.findFirst().get();
+		
+		return packageElement;
+	}
+	
+	private String getPackage(String fullyQualifiedClassName) {
+		return ModulithService.getPackageNameFromTypeFQName(fullyQualifiedClassName);
+	}
+	
+	private StereotypePackageElement findPackageNode(String packageName, IJavaProject project, SpringMetamodelIndex springIndex) {
+		List<StereotypePackageElement> packageNodes = springIndex.getNodesOfType(project.getElementName(), StereotypePackageElement.class);
+
+		Optional<StereotypePackageElement> found = packageNodes.stream()
+			.filter(packageNode -> packageNode.getPackageName().equals(packageName))
+			.findAny();
+		
+		if (found.isPresent()) {
+			return found.get();
+		}
+		else {
+			return new StereotypePackageElement(packageName, null);
+		}
+	}
+	
 }

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

@@ -41,6 +41,7 @@
 import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest;
 import org.springframework.ide.vscode.boot.bootiful.SymbolProviderTestConf;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.commands.SpringIndexCommands;
 import org.springframework.ide.vscode.boot.java.commands.ToolsJsonNodeHandler;
 import org.springframework.ide.vscode.boot.java.commands.ToolsJsonNodeHandler.Node;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -62,6 +63,7 @@ public class StereotypesIndexerTest {
 	@Autowired private SpringSymbolIndex indexer;
 	@Autowired private SpringMetamodelIndex springIndex;
 	@Autowired private StereotypeCatalogRegistry stereotypeCatalogRegistry;
+	@Autowired private SpringIndexCommands indexCommands;
 
 	private File directory;
 	private IJavaProject project;
@@ -80,7 +82,7 @@ public void setup() throws Exception {
 	}
 
     @Test
-    void testStuff() throws Exception {
+    void testOverallExistenceOfTypeElements() throws Exception {
     	List<StereotypeClassElement> stereotypeNodes = springIndex.getNodesOfType(StereotypeClassElement.class);
     	assertFalse(stereotypeNodes.isEmpty());
     }
@@ -110,6 +112,12 @@ void testLocationInformationForTypeElement() throws Exception {
     	assertEquals(7, location.getRange().getEnd().getLine());
     }
 
+    @Test
+    void testIdentifyMainApplicationPackage() throws Exception {
+    	StereotypePackageElement mainPackage = indexCommands.identifyMainApplicationPackage(project, springIndex);
+    	assertEquals("example.application", mainPackage.getPackageName());
+    }
+    
 	@Test
 	void testFromPackageIndexBasedFactory() {