refactored and unified json handler for structural view

Author: martinlippert

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

@@ -18,6 +18,7 @@
 import org.jmolecules.stereotype.tooling.ProjectTree;
 import org.jmolecules.stereotype.tooling.SimpleLabelProvider;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.commands.JsonNodeHandler.Node;
 import org.springframework.ide.vscode.boot.java.stereotypes.IndexBasedStereotypeFactory;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeClassElement;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeMethodElement;
@@ -53,11 +54,11 @@ public Node createTree(IJavaProject project) {
 		// json output
 		BiConsumer<Node, Object> consumer = (node, c) -> {
 			node.withAttribute(HierarchicalNodeHandler.TEXT, labelProvider.getCustomLabel(c))
-			 .withAttribute(ToolsJsonNodeHandler.ICON, "fa-named-interface");
+			 .withAttribute(JsonNodeHandler.ICON, "fa-named-interface");
 		};
 
 		// create json nodes to display the structure in a nice way
-		var jsonHandler = new ToolsJsonNodeHandler(labelProvider, consumer);
+		var jsonHandler = new JsonNodeHandler<StereotypePackageElement, Object>(labelProvider, consumer);
 
 		// create the project tree and apply all the groupers from the project
 		// TODO: in the future, we need to trim this grouper arrays down to what is selected on the UI

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/commands/ApplicationModulesJsonNodeHandler.java renamed to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/commands/JsonNodeHandler.java

@@ -16,6 +16,10 @@
 
 package org.springframework.ide.vscode.boot.java.commands;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -35,18 +39,19 @@
  * @author Oliver Drotbohm
  * @author Martin Lippert
  */
-public class ApplicationModulesJsonNodeHandler implements NodeHandler<ApplicationModules, StereotypePackageElement, StereotypeClassElement, StereotypeMethodElement, NamedInterfaceNode> {
+public class JsonNodeHandler<A, C> implements NodeHandler<A, StereotypePackageElement, StereotypeClassElement, StereotypeMethodElement, C> {
 
 	private static final String LOCATION = "location";
-	static final String ICON = "icon";
-	static final String TEXT = "text";
+	
+	public static final String ICON = "icon";
+	public static final String TEXT = "text";
 
 	private final Node root;
-	private final LabelProvider<ApplicationModules, StereotypePackageElement, StereotypeClassElement, StereotypeMethodElement, NamedInterfaceNode> labels;
-	private final BiConsumer<Node, NamedInterfaceNode> customHandler;
+	private final LabelProvider<A, StereotypePackageElement, StereotypeClassElement, StereotypeMethodElement, C> labels;
+	private final BiConsumer<Node, C> customHandler;
 	private Node current;
 
-	public ApplicationModulesJsonNodeHandler(LabelProvider<ApplicationModules, StereotypePackageElement, StereotypeClassElement, StereotypeMethodElement, NamedInterfaceNode> labels, BiConsumer<Node, NamedInterfaceNode> customHandler) {
+	public JsonNodeHandler(LabelProvider<A, StereotypePackageElement, StereotypeClassElement, StereotypeMethodElement, C> labels, BiConsumer<Node, C> customHandler) {
 		this.labels = labels;
 		this.root = new Node(null);
 		this.customHandler = customHandler;
@@ -62,7 +67,7 @@ public void handleStereotype(Stereotype stereotype, NodeContext context) {
 	}
 
 	@Override
-	public void handleApplication(ApplicationModules application) {
+	public void handleApplication(A application) {
 		this.root
 			.withAttribute(TEXT, labels.getApplicationLabel(application))
 			.withAttribute(ICON, StereotypeIcons.getIcon(StereotypeIcons.APPLICATION_KEY))
@@ -97,7 +102,7 @@ public void handleMethod(StereotypeMethodElement method, MethodNodeContext<Stere
 	}
 
 	@Override
-	public void handleCustom(NamedInterfaceNode custom, NodeContext context) {
+	public void handleCustom(C custom, NodeContext context) {
 		addChild(node -> customHandler.accept(node, custom));
 	}
 
@@ -133,5 +138,24 @@ public String toString() {
 	Node getRoot() {
 		return root;
 	}
+	
+	public static class Node {
+
+		transient final Node parent;
+		final Map<String, Object> attributes;
+		final List<Node> children;
+
+		Node(Node parent) {
+			this.parent = parent;
+			this.attributes = new LinkedHashMap<>();
+			this.children = new ArrayList<>();
+		}
+
+		public Node withAttribute(String key, Object value) {
+			this.attributes.put(key, value);
+			return this;
+		}
+	}
+
 
 }

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

@@ -17,6 +17,7 @@
 import org.jmolecules.stereotype.tooling.HierarchicalNodeHandler;
 import org.jmolecules.stereotype.tooling.ProjectTree;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.commands.JsonNodeHandler.Node;
 import org.springframework.ide.vscode.boot.java.stereotypes.IndexBasedStereotypeFactory;
 import org.springframework.ide.vscode.boot.modulith.AppModules;
 import org.springframework.ide.vscode.boot.modulith.ModulithService;
@@ -54,11 +55,11 @@ public Node createTree(IJavaProject project) {
 		// json output
 		BiConsumer<Node, NamedInterfaceNode> consumer = (node, c) -> {
 			node.withAttribute(HierarchicalNodeHandler.TEXT, labelProvider.getCustomLabel(c))
-			.withAttribute(ToolsJsonNodeHandler.ICON, "fa-named-interface");
+			.withAttribute(JsonNodeHandler.ICON, "fa-named-interface");
 		};
 
 		// create json nodes to display the structure in a nice way
-		var jsonHandler = new ApplicationModulesJsonNodeHandler(labelProvider, consumer);
+		var jsonHandler = new JsonNodeHandler<ApplicationModules, NamedInterfaceNode>(labelProvider, consumer);
 
 		// create the project tree and apply all the groupers from the project
 		// TODO: in the future, we need to trim this grouper arrays down to what is selected on the UI

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

@@ -16,6 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
+import org.springframework.ide.vscode.boot.java.commands.JsonNodeHandler.Node;
 import org.springframework.ide.vscode.boot.java.stereotypes.StereotypeCatalogRegistry;
 import org.springframework.ide.vscode.boot.modulith.ModulithService;
 import org.springframework.ide.vscode.commons.java.IJavaProject;

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

@@ -43,9 +43,9 @@
 import org.springframework.ide.vscode.boot.bootiful.SymbolProviderTestConf;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
-import org.springframework.ide.vscode.boot.java.commands.Node;
+import org.springframework.ide.vscode.boot.java.commands.JsonNodeHandler;
+import org.springframework.ide.vscode.boot.java.commands.JsonNodeHandler.Node;
 import org.springframework.ide.vscode.boot.java.commands.StructureViewUtil;
-import org.springframework.ide.vscode.boot.java.commands.ToolsJsonNodeHandler;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
@@ -359,7 +359,7 @@ public Collection<StereotypeClassElement> extractTypes(StereotypePackageElement
 			 .withAttribute("icon", "fa-named-interface");
 		};
 
-		var jsonHandler = new ToolsJsonNodeHandler(labels, consumer);
+		var jsonHandler = new JsonNodeHandler<StereotypePackageElement, Object>(labels, consumer);
 
 		var jsonTree = new ProjectTree<>(factory, catalog, jsonHandler)
 				.withStructureProvider(structureProvider)