message- & operation traits

plus minor formatting fixes across the solution
LEGO · Jan 28, 2025 · f922979 · f922979
1 parent 124776b
commit f922979
Show file tree

Hide file tree

Showing 45 changed files with 271 additions and 243 deletions.
diff --git a/src/LEGO.AsyncAPI.Bindings/Sns/Condition.cs b/src/LEGO.AsyncAPI.Bindings/Sns/Condition.cs
@@ -39,25 +39,25 @@ public static Condition Parse(ParseNode node)
         switch (node)
         {
             case MapNode mapNode:
-            {
-                var conditionValues = new Dictionary<string, Dictionary<string, StringOrStringList>>();
-                foreach (var conditionNode in mapNode)
                 {
-                    switch (conditionNode.Value)
+                    var conditionValues = new Dictionary<string, Dictionary<string, StringOrStringList>>();
+                    foreach (var conditionNode in mapNode)
                     {
-                        case MapNode conditionValueNode:
-                            conditionValues.Add(conditionNode.Name, new Dictionary<string, StringOrStringList>(conditionValueNode.Select(x =>
-                                    new KeyValuePair<string, StringOrStringList>(x.Name, StringOrStringList.Parse(x.Value)))
-                                .ToDictionary(x => x.Key, x => x.Value)));
-                            break;
-                        default:
-                            throw new ArgumentException($"An error occured while parsing a {nameof(Condition)} node. " +
-                                                        $"AWS condition values should be one or more key value pairs.");
+                        switch (conditionNode.Value)
+                        {
+                            case MapNode conditionValueNode:
+                                conditionValues.Add(conditionNode.Name, new Dictionary<string, StringOrStringList>(conditionValueNode.Select(x =>
+                                        new KeyValuePair<string, StringOrStringList>(x.Name, StringOrStringList.Parse(x.Value)))
+                                    .ToDictionary(x => x.Key, x => x.Value)));
+                                break;
+                            default:
+                                throw new ArgumentException($"An error occured while parsing a {nameof(Condition)} node. " +
+                                                            $"AWS condition values should be one or more key value pairs.");
+                        }
                     }
-                }
 
-                return new Condition(conditionValues);
-            }
+                    return new Condition(conditionValues);
+                }
 
             default:
                 throw new ArgumentException($"An error occured while parsing a {nameof(Condition)} node. " +

diff --git a/src/LEGO.AsyncAPI.Bindings/Sns/Principal.cs b/src/LEGO.AsyncAPI.Bindings/Sns/Principal.cs
@@ -1,3 +1,5 @@
+// Copyright (c) The LEGO Group. All rights reserved.
+
 namespace LEGO.AsyncAPI.Bindings.Sns;
 
 using System;
@@ -28,20 +30,20 @@ public static Principal Parse(ParseNode node)
                 return new PrincipalStar();
 
             case MapNode mapNode:
-            {
-                var propertyNode = mapNode.First();
-                if (!IsValidPrincipalProperty(propertyNode.Name))
                 {
-                    throw new ArgumentException($"An error occured while parsing a {nameof(Principal)} node. " +
-                                                $"Node should contain a valid AWS principal property name.");
-                }
+                    var propertyNode = mapNode.First();
+                    if (!IsValidPrincipalProperty(propertyNode.Name))
+                    {
+                        throw new ArgumentException($"An error occured while parsing a {nameof(Principal)} node. " +
+                                                    $"Node should contain a valid AWS principal property name.");
+                    }
 
-                var principalValue = new KeyValuePair<string, StringOrStringList>(
-                    propertyNode.Name,
-                    StringOrStringList.Parse(propertyNode.Value));
+                    var principalValue = new KeyValuePair<string, StringOrStringList>(
+                        propertyNode.Name,
+                        StringOrStringList.Parse(propertyNode.Value));
 
-                return new PrincipalObject(principalValue);
-            }
+                    return new PrincipalObject(principalValue);
+                }
 
             default:
                 throw new ArgumentException($"An error occured while parsing a {nameof(Principal)} node. " +

diff --git a/src/LEGO.AsyncAPI.Bindings/Sns/PrincipalObject.cs b/src/LEGO.AsyncAPI.Bindings/Sns/PrincipalObject.cs
@@ -1,3 +1,5 @@
+// Copyright (c) The LEGO Group. All rights reserved.
+
 namespace LEGO.AsyncAPI.Bindings.Sns;
 
 using System;

diff --git a/src/LEGO.AsyncAPI.Bindings/Sns/PrincipalStar.cs b/src/LEGO.AsyncAPI.Bindings/Sns/PrincipalStar.cs
@@ -1,3 +1,5 @@
+// Copyright (c) The LEGO Group. All rights reserved.
+
 namespace LEGO.AsyncAPI.Bindings.Sns;
 
 using System;

diff --git a/src/LEGO.AsyncAPI.Bindings/Sns/Statement.cs b/src/LEGO.AsyncAPI.Bindings/Sns/Statement.cs
@@ -4,7 +4,6 @@ namespace LEGO.AsyncAPI.Bindings.Sns
     using System;
     using System.Collections.Generic;
     using LEGO.AsyncAPI.Attributes;
-    using LEGO.AsyncAPI.Models;
     using LEGO.AsyncAPI.Models.Interfaces;
     using LEGO.AsyncAPI.Writers;
 

diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/Condition.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/Condition.cs
@@ -39,25 +39,25 @@ public static Condition Parse(ParseNode node)
         switch (node)
         {
             case MapNode mapNode:
-            {
-                var conditionValues = new Dictionary<string, Dictionary<string, StringOrStringList>>();
-                foreach (var conditionNode in mapNode)
                 {
-                    switch (conditionNode.Value)
+                    var conditionValues = new Dictionary<string, Dictionary<string, StringOrStringList>>();
+                    foreach (var conditionNode in mapNode)
                     {
-                        case MapNode conditionValueNode:
-                            conditionValues.Add(conditionNode.Name, new Dictionary<string, StringOrStringList>(conditionValueNode.Select(x =>
-                                    new KeyValuePair<string, StringOrStringList>(x.Name, StringOrStringList.Parse(x.Value)))
-                                .ToDictionary(x => x.Key, x => x.Value)));
-                            break;
-                        default:
-                            throw new ArgumentException($"An error occured while parsing a {nameof(Condition)} node. " +
-                                                        $"AWS condition values should be one or more key value pairs.");
+                        switch (conditionNode.Value)
+                        {
+                            case MapNode conditionValueNode:
+                                conditionValues.Add(conditionNode.Name, new Dictionary<string, StringOrStringList>(conditionValueNode.Select(x =>
+                                        new KeyValuePair<string, StringOrStringList>(x.Name, StringOrStringList.Parse(x.Value)))
+                                    .ToDictionary(x => x.Key, x => x.Value)));
+                                break;
+                            default:
+                                throw new ArgumentException($"An error occured while parsing a {nameof(Condition)} node. " +
+                                                            $"AWS condition values should be one or more key value pairs.");
+                        }
                     }
-                }
 
-                return new Condition(conditionValues);
-            }
+                    return new Condition(conditionValues);
+                }
 
             default:
                 throw new ArgumentException($"An error occured while parsing a {nameof(Condition)} node. " +

diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/Principal.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/Principal.cs
@@ -30,20 +30,20 @@ public static Principal Parse(ParseNode node)
                 return new PrincipalStar();
 
             case MapNode mapNode:
-            {
-                var propertyNode = mapNode.First();
-                if (!IsValidPrincipalProperty(propertyNode.Name))
                 {
-                    throw new ArgumentException($"An error occured while parsing a {nameof(Principal)} node. " +
-                                                $"Node should contain a valid AWS principal property name.");
-                }
+                    var propertyNode = mapNode.First();
+                    if (!IsValidPrincipalProperty(propertyNode.Name))
+                    {
+                        throw new ArgumentException($"An error occured while parsing a {nameof(Principal)} node. " +
+                                                    $"Node should contain a valid AWS principal property name.");
+                    }
 
-                var principalValue = new KeyValuePair<string, StringOrStringList>(
-                    propertyNode.Name,
-                    StringOrStringList.Parse(propertyNode.Value));
+                    var principalValue = new KeyValuePair<string, StringOrStringList>(
+                        propertyNode.Name,
+                        StringOrStringList.Parse(propertyNode.Value));
 
-                return new PrincipalObject(principalValue);
-            }
+                    return new PrincipalObject(principalValue);
+                }
 
             default:
                 throw new ArgumentException($"An error occured while parsing a {nameof(Principal)} node. " +

diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/PrincipalObject.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/PrincipalObject.cs
@@ -1,3 +1,5 @@
+// Copyright (c) The LEGO Group. All rights reserved.
+
 namespace LEGO.AsyncAPI.Bindings.Sqs;
 
 using System;

diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/PrincipalStar.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/PrincipalStar.cs
@@ -1,3 +1,5 @@
+// Copyright (c) The LEGO Group. All rights reserved.
+
 namespace LEGO.AsyncAPI.Bindings.Sqs;
 
 using System;

diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/Statement.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/Statement.cs
@@ -5,7 +5,6 @@ namespace LEGO.AsyncAPI.Bindings.Sqs
     using System;
     using System.Collections.Generic;
     using LEGO.AsyncAPI.Attributes;
-    using LEGO.AsyncAPI.Models;
     using LEGO.AsyncAPI.Models.Interfaces;
     using LEGO.AsyncAPI.Writers;
 

diff --git a/src/LEGO.AsyncAPI.Readers/AsyncApiReaderSettings.cs b/src/LEGO.AsyncAPI.Readers/AsyncApiReaderSettings.cs
@@ -8,7 +8,6 @@ namespace LEGO.AsyncAPI.Readers
     using LEGO.AsyncAPI.Models;
     using LEGO.AsyncAPI.Models.Interfaces;
     using LEGO.AsyncAPI.Readers.Interface;
-    using LEGO.AsyncAPI.Readers.Services;
     using LEGO.AsyncAPI.Validations;
 
     public enum ReferenceResolutionSetting

diff --git a/src/LEGO.AsyncAPI.Readers/Interface/IStreamLoader.cs b/src/LEGO.AsyncAPI.Readers/Interface/IStreamLoader.cs
@@ -4,7 +4,6 @@ namespace LEGO.AsyncAPI.Readers.Interface
 {
     using System;
     using System.IO;
-    using System.Text.Json.Nodes;
     using System.Threading.Tasks;
 
     public interface IStreamLoader

diff --git a/src/LEGO.AsyncAPI.Readers/Services/AsyncApiRemoteReferenceCollector.cs b/src/LEGO.AsyncAPI.Readers/Services/AsyncApiRemoteReferenceCollector.cs
@@ -14,9 +14,9 @@ internal class AsyncApiRemoteReferenceCollector : AsyncApiVisitorBase
 
         public AsyncApiRemoteReferenceCollector(
             AsyncApiDocument currentDocument)
-                {
-                    this.currentDocument = currentDocument;
-                }
+        {
+            this.currentDocument = currentDocument;
+        }
         /// <summary>
         /// List of all external references collected from AsyncApiDocument.
         /// </summary>

diff --git a/src/LEGO.AsyncAPI.Readers/V2/AsyncApiAvroSchemaDeserializer.cs b/src/LEGO.AsyncAPI.Readers/V2/AsyncApiAvroSchemaDeserializer.cs
@@ -2,8 +2,6 @@
 
 namespace LEGO.AsyncAPI.Readers
 {
-    using System;
-    using System.Threading;
     using LEGO.AsyncAPI.Exceptions;
     using LEGO.AsyncAPI.Models;
     using LEGO.AsyncAPI.Models.Avro.LogicalTypes;

diff --git a/src/LEGO.AsyncAPI.Readers/V2/AsyncApiComponentsDeserializer.cs b/src/LEGO.AsyncAPI.Readers/V2/AsyncApiComponentsDeserializer.cs
@@ -17,8 +17,8 @@ internal static partial class AsyncApiV2Deserializer
             { "securitySchemes", (a, n) => a.SecuritySchemes = n.CreateMap(LoadSecurityScheme) },
             { "parameters", (a, n) => a.Parameters = n.CreateMap(LoadParameter) },
             { "correlationIds", (a, n) => a.CorrelationIds = n.CreateMap(LoadCorrelationId) },
-            { "operationTraits", (a, n) => a.OperationTraits = n.CreateMapWithReference(ReferenceType.OperationTrait, LoadOperationTrait) },
-            { "messageTraits", (a, n) => a.MessageTraits = n.CreateMapWithReference(ReferenceType.MessageTrait, LoadMessageTrait) },
+            { "operationTraits", (a, n) => a.OperationTraits = n.CreateMap(LoadOperationTrait) },
+            { "messageTraits", (a, n) => a.MessageTraits = n.CreateMap(LoadMessageTrait) },
             { "serverBindings", (a, n) => a.ServerBindings = n.CreateMapWithReference(ReferenceType.ServerBindings, LoadServerBindings) },
             { "channelBindings", (a, n) => a.ChannelBindings = n.CreateMapWithReference(ReferenceType.ChannelBindings, LoadChannelBindings) },
             { "operationBindings", (a, n) => a.OperationBindings = n.CreateMapWithReference(ReferenceType.OperationBindings, LoadOperationBindings) },

diff --git a/src/LEGO.AsyncAPI.Readers/V2/AsyncApiMessageTraitDeserializer.cs b/src/LEGO.AsyncAPI.Readers/V2/AsyncApiMessageTraitDeserializer.cs
@@ -38,7 +38,7 @@ public static AsyncApiMessageTrait LoadMessageTrait(ParseNode node)
 
             if (pointer != null)
             {
-                return mapNode.GetReferencedObject<AsyncApiMessageTrait>(ReferenceType.MessageTrait, pointer);
+                return new AsyncApiMessageTraitReference(pointer);
             }
 
             var messageTrait = new AsyncApiMessageTrait();

diff --git a/src/LEGO.AsyncAPI.Readers/V2/AsyncApiOperationTraitDeserializer.cs b/src/LEGO.AsyncAPI.Readers/V2/AsyncApiOperationTraitDeserializer.cs
@@ -31,7 +31,7 @@ public static AsyncApiOperationTrait LoadOperationTrait(ParseNode node)
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-                return mapNode.GetReferencedObject<AsyncApiOperationTrait>(ReferenceType.OperationTrait, pointer);
+                return new AsyncApiOperationTraitReference(pointer);
             }
 
             var operationTrait = new AsyncApiOperationTrait();

diff --git a/src/LEGO.AsyncAPI.Readers/YamlConverter.cs b/src/LEGO.AsyncAPI.Readers/YamlConverter.cs
@@ -58,7 +58,7 @@ private static JsonValue ToJsonValue(this YamlScalarNode yaml, CultureInfo cultu
                         ? JsonValue.Create(d)
                         : bool.TryParse(yaml.Value, out var b)
                             ? JsonValue.Create(b)
-                            : JsonValue.Create(yaml.Value) !;
+                            : JsonValue.Create(yaml.Value)!;
                 case ScalarStyle.SingleQuoted:
                 case ScalarStyle.DoubleQuoted:
                 case ScalarStyle.Literal:

diff --git a/src/LEGO.AsyncAPI/AsyncApiWorkspace.cs b/src/LEGO.AsyncAPI/AsyncApiWorkspace.cs
@@ -182,8 +182,6 @@ public T ResolveReference<T>(string location)
             return default;
         }
 
-
-
         private Uri ToLocationUrl(string location)
         {
             return new(location, UriKind.RelativeOrAbsolute);

diff --git a/src/LEGO.AsyncAPI/Models/AsyncApiComponents.cs b/src/LEGO.AsyncAPI/Models/AsyncApiComponents.cs
@@ -260,11 +260,9 @@ public void SerializeV2(IAsyncApiWriter writer)
                 this.OperationTraits,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.OperationTrait &&
-                        component.Reference.FragmentId == key)
+                    if (component is AsyncApiOperationTraitReference reference)
                     {
-                        component.SerializeV2WithoutReference(w);
+                        reference.SerializeV2(w);
                     }
                     else
                     {
@@ -278,11 +276,9 @@ public void SerializeV2(IAsyncApiWriter writer)
                 this.MessageTraits,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.MessageTrait &&
-                        component.Reference.FragmentId == key)
+                    if (component is AsyncApiMessageTraitReference reference)
                     {
-                        component.SerializeV2WithoutReference(w);
+                        reference.SerializeV2(w);
                     }
                     else
                     {

diff --git a/src/LEGO.AsyncAPI/Models/AsyncApiDocument.cs b/src/LEGO.AsyncAPI/Models/AsyncApiDocument.cs
@@ -6,7 +6,6 @@ namespace LEGO.AsyncAPI.Models
     using System.Collections.Generic;
     using LEGO.AsyncAPI.Models.Interfaces;
     using LEGO.AsyncAPI.Writers;
-    using LEGO.AsyncAPI.Services;
 
     /// <summary>
     /// This is the root document object for the API specification. It combines resource listing and API declaration together into one document.
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,8 +182,6 @@ public T ResolveReference<T>(string location) @@
                 return default;
             }
             private Uri ToLocationUrl(string location)
             {
                 return new(location, UriKind.RelativeOrAbsolute);
@@ Expand Down @@