Consolidate temporary customization flags in StructureViewUtils.

Author: odrotbohm

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

@@ -64,7 +64,7 @@ public String getTypeLabel(StereotypeClassElement type) {
 				.map(it -> StructureViewUtil.abbreviate(it, type))
 				.orElseGet(type::getType);
 
-		return "true".equals(System.getProperty("disable-named-interfaces"))
+		return !StructureViewUtil.hasNamedInterfaceNodesEnabled()
 				? result + modules.getModuleByType(type)
 						.filter(it -> it.isExposed(type.getType()))
 						.map(__ -> " (API)")

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

@@ -48,8 +48,6 @@ public Node createTree(IJavaProject project, IndexBasedStereotypeFactory factory
 		ApplicationModules modules = new ApplicationModules(modulesData);
 
 		var labelProvider = new ApplicationModulesLabelProvider(catalog, project, springIndex, modules);
-		
-		
 
 		// json output
 		BiConsumer<Node, NamedInterfaceNode> consumer = (node, c) -> {
@@ -64,13 +62,14 @@ public Node createTree(IJavaProject project, IndexBasedStereotypeFactory factory
 		// TODO: in the future, we need to trim this grouper arrays down to what is selected on the UI
 		var jsonTree = new ProjectTree<>(adapter, catalog, jsonHandler);
 
-		if ("true".equals(System.getProperty("disable-named-interfaces"))) {
-			jsonTree = jsonTree.withStructureProvider(new SimpleApplicationModulesStructureProvider(project, springIndex));
-		} else {
+		if (StructureViewUtil.hasNamedInterfaceNodesEnabled()) {
 			jsonTree = jsonTree.withStructureProvider(new ApplicationModulesNamedInterfacesGroupingProvider(modules, project, springIndex));
+		} else {
+			jsonTree = jsonTree.withStructureProvider(new SimpleApplicationModulesStructureProvider(project, springIndex));
 		}
 
 		List<String[]> groupers = StructureViewUtil.identifyGroupers(catalog, selectedGroups);
+
 		for (String[] grouper : groupers) {
 			jsonTree = jsonTree.withGrouper(grouper);
 		}

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

@@ -85,15 +85,15 @@ private Node nodeFrom(IJavaProject project, CachedSpringMetamodelIndex springInd
 		var catalog = stereotypeCatalogRegistry.getCatalogOf(project);
 		var factory = new IndexBasedStereotypeFactory(catalog, project, springIndex);
 
-		if (System.getProperty("enable-source-defined-stereotypes") != null) {
+		if (StructureViewUtil.hasSourceDefinedStereotypesEnabled()) {
 			factory.registerStereotypeDefinitions();
 		}
 
 		if (selectedGroups == null) {
 			selectedGroups = catalog.getGroups().stream().map(group -> group.getIdentifier()).toList();
 		}
 
-		if (ModulithService.isModulithDependentProject(project) && System.getProperty("disable-modulith-structure-view") == null) {
+		if (ModulithService.isModulithDependentProject(project) && StructureViewUtil.hasModulithStructureViewEnabled()) {
 			return new ModulithStructureView(catalog, springIndex, modulithService).createTree(project, factory, selectedGroups);
 		}
 		else {

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

@@ -131,6 +131,18 @@ public static StereotypePackageElement findPackageNode(String packageName, IJava
 		StereotypePackageElement packageElement = springIndex.findPackageNode(packageName, project.getElementName());
 		return packageElement != null ? packageElement : new StereotypePackageElement(packageName, null);
 	}
+	
+	public static boolean hasSourceDefinedStereotypesEnabled() {
+		return System.getProperty("disable-source-defined-stereotypes") == null;
+	}
+	
+	public static boolean hasModulithStructureViewEnabled() {
+		return System.getProperty("disable-modulith-structure-view") == null;
+	}
+	
+	public static boolean hasNamedInterfaceNodesEnabled() {
+		return System.getProperty("enable-named-interface-nodes") != null;
+	}
 
 	private static final List<String> EXCLUSIONS = List.of("Application", "Properties", "Mappings", "Hints");