[structural view] added jpa stereotypes to set of default stereotypes for non-jmolecules projects

Author: martinlippert

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

@@ -31,6 +31,10 @@
 public class ProjectBasedCatalogSource implements CatalogSource {
 
 	private static final Logger log = LoggerFactory.getLogger(ProjectBasedCatalogSource.class);
+	
+	private static final String[] DEFAULT_STEREOTYPE_DEFINITIONS = {
+			"/stereotype-defaults/spring-jmolecules-stereotypes.json", 
+			"/stereotype-defaults/jpa-jmolecules-stereotypes.json"};
 
 	private final IJavaProject project;
 
@@ -81,14 +85,19 @@ public Stream<URL> getSources() {
 			}
 
 			if (result.size() == 0) {
-				URL defaultSpringStereotypes = this.getClass().getResource("/stereotype-defaults/jmolecules-stereotypes.json");
 
-				if (defaultSpringStereotypes != null) {
-					log.info("using default stereotypes for project: " + this.project.getElementName());
-					result.add(defaultSpringStereotypes);
-				}
-				else {
-					log.error("error looking up default stereotypes for project: " + this.project.getElementName());
+				// use default hard-coded stereotype definitions for projects that don't have jmolecules on the classpath
+
+				for (String defaultDefinition : DEFAULT_STEREOTYPE_DEFINITIONS) {
+					URL defaultStereotypes = this.getClass().getResource(defaultDefinition);
+
+					if (defaultStereotypes != null) {
+						log.info("using default stereotypes " + defaultDefinition + " for project: " + this.project.getElementName());
+						result.add(defaultStereotypes);
+					}
+					else {
+						log.error("error looking up default stereotypes " + defaultDefinition + " for project: " + this.project.getElementName());
+					}
 				}
 			}
 

headless-services/spring-boot-language-server/src/main/resources/stereotype-defaults/jpa-jmolecules-stereotypes.json

@@ -0,0 +1,39 @@
+{
+	"stereotypes" : {
+		"jpa.AttributeConverter" : {
+			"assignments" : [
+				"jakarta.persistence.AttributeConverter",
+				"javax.persistence.AttributeConverter"
+			],
+			"groups" : [ "jpa" ]
+		},
+		"jpa.Embeddable" : {
+			"assignments" : [
+				"@jakarta.persistence.Embeddable",
+				"@javax.persistence.Embeddable"
+			],
+			"groups" : [ "jpa" ]
+		},
+		"jpa.Entity" : {
+			"assignments" : [
+				"@jakarta.persistence.Entity",
+				"@javax.persistence.Entity"
+			],
+			"groups" : [ "jpa" ]
+		},
+		"jpa.MappedSuperclass" : {
+			"assignments" : [
+				"@jakarta.persistence.MappedSuperclass",
+				"@javax.persistence.MappedSuperclass"
+			],
+			"groups" : [ "jpa" ]
+		}
+	},
+	"groups" : {
+		"jpa" : {
+			"displayName" : "JPA",
+			"type" : "technology",
+			"priority" : 20
+		}
+	}
+}

headless-services/spring-boot-language-server/src/main/resources/stereotype-defaults/jmolecules-stereotypes.json renamed to headless-services/spring-boot-language-server/src/main/resources/stereotype-defaults/spring-jmolecules-stereotypes.json

@@ -32,7 +32,6 @@
 import org.springframework.ide.vscode.boot.app.SpringSymbolIndex;
 import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest;
 import org.springframework.ide.vscode.boot.bootiful.SymbolProviderTestConf;
-import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 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;
@@ -50,7 +49,6 @@ public class ProjectBasedCatalogSourceTest {
 	@Autowired private BootLanguageServerHarness harness;
 	@Autowired private JavaProjectFinder projectFinder;
 	@Autowired private SpringSymbolIndex indexer;
-	@Autowired private SpringMetamodelIndex springIndex;
 
 	private File regularProjectDirectory;
 	private File fallbackProjectDirectory;
@@ -108,8 +106,9 @@ void testCatalogDefaultLookupFromLanguageServer() throws Exception {
 		Stream<URL> sources = source.getSources();
 		List<URL> list = sources.toList();
 
-		assertEquals(1, list.size());
-		assertTrue(list.get(0).toString().endsWith("jmolecules-stereotypes.json"));
+		assertEquals(2, list.size());
+		assertTrue(list.get(0).toString().endsWith("spring-jmolecules-stereotypes.json"));
+		assertTrue(list.get(1).toString().endsWith("jpa-jmolecules-stereotypes.json"));
     }
 
 }