[structure view] display specific label when there is no main application package identified

Author: martinlippert

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

@@ -58,7 +58,9 @@ private Node nodeFrom(StereotypeCatalogRegistry stereotypeCatalogRegistry, Sprin
 		var labelProvider = new SimpleLabelProvider<>(StereotypePackageElement::getPackageName, StereotypePackageElement::getPackageName, StereotypeClassElement::getType,
 				(StereotypeMethodElement m, StereotypeClassElement __) -> m.getMethodName(), Object::toString)
 				.withTypeLabel(it -> abbreviate(mainApplicationPackage, it))
-				.withMethodLabel((m, c) -> getMethodLabel(project, m, c));
+				.withMethodLabel((m, c) -> getMethodLabel(project, m, c))
+				.withPackageLabel((p) -> getPackageLabel(p))
+				.withApplicationLabel((p) -> getPackageLabel(p));
 
 		var structureProvider = new ToolsStructureProvider(springIndex, project);
 
@@ -80,6 +82,16 @@ private Node nodeFrom(StereotypeCatalogRegistry stereotypeCatalogRegistry, Sprin
 		return jsonHandler.getRoot();
 	}
 
+	private String getPackageLabel(StereotypePackageElement p) {
+		String packageName = p.getPackageName();
+		if (p.isMainPackage() && (packageName == null || packageName.isEmpty())) {
+			return "(no main application package identified)";
+		}
+		else {
+			return packageName;
+		}
+	}
+
 	private String abbreviate(StereotypePackageElement mainApplicationPackage, StereotypeClassElement it) {
 		if (mainApplicationPackage == null || mainApplicationPackage.getPackageName() == null || mainApplicationPackage.getPackageName().isBlank()) {
 			return it.getType();
@@ -115,10 +127,10 @@ public StereotypePackageElement identifyMainApplicationPackage(IJavaProject proj
 			.findFirst();
 
 		if (packageElement.isPresent()) {
-			return packageElement.get();
+			return new StereotypePackageElement(packageElement.get().getPackageName(), packageElement.get().getAnnotationTypes(), true);
 		}
 		else {
-			return new StereotypePackageElement("", null);
+			return new StereotypePackageElement("", null, true);
 		}
 	}
 

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

@@ -17,17 +17,27 @@
 public class StereotypePackageElement extends AbstractSpringIndexElement implements StereotypeAnnotatedElement {
 
 	private final String packageName;
+	private final boolean isMainPackage;
 	private final List<String> annotationTypes;
 
 	public StereotypePackageElement(String packageName, List<String> annotationTypes) {
+		this(packageName, annotationTypes, false);
+	}
+	
+	public StereotypePackageElement(String packageName, List<String> annotationTypes, boolean isMainPackage) {
 		this.packageName = packageName;
+		this.isMainPackage = isMainPackage;
 		this.annotationTypes = annotationTypes;
 	}
 
 	public String getPackageName() {
 		return packageName;
 	}
 
+	public boolean isMainPackage() {
+		return isMainPackage;
+	}
+	
 	public List<String> getAnnotationTypes() {
 		return annotationTypes;
 	}

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

@@ -94,7 +94,7 @@ public class SpringIndexerJava implements SpringIndexer {
 
 	// whenever the implementation of the indexer changes in a way that the stored data in the cache is no longer valid,
 	// we need to change the generation - this will result in a re-indexing due to no up-to-date cache data being found
-	private static final String GENERATION = "GEN-26";
+	private static final String GENERATION = "GEN-27";
 	private static final String INDEX_FILES_TASK_ID = "index-java-source-files-task-";
 
 	private static final String SYMBOL_KEY = "symbols";