refresh modulith metadata before creating the project structure tree (in case of a full refresh)

Author: martinlippert

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

@@ -10,13 +10,18 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.commands;
 
+import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 
 import org.jmolecules.stereotype.catalog.support.AbstractStereotypeCatalog;
 import org.jmolecules.stereotype.tooling.HierarchicalNodeHandler;
 import org.jmolecules.stereotype.tooling.ProjectTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ide.vscode.boot.java.commands.ApplicationModulesStructureProvider.SimpleApplicationModulesStructureProvider;
 import org.springframework.ide.vscode.boot.java.commands.JsonNodeHandler.Node;
 import org.springframework.ide.vscode.boot.java.links.SourceLinks;
@@ -27,6 +32,8 @@
 
 public class ModulithStructureView {
 
+	private static final Logger log = LoggerFactory.getLogger(ModulithStructureView.class);
+
 	private final AbstractStereotypeCatalog catalog;
 	private final CachedSpringMetamodelIndex springIndex;
 	private final ModulithService modulithService;
@@ -39,10 +46,21 @@ public ModulithStructureView(AbstractStereotypeCatalog catalog, CachedSpringMeta
 		this.modulithService = modulithService;
 	}
 
-	public Node createTree(IJavaProject project, IndexBasedStereotypeFactory factory, Collection<String> selectedGroups) {
+	public Node createTree(IJavaProject project, IndexBasedStereotypeFactory factory, Collection<String> selectedGroups, boolean updateMetadata) {
 
 		var adapter = new ModulithStereotypeFactoryAdapter(factory);
 
+		if (updateMetadata) {
+			log.info("update modulith metadata when reloading structure view for project: " + project.getElementName());
+
+			CompletableFuture<Boolean> requestMetadata = modulithService.requestMetadata(project, Duration.ofMinutes(0));
+			try {
+				requestMetadata.get(5, TimeUnit.SECONDS);
+			} catch (Exception e) {
+				log.error("update modulith metadata when reloading structure view failed for project: " + project.getElementName(), e);
+			}
+		}
+
 		AppModules modulesData = modulithService.getModulesData(project);
 		if (modulesData == null) {
 			// TODO; logging

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

@@ -115,7 +115,7 @@ private Node nodeFrom(IJavaProject project, CachedSpringMetamodelIndex springInd
 		}
 
 		if (ModulithService.isModulithDependentProject(project) && StructureViewUtil.hasModulithStructureViewEnabled()) {
-			return new ModulithStructureView(catalog, springIndex, sourceLinks, modulithService).createTree(project, factory, selectedGroups);
+			return new ModulithStructureView(catalog, springIndex, sourceLinks, modulithService).createTree(project, factory, selectedGroups, updateMetadata);
 		}
 		else {
 			return new JMoleculesStructureView(catalog, springIndex, sourceLinks).createTree(project, factory, selectedGroups);

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

@@ -247,7 +247,7 @@ private CompletableFuture<Boolean> refreshMetadata(IJavaProject project) {
 			server.getClient().showMessage(new MessageParams(MessageType.Error, "Project '" + project.getElementName() + "' output folder does not contain any '.class' files. Consider re-building."));
 			return CompletableFuture.completedFuture(false);
 		}
-		clearMetadataRequest(project);
+		
 		return requestMetadata(project, Duration.ZERO).whenComplete((refreshed, throwable) -> {
 			if (throwable != null) {
 				server.getClient().showMessage(new MessageParams(MessageType.Error, "Project '" + project.getElementName() + "' Modulith metadata refresh has failed. " + throwable.getMessage()));
@@ -261,7 +261,7 @@ private CompletableFuture<Boolean> refreshMetadata(IJavaProject project) {
 		});
 	}
 
-	CompletableFuture<Boolean> requestMetadata(IJavaProject p, Duration delay) {
+	public CompletableFuture<Boolean> requestMetadata(IJavaProject p, Duration delay) {
 		clearMetadataRequest(p);
 		CompletableFuture<Boolean> f = loadModulesMetadata(p, delay).thenApply(appModules -> updateAppModulesCache(p, appModules));
 		metadataRequested.put(p.getLocationUri(), f);