GH-1626: pressing reload button on structure view triggers now reload of stereotype metadata

Author: martinlippert

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

@@ -20,6 +20,8 @@
 import org.jmolecules.stereotype.tooling.LabelUtils;
 import org.jmolecules.stereotype.tooling.ProjectTree;
 import org.jmolecules.stereotype.tooling.SimpleLabelProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 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;
@@ -34,21 +36,37 @@
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 
+import com.google.gson.JsonPrimitive;
+
 public class SpringIndexCommands {
 
 	private static final String SPRING_STRUCTURE_CMD = "sts/spring-boot/structure";
+	private static final Logger log = LoggerFactory.getLogger(SpringIndexCommands.class);
 
 	private final SpringMetamodelIndex springIndex;
 
 	public SpringIndexCommands(SimpleLanguageServer server, SpringMetamodelIndex springIndex, JavaProjectFinder projectFinder, StereotypeCatalogRegistry stereotypeCatalogRegistry) {
 		this.springIndex = springIndex;
 
 		server.onCommand(SPRING_STRUCTURE_CMD, params -> server.getAsync().invoke(() -> {
-			return projectFinder.all().stream().map(project -> nodeFrom(stereotypeCatalogRegistry, springIndex, project)).filter(Objects::nonNull).collect(Collectors.toList());
+			boolean updateMetadata =
+					params.getArguments() != null
+					&& params.getArguments().size() == 1
+					&& params.getArguments().get(0) instanceof JsonPrimitive
+					? ((JsonPrimitive) params.getArguments().get(0)).getAsBoolean() : false;
+			
+			return projectFinder.all().stream().map(project -> nodeFrom(stereotypeCatalogRegistry, springIndex, project, updateMetadata)).filter(Objects::nonNull).collect(Collectors.toList());
 		}));
 	}
 
-	private Node nodeFrom(StereotypeCatalogRegistry stereotypeCatalogRegistry, SpringMetamodelIndex springIndex, IJavaProject project) {
+	private Node nodeFrom(StereotypeCatalogRegistry stereotypeCatalogRegistry, SpringMetamodelIndex springIndex, IJavaProject project, boolean updateMetadata) {
+		log.info("create structural view tree information for project: " + project.getElementName());
+		
+		if (updateMetadata) {
+			stereotypeCatalogRegistry.reset(project);
+			log.info("stereotype registry reset for project: " + project.getElementName());
+		}
+		
 		var catalog = stereotypeCatalogRegistry.getCatalogOf(project);
 		var factory = new IndexBasedStereotypeFactory(catalog, springIndex);
 		factory.registerStereotypeDefinitions();

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

@@ -34,4 +34,8 @@ private AbstractStereotypeCatalog createCatalog(IJavaProject project) {
 		return new JsonPathStereotypeCatalog(source);
 	}
 
+	public void reset(IJavaProject project) {
+		this.catalogs.remove(project.getElementName());
+	}
+
 }

vscode-extensions/vscode-spring-boot/lib/Main.ts

@@ -181,7 +181,7 @@ export function activate(context: ExtensionContext): Thenable<ExtensionAPI> {
         const structureManager = new StructureManager();
         const explorerTreeProvider = new ExplorerTreeProvider(structureManager);
         context.subscriptions.push(window.createTreeView('explorer.spring', { treeDataProvider: explorerTreeProvider, showCollapseAll: true }));
-        context.subscriptions.push(commands.registerCommand("vscode-spring-boot.structure.refresh", () => structureManager.refresh())); 
+        context.subscriptions.push(commands.registerCommand("vscode-spring-boot.structure.refresh", () => structureManager.refresh(true))); 
 
         context.subscriptions.push(commands.registerCommand('vscode-spring-boot.ls.start', () => client.start().then(() => {
             // Boot LS is fully started
@@ -213,7 +213,7 @@ export function activate(context: ExtensionContext): Thenable<ExtensionAPI> {
 
         const api = new ApiManager(client).api
 
-        context.subscriptions.push(api.getSpringIndex().onSpringIndexUpdated(e => structureManager.refresh()));
+        context.subscriptions.push(api.getSpringIndex().onSpringIndexUpdated(e => structureManager.refresh(false)));
 
         return api;
     });

vscode-extensions/vscode-spring-boot/lib/explorer/structure-tree-manager.ts

@@ -12,8 +12,8 @@ export class StructureManager {
         return this._rootElements;
     }
 
-    refresh(): void {
-        this._rootElements = commands.executeCommand(SPRING_STRUCTURE_CMD).then(json => {
+    refresh(updateMetadata: boolean): void {
+        this._rootElements = commands.executeCommand(SPRING_STRUCTURE_CMD, updateMetadata).then(json => {
             const nodes = this.parseArray(json);
             this._onDidChange.fire(undefined);
             return nodes;