GH-1626: stereotype catalog cache now automatically invalidated when project changes, e.g. classpath changes

Author: martinlippert

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

@@ -442,8 +442,8 @@ DataRepositoryAotMetadataService dataAotMetadataService() {
 	}
 
 	@Bean
-	StereotypeCatalogRegistry stereotypeCatalogRegistry() {
-		return new StereotypeCatalogRegistry();
+	StereotypeCatalogRegistry stereotypeCatalogRegistry(ProjectObserver projectObserver) {
+		return new StereotypeCatalogRegistry(projectObserver);
 	}
 
 	@Bean ResponseModifier responseModifier() {

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

@@ -105,7 +105,7 @@ public Stream<URL> getSources() {
 			log.error("error looking up stereotype metadata for project: " + this.project.getElementName(), e);
 		}
 
-		
+		log.info("project based stereotype catalogs lookup for project '" + project.getElementName() + "' found: " + result.toString());
 		return result.stream();
 	}
 

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

@@ -15,14 +15,20 @@
 
 import org.jmolecules.stereotype.catalog.support.AbstractStereotypeCatalog;
 import org.jmolecules.stereotype.catalog.support.JsonPathStereotypeCatalog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
+import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserver;
 
 public class StereotypeCatalogRegistry {
-	
+
+	private static final Logger log = LoggerFactory.getLogger(StereotypeCatalogRegistry.class);
+
 	private final Map<String, AbstractStereotypeCatalog> catalogs;
 
-	public StereotypeCatalogRegistry() {
+	public StereotypeCatalogRegistry(ProjectObserver projectObserver) {
 		this.catalogs = new ConcurrentHashMap<>();
+		registerProjectListener(projectObserver);
 	}
 
 	public AbstractStereotypeCatalog getCatalogOf(IJavaProject project) {
@@ -36,6 +42,27 @@ private AbstractStereotypeCatalog createCatalog(IJavaProject project) {
 
 	public void reset(IJavaProject project) {
 		this.catalogs.remove(project.getElementName());
+		log.info("stereotype catalog registry reset for project '" + project.getElementName() + "'");
+	}
+
+	// reset cache when projects change or disappear
+	private void registerProjectListener(ProjectObserver projectObserver) {
+		projectObserver.addListener(new ProjectObserver.Listener() {
+			
+			@Override
+			public void deleted(IJavaProject project) {
+				reset(project);
+			}
+			
+			@Override
+			public void created(IJavaProject project) {
+			}
+			
+			@Override
+			public void changed(IJavaProject project) {
+				reset(project);
+			}
+		});
 	}
 
 }