Change IJsonSchemaExtensionDataAttribute to allow multiple extendion …

…data entries, closes #1578
RicoSuter · Sep 26, 2023 · 8e65d2d · 8e65d2d
1 parent e64b2f3
commit 8e65d2d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 28 deletions.
diff --git a/src/NJsonSchema.Tests/Serialization/ExtensionDataTests.cs b/src/NJsonSchema.Tests/Serialization/ExtensionDataTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using NJsonSchema.Annotations;
 using NJsonSchema.NewtonsoftJson.Generation;
-using NJsonSchema.Tests.Generation;
 using Xunit;
 
 namespace NJsonSchema.Tests.Serialization
@@ -123,8 +122,14 @@ public MyCustomExtensionAttribute()
             }
 
             public string Key { get; }
+
             public object Value { get; }
 
+            public IReadOnlyDictionary<string, object> ExtensionData => new Dictionary<string, object>
+            {
+                { Key, Value }
+            };
+
             public override bool IsValid(object value)
             {
                 return false;

diff --git a/src/NJsonSchema/Annotations/IJsonSchemaExtensionDataAttribute.cs b/src/NJsonSchema/Annotations/IJsonSchemaExtensionDataAttribute.cs
@@ -6,17 +6,14 @@
 // <author>Rico Suter, mail@rsuter.com</author>
 //-----------------------------------------------------------------------
 
-using System;
+using System.Collections.Generic;
 
 namespace NJsonSchema.Annotations
 {
     /// <summary>Interface to add an extension data property to a class or property, implementation needs to inherit from System.Attribute.</summary>
     public interface IJsonSchemaExtensionDataAttribute
     {
-        /// <summary>Gets the property name.</summary>
-        string Key { get; }
-
-        /// <summary>Gets the value.</summary>
-        object Value { get; }
+        /// <summary>Gets the extension data.</summary>
+        IReadOnlyDictionary<string, object> ExtensionData { get; }
     }
 }
diff --git a/src/NJsonSchema/Annotations/JsonSchemaExtensionDataAttribute.cs b/src/NJsonSchema/Annotations/JsonSchemaExtensionDataAttribute.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 
 namespace NJsonSchema.Annotations
 {
@@ -31,5 +32,11 @@ public JsonSchemaExtensionDataAttribute(string key, object value)
 
         /// <summary>Gets the value.</summary>
         public object Value { get; }
+
+        /// <inheritdocs />
+        public IReadOnlyDictionary<string, object> ExtensionData => new Dictionary<string, object>
+        {
+            { Key, Value }
+        };
     }
 }
diff --git a/src/NJsonSchema/Generation/JsonSchemaGenerator.cs b/src/NJsonSchema/Generation/JsonSchemaGenerator.cs
@@ -1164,7 +1164,7 @@ public void AddProperty(
                 propertySchema.Default = ConvertDefaultValue(property.AccessorType, defaultValue);
 
                 ApplyDataAnnotations(propertySchema, propertyTypeDescription);
-                ApplyPropertyExtensionDataAttributes(property, propertySchema);
+                ApplyPropertyExtensionDataAttributes(propertySchema, property);
             };
 
             var referencingProperty = GenerateWithReferenceAndNullability(
@@ -1201,7 +1201,7 @@ public virtual bool IsPropertyIgnored(ContextualAccessorInfo accessorInfo, Type
         /// <returns></returns>
         public bool IsPropertyIgnoredBySettings(ContextualAccessorInfo accessorInfo)
         {
-            if (Settings.IgnoreObsoleteProperties && 
+            if (Settings.IgnoreObsoleteProperties &&
                 accessorInfo.GetContextAttribute<ObsoleteAttribute>() != null)
             {
                 return true;
@@ -1284,34 +1284,38 @@ private void ApplyRangeAttribute(JsonSchema schema, IEnumerable<Attribute> paren
             }
         }
 
-        private void ApplyTypeExtensionDataAttributes<TSchemaType>(TSchemaType schema, ContextualType contextualType) where TSchemaType : JsonSchema, new()
+        private void ApplyTypeExtensionDataAttributes(JsonSchema schema, ContextualType contextualType)
         {
-            var extensionAttributes = contextualType.OriginalType.GetTypeInfo().GetCustomAttributes()
-                .Where(attribute => attribute is IJsonSchemaExtensionDataAttribute).ToArray();
-
-            if (extensionAttributes.Any())
-            {
-                var extensionData = new Dictionary<string, object>();
-
-                foreach (var attribute in extensionAttributes)
-                {
-                    var extensionAttribute = (IJsonSchemaExtensionDataAttribute)attribute;
-                    extensionData.Add(extensionAttribute.Key, extensionAttribute.Value);
-                }
+            var extensionAttributes = contextualType.OriginalType
+                .GetTypeInfo()
+                .GetCustomAttributes()
+                .OfType<IJsonSchemaExtensionDataAttribute>()
+                .ToArray();
 
-                schema.ExtensionData = extensionData;
-            }
+            ApplyTypeExtensionDataAttributes(schema, extensionAttributes);
         }
 
-        private void ApplyPropertyExtensionDataAttributes(ContextualAccessorInfo accessorInfo, JsonSchemaProperty propertySchema)
+        private void ApplyPropertyExtensionDataAttributes(JsonSchemaProperty propertySchema, ContextualAccessorInfo accessorInfo)
         {
-            var extensionDataAttributes = accessorInfo
+            var extensionAttributes = accessorInfo
                 .GetContextAttributes<IJsonSchemaExtensionDataAttribute>()
                 .ToArray();
 
-            if (extensionDataAttributes.Any())
+            ApplyTypeExtensionDataAttributes(propertySchema, extensionAttributes);
+        }
+
+        private static void ApplyTypeExtensionDataAttributes(JsonSchema schema, IJsonSchemaExtensionDataAttribute[] extensionAttributes)
+        {
+            if (extensionAttributes.Any())
             {
-                propertySchema.ExtensionData = extensionDataAttributes.ToDictionary(a => a.Key, a => a.Value);
+                var extensionData = new Dictionary<string, object>();
+                foreach (var kvp in extensionAttributes
+                    .SelectMany(attribute => attribute.ExtensionData))
+                {
+                    extensionData[kvp.Key] = kvp.Value;
+                }
+
+                schema.ExtensionData = extensionData;
             }
         }
     }