Small adjustments in deserialization validation

Author: bielu

src/ByteBard.AsyncAPI.Readers/AsyncApiJsonDocumentReader.cs

@@ -370,51 +370,51 @@ private IAsyncApiSerializable ResolveStreamReference(Stream stream, IAsyncApiRef
                 case ReferenceType.Schema:
                     if (reference is AsyncApiJsonSchemaReference)
                     {
-                        result = this.ReadFragment<AsyncApiJsonSchema>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                        result = this.ReadFragment<AsyncApiJsonSchema>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     }
 
                     if (reference is AsyncApiAvroSchemaReference)
                     {
-                        result = this.ReadFragment<AsyncApiAvroSchema>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                        result = this.ReadFragment<AsyncApiAvroSchema>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     }
 
                     break;
 
                 case ReferenceType.Server:
-                    result = this.ReadFragment<AsyncApiServer>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiServer>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.Channel:
-                    result = this.ReadFragment<AsyncApiChannel>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiChannel>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.Message:
-                    result = this.ReadFragment<AsyncApiMessage>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiMessage>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.SecurityScheme:
-                    result = this.ReadFragment<AsyncApiSecurityScheme>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiSecurityScheme>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.Parameter:
-                    result = this.ReadFragment<AsyncApiParameter>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiParameter>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.CorrelationId:
-                    result = this.ReadFragment<AsyncApiCorrelationId>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiCorrelationId>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.OperationTrait:
-                    result = this.ReadFragment<AsyncApiOperationTrait>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiOperationTrait>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.MessageTrait:
-                    result = this.ReadFragment<AsyncApiMessageTrait>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiMessageTrait>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.ServerBindings:
-                    result = this.ReadFragment<AsyncApiBindings<IServerBinding>>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiBindings<IServerBinding>>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.ChannelBindings:
-                    result = this.ReadFragment<AsyncApiBindings<IChannelBinding>>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiBindings<IChannelBinding>>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.OperationBindings:
-                    result = this.ReadFragment<AsyncApiBindings<IOperationBinding>>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiBindings<IOperationBinding>>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 case ReferenceType.MessageBindings:
-                    result = this.ReadFragment<AsyncApiBindings<IMessageBinding>>(json, AsyncApiVersion.AsyncApi2_0, out fragmentDiagnostic);
+                    result = this.ReadFragment<AsyncApiBindings<IMessageBinding>>(json, diagnostic.SpecificationVersion, out fragmentDiagnostic);
                     break;
                 default:
                     diagnostic.Errors.Add(new AsyncApiError(reference.Reference.Reference, "Could not resolve reference."));

src/ByteBard.AsyncAPI.Readers/V2/AsyncApiChannelDeserializer.cs

@@ -11,13 +11,19 @@ internal static partial class AsyncApiV2Deserializer
         private static readonly FixedFieldMap<AsyncApiChannel> ChannelFixedFields = new()
         {
             { "description", (a, n) => { a.Description = n.GetScalarValue(); } },
-            { "servers", (a, n) => { a.Servers = n.CreateSimpleList(s => new AsyncApiServerReference("#/servers/" + s.GetScalarValue())); } },
+            { "servers", (a, n) => { a.Servers = n.CreateSimpleList(s => new AsyncApiServerReference(GetServerReferenceKey(s))); } },
             { "subscribe", (a, n) => { /* happens after initial reading */ } },
             { "publish", (a, n) => { /* happens after initial reading */ } },
             { "parameters", (a, n) => { a.Parameters = n.CreateMap(LoadParameter); } },
             { "bindings", (a, n) => { a.Bindings = LoadChannelBindings(n); } },
         };
 
+        private static string GetServerReferenceKey(ValueNode valueNode)
+        {
+            var stringValue = valueNode.GetScalarValue();
+            return stringValue.StartsWith("#/servers/") ? stringValue : "#/servers/" + stringValue;
+        }
+
         private static readonly PatternFieldMap<AsyncApiChannel> ChannelPatternFields =
             new()
             {

src/ByteBard.AsyncAPI.Readers/V3/AsyncApiDocumentDeserializer.cs

@@ -8,7 +8,7 @@ internal static partial class AsyncApiV3Deserializer
     {
         private static FixedFieldMap<AsyncApiDocument> asyncApiFixedFields = new()
         {
-            { "asyncapi", (a, n) => { a.Asyncapi = "3.0.0"; } },
+            { "asyncapi", (a, n) => { a.Asyncapi = "3.1.0"; } },
             { "id", (a, n) => a.Id = n.GetScalarValue() },
             { "info", (a, n) => a.Info = LoadInfo(n) },
             { "servers", (a, n) => a.Servers = n.CreateMap(LoadServer) },