updated tests to latest stereotype metadata definition changes

Author: martinlippert

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

@@ -95,7 +95,7 @@ void testCatalogLookupFromLibraries() throws Exception {
     	var source = new ProjectBasedCatalogSource(regularProject);
 		var catalog = new JsonPathStereotypeCatalog(source);
 
-		StereotypeGroups groups = catalog.getGroups("org.jmolecules.ddd");
+		StereotypeGroups groups = catalog.getGroups("ddd");
 		StereotypeGroup primary = groups.getPrimary();
 
 		assertEquals("Domain-Driven Design", primary.getDisplayName());

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

@@ -221,7 +221,7 @@ void testFromPackageIndexBasedFactory() {
 		List<Stereotype> allStereotypesFound = factory.fromPackage(packageElement).stream().toList();
 		assertEquals(1, allStereotypesFound.size());
 
-		assertEquals("org.jmolecules.architecture.hexagonal.Port", allStereotypesFound.get(0).getIdentifier());
+		assertEquals("architecture.hexagonal.Port", allStereotypesFound.get(0).getIdentifier());
 
 		StereotypePackageElement subpackageElement = springIndex.getNodesOfType(StereotypePackageElement.class).stream()
 				.filter(pkg -> pkg.getPackageName().equals("example.application"))
@@ -230,7 +230,7 @@ void testFromPackageIndexBasedFactory() {
 		allStereotypesFound = factory.fromPackage(subpackageElement).stream().toList();
 		assertEquals(1, allStereotypesFound.size());
 
-		assertEquals("org.jmolecules.architecture.hexagonal.Application", allStereotypesFound.get(0).getIdentifier());
+		assertEquals("architecture.hexagonal.Application", allStereotypesFound.get(0).getIdentifier());
 	}
 
 	@Test
@@ -247,8 +247,8 @@ void testFromClassIndexBasedFactory() {
 		List<Stereotype> myControllerStereotypes = factory.fromType(myControllerClassElement).stream().toList();
 		assertEquals(2, myControllerStereotypes.size());
 
-		assertEquals("org.springframework.stereotype.Controller", myControllerStereotypes.get(0).getIdentifier());
-		assertEquals("org.jmolecules.architecture.hexagonal.Port", myControllerStereotypes.get(1).getIdentifier());
+		assertEquals("spring.Controller", myControllerStereotypes.get(0).getIdentifier());
+		assertEquals("architecture.hexagonal.Port", myControllerStereotypes.get(1).getIdentifier());
 
 
 		StereotypeClassElement somePrimaryPortClassElement = springIndex.getNodesOfType(StereotypeClassElement.class).stream()
@@ -258,8 +258,8 @@ void testFromClassIndexBasedFactory() {
 		List<Stereotype> somePrimaryPortStereotypes = factory.fromType(somePrimaryPortClassElement).stream().toList();
 		assertEquals(2, somePrimaryPortStereotypes.size());
 
-		assertEquals("org.jmolecules.ddd.ValueObject", somePrimaryPortStereotypes.get(0).getIdentifier());
-		assertEquals("org.jmolecules.architecture.hexagonal.Application", somePrimaryPortStereotypes.get(1).getIdentifier());
+		assertEquals("ddd.ValueObject", somePrimaryPortStereotypes.get(0).getIdentifier());
+		assertEquals("architecture.hexagonal.Application", somePrimaryPortStereotypes.get(1).getIdentifier());
 	}
 
 	@Test
@@ -278,7 +278,7 @@ void testSelfDefinedAnnotationStereotype() {
 		assertEquals(2, myStereotypeMarkedClassStereotypes.size());
 
 		assertEquals("example.application.MyStereotype", myStereotypeMarkedClassStereotypes.get(0).getIdentifier());
-		assertEquals("org.jmolecules.architecture.hexagonal.Application", myStereotypeMarkedClassStereotypes.get(1).getIdentifier());
+		assertEquals("architecture.hexagonal.Application", myStereotypeMarkedClassStereotypes.get(1).getIdentifier());
 
 		// catalog definition
 		Optional<? extends StereotypeDefinition> found = catalog.getDefinitions().stream()
@@ -301,8 +301,8 @@ void testWithStereotypeInSuperclass() {
 		List<Stereotype> stereotypes = factory.fromType(classElement).stream().toList();
 		assertEquals(2, stereotypes.size());
 
-		assertEquals("org.jmolecules.ddd.ValueObject", stereotypes.get(0).getIdentifier());
-		assertEquals("org.jmolecules.architecture.hexagonal.Application", stereotypes.get(1).getIdentifier());
+		assertEquals("ddd.ValueObject", stereotypes.get(0).getIdentifier());
+		assertEquals("architecture.hexagonal.Application", stereotypes.get(1).getIdentifier());
 	}
 
 	@Test

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-stereotypes-support/src/main/resources/META-INF/jmolecules-stereotype-groups.json

@@ -1,16 +1,7 @@
 {
-	"groups" : [
-		{
-			"ids" : [ "spring.web" ],
-			"displayName" : "Web"
-		},
-		{
-			"ids" : [ "spring.web.rest" ],
-			"displayName" : "REST"
-		},
-		{
-			"ids" : [ "custom.group" ],
-			"displayName" : "My Custom Stereotype Group"
+	"groups" : {
+		"my.test" : {
+			"displayName" :"Test Group"
 		}
-	]
-}
+	}
+}

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-stereotypes-support/src/main/resources/META-INF/jmolecules-stereotypes.json

@@ -1,25 +1,15 @@
 {
-	"stereotypes" : [
-		{
-			"id" : "org.springframework.stereotype.Controller",
-			"assignments" : [ "@org.springframework.stereotype.Controller" ],
-			"groups" : [ "spring.web" ],
+	"stereotypes" : {
+		"my.test.group" : {
+			"assignments" : [ "@org.example.Test" ],
+			"groups" : [ "my.test" ],
 			"priority" : 10
 		},
-		{
-			"id" : "org.springframework.boot.jackson.JsonMixin",
-			"assignments" : [ "@org.springframework.boot.jackson.JsonMixin" ],
-			"displayName" : "JSON Mixin",
-			"groups" : [ "spring.web.rest" ],
-			"priority" : 10
-		},
-		{
-			"id" : "example.application.DescribedStereotype",
+		"example.application.DescribedStereotype" : {
 			"assignments" : [ "example.application.DescribedStereotype" ],
 			"displayName" : "Some Described Stereotype",
 			"groups" : [ "custom.group" ],
 			"priority" : 5
 		}
-		
-	]
+	}
 }