fix: JsonSchemaPayload reference resolution.

LEGO · Aug 12, 2024 · a9d501d · a9d501d
1 parent 7083b0c
commit a9d501d
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 2 deletions.
diff --git a/src/LEGO.AsyncAPI.Readers/AsyncApiExternalReferenceResolver.cs b/src/LEGO.AsyncAPI.Readers/AsyncApiExternalReferenceResolver.cs
@@ -93,9 +93,10 @@ public override void Visit(AsyncApiMessage message)
             switch (message.Payload)
             {
                 case AsyncApiJsonSchemaPayload json:
-                    this.ResolveObject(message.Payload as AsyncApiJsonSchemaPayload, r => message.Payload = r);
+                    this.ResolveObject<AsyncApiSchema>(message.Payload as AsyncApiJsonSchemaPayload, r => message.Payload = new AsyncApiJsonSchemaPayload(r));
                     break;
                 case AsyncApiAvroSchemaPayload avro:
+                    // ToFix: this might not resolve correctly.
                     this.ResolveObject(message.Payload as AsyncApiAvroSchemaPayload, r => message.Payload = r);
                     break;
                 default:

diff --git a/src/LEGO.AsyncAPI/Services/AsyncApiReferenceResolver.cs b/src/LEGO.AsyncAPI/Services/AsyncApiReferenceResolver.cs
@@ -90,7 +90,7 @@ public override void Visit(AsyncApiMessage message)
             // #ToFix Resolve references correctly
             if (message.Payload is AsyncApiJsonSchemaPayload)
             {
-                this.ResolveObject(message.Payload as AsyncApiJsonSchemaPayload, r => message.Payload = r);
+                this.ResolveObject<AsyncApiSchema>(message.Payload as AsyncApiJsonSchemaPayload, r => message.Payload = new AsyncApiJsonSchemaPayload(r));
             }
 
             this.ResolveList(message.Traits);

diff --git a/test/LEGO.AsyncAPI.Tests/AsyncApiDocumentV2Tests.cs b/test/LEGO.AsyncAPI.Tests/AsyncApiDocumentV2Tests.cs
@@ -1131,6 +1131,108 @@ public void SerializeV2_WithFullSpec_Serializes()
                   .BePlatformAgnosticEquivalentTo(expected);
         }
 
+        [Test]
+        public void Read_WithAvroSchemaPayload_NoErrors()
+        {
+            // Arrange
+            var yaml =
+                """
+                asyncapi: '2.6.0'
+                info:
+                  title: schema-validation-test
+                  version: '1.0.0'
+                  description: Async API for schema validation tests
+                  contact:
+                    name: Test
+                    url: https://test.test/
+
+                channels:
+                  schema-validation-topic:
+                    description: A topic to publish messages for testing Pulsar schema validation
+                    publish:
+                      message:
+                        $ref: '#/components/messages/schema-validation-message'
+
+                components:
+                  messages:
+                    schema-validation-message:
+                      name: schema-validation-message
+                      title: Message for schema validation testing that is a json object
+                      summary: A test message is used for testing Pulsar schema validation
+                      payload:
+                        type: record
+                        name: UserSignedUp
+                        namespace: esp
+                        doc: ESP Schema validation test
+                        fields:
+                          - name: userId
+                            type: int
+                          - name: userEmail
+                            type: string
+                      schemaFormat: 'application/vnd.apache.avro;version=1.9.0'
+                """;
+
+            // Act
+            var result = new AsyncApiStringReader().Read(yaml, out var diagnostics);
+
+            // Assert
+            diagnostics.Errors.Should().HaveCount(0);
+            result.Channels.First().Value.Publish.Message.First().Payload.As<AsyncApiAvroSchemaPayload>().TryGetAs<AvroRecord>(out var record).Should().BeTrue();
+            record.Name.Should().Be("UserSignedUp");
+        }
+
+        [Test]
+        public void Read_WithJsonSchemaReference_NoErrors()
+        {
+            // Arrange
+            var yaml =
+                """
+                asyncapi: '2.6.0'
+                info:
+                  title: schema-validation-test
+                  version: '1.0.0'
+                  description: Async API for schema validation tests
+                  contact:
+                    name: Test
+                    url: https://test.test/
+
+                channels:
+                  schema-validation-topic:
+                    description: A topic to publish messages for testing Pulsar schema validation
+                    publish:
+                      message:
+                        $ref: '#/components/messages/schema-validation-message'
+                    subscribe:
+                      message:
+                        $ref: '#/components/messages/schema-validation-message'
+
+                components:
+                  schemas:
+                    schema-validation-message-payload:
+                      type: object
+                      properties:
+                        content:
+                          type: string
+                          description: Content of the message
+                  messages:
+                    schema-validation-message:
+                      name: schema-validation-message
+                      title: Message for schema validation testing that is a json object
+                      summary: A test message is used for testing Pulsar schema validation
+                      payload:
+                        $ref: '#/components/schemas/schema-validation-message-payload'
+                      contentType: application/json
+                """;
+
+            // Act
+            var result = new AsyncApiStringReader().Read(yaml, out var diagnostics);
+
+            // Assert
+            diagnostics.Errors.Should().HaveCount(0);
+            result.Channels.First().Value.Publish.Message.First().Title.Should().Be("Message for schema validation testing that is a json object");
+            result.Channels.First().Value.Publish.Message.First().Payload.As<AsyncApiJsonSchemaPayload>().Properties.Should().HaveCount(1);
+        }
+
         [Test]
         public void Serialize_WithBindingReferences_SerializesDeserializes()
         {