test(core): minor cleanup and adding reference to verifying collections

Author: timonback

springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/GroupingIntegrationTest.java

@@ -3,10 +3,11 @@
 
 import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
 import io.github.springwolf.core.asyncapi.AsyncApiService;
 import io.github.springwolf.core.fixtures.SpringwolfIntegrationTest;
-import io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication;
+import io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Nested
-@SpringBootTest(classes = PublisherGroupingComplexSchemaApplication.class)
+@SpringBootTest(classes = ComplexSchemaApplication.class)
 @SpringwolfIntegrationTest
 @TestPropertySource(
         properties = {
@@ -34,36 +35,48 @@ class GroupingWithComplexSchemaIntegrationTest {
     private AsyncApiService asyncApiService;
 
     @Test
-    void shouldFindOnlyForGroupFoo() {
+    void shouldFindOnlyForGroupUserMessage() {
         AsyncAPI asyncAPI = asyncApiService.getForGroupName("UserMessage").get();
 
-        assertThat(asyncAPI.getChannels().keySet()).containsExactlyInAnyOrder("publisher-channel");
-        assertThat(asyncAPI.getChannels().get("publisher-channel").getMessages())
+        assertThat(asyncAPI.getChannels().keySet()).containsExactlyInAnyOrder("publisher-channel2");
+        assertThat(asyncAPI.getChannels().get("publisher-channel2").getMessages())
                 .containsOnlyKeys(
-                        "io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication.ComplexPublisher.User");
+                        "io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.User");
         assertThat(asyncAPI.getOperations())
-                .containsOnlyKeys("publisher-channel_send_publish1", "publisher-channel_send_publish2");
+                .containsOnlyKeys("publisher-channel2_send_publish1", "publisher-channel2_send_publish2");
         assertThat(asyncAPI.getComponents().getMessages())
                 .containsOnlyKeys(
-                        "io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication.ComplexPublisher.User");
+                        "io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.User");
         assertThat(asyncAPI.getComponents().getSchemas())
                 .containsOnlyKeys(
                         "HeadersNotDocumented",
-                        "io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication.ComplexPublisher.User",
-                        "io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication.ComplexPublisher.Address",
-                        "io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication.ComplexPublisher.City");
+                        "io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.User",
+                        "io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.Address",
+                        "io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.City");
 
         MessageObject userMessage = (MessageObject)
                 asyncAPI.getComponents()
                         .getMessages()
                         .get(
-                                "io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication.ComplexPublisher.User");
+                                "io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.User");
         assertThat(userMessage.getPayload().getMultiFormatSchema().getSchema()).isInstanceOf(SchemaReference.class);
-        SchemaReference fooSchemaRef = (SchemaReference)
+        SchemaReference userMessageToSchemaRef = (SchemaReference)
                 userMessage.getPayload().getMultiFormatSchema().getSchema();
-        assertThat(fooSchemaRef.getRef())
+        assertThat(userMessageToSchemaRef.getRef())
                 .isEqualTo(
-                        "#/components/schemas/io.github.springwolf.core.integrationtests.application.complexSchema.PublisherGroupingComplexSchemaApplication.ComplexPublisher.User");
+                        "#/components/schemas/io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.User");
+
+        // Verify that collection property is correctly represented using `items`
+        ComponentSchema addressesSchema = (ComponentSchema) asyncAPI.getComponents()
+                .getSchemas()
+                .get(
+                        "io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.User")
+                .getSchema()
+                .getProperties()
+                .get("addresses");
+        assertThat(addressesSchema.getSchema().getItems().getReference().getRef())
+                .isEqualTo(
+                        "#/components/schemas/io.github.springwolf.core.integrationtests.application.complexSchema.ComplexSchemaApplication.ComplexPublisher.Address");
     }
 
     @Test

springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/GroupingWithComplexSchemaIntegrationTest.java

@@ -10,17 +10,21 @@
 import java.util.List;
 
 @SpringBootApplication
-public class PublisherGroupingComplexSchemaApplication {
+public class ComplexSchemaApplication {
+
+    @AsyncPublisher(operation = @AsyncOperation(channelName = "publisher-channel"))
+    public void publish(List<String> payload) {}
+
     @Bean
     public ComplexPublisher complexPublisher() {
         return new ComplexPublisher();
     }
 
-    static class ComplexPublisher {
-        @AsyncPublisher(operation = @AsyncOperation(channelName = "publisher-channel"))
+    public static class ComplexPublisher {
+        @AsyncPublisher(operation = @AsyncOperation(channelName = "publisher-channel2"))
         public void publish1(User payload) {}
 
-        @AsyncPublisher(operation = @AsyncOperation(channelName = "publisher-channel"))
+        @AsyncPublisher(operation = @AsyncOperation(channelName = "publisher-channel2"))
         public void publish2(List<User> payload) {}
 
         public record User(String name, Integer age, Collection<Address> addresses) {}
@@ -29,7 +33,4 @@ public record Address(String streetName, String addition, City city) {}
 
         public record City(String zipCode, String name) {}
     }
-
-    @AsyncPublisher(operation = @AsyncOperation(channelName = "publisher-channel2"))
-    public void publish2(List<String> payload) {}
 }