Update Namotion.Reflection

RicoSuter · Oct 31, 2023 · cce0e36 · cce0e36
1 parent 164520b
commit cce0e36
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 83 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -10,7 +10,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageVersion Include="Namotion.Reflection" Version="3.0.1" />
+    <PackageVersion Include="Namotion.Reflection" Version="3.1.0" />
     <PackageVersion Include="NBench" Version="2.0.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NodaTime" Version="3.1.9" />

diff --git a/src/NJsonSchema.NewtonsoftJson/Generation/NewtonsoftJsonReflectionService.cs b/src/NJsonSchema.NewtonsoftJson/Generation/NewtonsoftJsonReflectionService.cs
@@ -39,7 +39,7 @@ public class NewtonsoftJsonReflectionService : ReflectionServiceBase<NewtonsoftJ
         /// <inheritdoc />
         public override bool IsNullable(ContextualType contextualType, ReferenceTypeNullHandling defaultReferenceTypeNullHandling)
         {
-            var jsonPropertyAttribute = contextualType.GetContextAttribute<JsonPropertyAttribute>();
+            var jsonPropertyAttribute = contextualType.GetContextAttribute<JsonPropertyAttribute>(true);
             if (jsonPropertyAttribute != null && jsonPropertyAttribute.Required == Required.DisallowNull)
             {
                 return false;
@@ -117,7 +117,7 @@ public override void GenerateProperties(JsonSchema schema, ContextualType contex
                 // TODO: Remove this hacky code (used to support serialization of exceptions and restore the old behavior [pre 9.x])
                 foreach (var accessorInfo in contextualAccessors.Where(m => allowedProperties == null || allowedProperties.Contains(m.Name)))
                 {
-                    var attribute = accessorInfo.GetContextAttribute<JsonPropertyAttribute>();
+                    var attribute = accessorInfo.GetAttribute<JsonPropertyAttribute>(true);
                     var memberType = (accessorInfo as ContextualPropertyInfo)?.PropertyInfo.PropertyType ??
                                      (accessorInfo as ContextualFieldInfo)?.FieldInfo.FieldType;
 
@@ -173,7 +173,9 @@ private void LoadPropertyOrField(JsonProperty jsonProperty, ContextualAccessorIn
                     }
                 }
 
-                var requiredAttribute = accessorInfo.ContextAttributes.FirstAssignableToTypeNameOrDefault("System.ComponentModel.DataAnnotations.RequiredAttribute");
+                var requiredAttribute = accessorInfo
+                    .GetAttributes(true)
+                    .FirstAssignableToTypeNameOrDefault("System.ComponentModel.DataAnnotations.RequiredAttribute");
 
                 var hasJsonNetAttributeRequired = jsonProperty.Required == Required.Always || jsonProperty.Required == Required.AllowNull;
                 var isDataContractMemberRequired = schemaGenerator.GetDataMemberAttribute(accessorInfo, parentType)?.IsRequired == true;

diff --git a/src/NJsonSchema/Generation/DefaultSchemaNameGenerator.cs b/src/NJsonSchema/Generation/DefaultSchemaNameGenerator.cs
@@ -23,7 +23,8 @@ public virtual string Generate(Type type)
         {
             var cachedType = type.ToCachedType();
 
-            var jsonSchemaAttribute = cachedType.GetInheritedAttribute<JsonSchemaAttribute>();
+            var jsonSchemaAttribute = cachedType.GetAttribute<JsonSchemaAttribute>(true);
+
             if (!string.IsNullOrEmpty(jsonSchemaAttribute?.Name))
             {
                 return jsonSchemaAttribute!.Name!;
@@ -44,10 +45,10 @@ public virtual string Generate(Type type)
         private static string GetName(CachedType cType)
         {
             return
-                cType.TypeName == "Int16" ? GetNullableDisplayName(cType, "Short") :
-                cType.TypeName == "Int32" ? GetNullableDisplayName(cType, "Integer") :
-                cType.TypeName == "Int64" ? GetNullableDisplayName(cType, "Long") :
-                GetNullableDisplayName(cType, cType.TypeName);
+                cType.Name == "Int16" ? GetNullableDisplayName(cType, "Short") :
+                cType.Name == "Int32" ? GetNullableDisplayName(cType, "Integer") :
+                cType.Name == "Int64" ? GetNullableDisplayName(cType, "Long") :
+                GetNullableDisplayName(cType, cType.Name);
         }
 
         private static string GetNullableDisplayName(CachedType type, string actual)

diff --git a/src/NJsonSchema/Generation/JsonSchemaGenerator.cs b/src/NJsonSchema/Generation/JsonSchemaGenerator.cs
diff --git a/src/NJsonSchema/Generation/ReflectionServiceBase.cs b/src/NJsonSchema/Generation/ReflectionServiceBase.cs
@@ -38,7 +38,7 @@ public JsonTypeDescription GetDescription(ContextualType contextualType, Referen
             var type = contextualType.OriginalType;
             var isNullable = IsNullable(contextualType, defaultReferenceTypeNullHandling);
 
-            var jsonSchemaTypeAttribute = contextualType.GetAttribute<JsonSchemaTypeAttribute>();
+            var jsonSchemaTypeAttribute = contextualType.GetContextOrTypeAttribute<JsonSchemaTypeAttribute>(true);
             if (jsonSchemaTypeAttribute != null)
             {
                 type = jsonSchemaTypeAttribute.Type;
@@ -50,7 +50,7 @@ public JsonTypeDescription GetDescription(ContextualType contextualType, Referen
                 }
             }
 
-            var jsonSchemaAttribute = contextualType.GetAttribute<JsonSchemaAttribute>();
+            var jsonSchemaAttribute = contextualType.GetContextOrTypeAttribute<JsonSchemaAttribute>(true); ;
             if (jsonSchemaAttribute != null)
             {
                 var classType = jsonSchemaAttribute.Type != JsonObjectType.None ? jsonSchemaAttribute.Type : JsonObjectType.Object;
@@ -235,12 +235,12 @@ protected virtual JsonTypeDescription GetDescription(ContextualType contextualTy
         /// <returns>true if the type can be null.</returns>
         public virtual bool IsNullable(ContextualType contextualType, ReferenceTypeNullHandling defaultReferenceTypeNullHandling)
         {
-            if (contextualType.ContextAttributes.FirstAssignableToTypeNameOrDefault("NotNullAttribute", TypeNameStyle.Name) != null)
+            if (contextualType.GetContextAttributes(true).FirstAssignableToTypeNameOrDefault("NotNullAttribute", TypeNameStyle.Name) != null)
             {
                 return false;
             }
 
-            if (contextualType.ContextAttributes.FirstAssignableToTypeNameOrDefault("CanBeNullAttribute", TypeNameStyle.Name) != null)
+            if (contextualType.GetContextAttributes(true).FirstAssignableToTypeNameOrDefault("CanBeNullAttribute", TypeNameStyle.Name) != null)
             {
                 return true;
             }
@@ -283,7 +283,7 @@ protected virtual bool IsBinary(ContextualType contextualType)
         {
             // TODO: Move all file handling to NSwag. How?
 
-            var parameterTypeName = contextualType.TypeName;
+            var parameterTypeName = contextualType.Name;
             return parameterTypeName == "IFormFile" ||
                    contextualType.IsAssignableToTypeName("HttpPostedFile", TypeNameStyle.Name) ||
                    contextualType.IsAssignableToTypeName("HttpPostedFileBase", TypeNameStyle.Name) ||
@@ -298,7 +298,7 @@ protected virtual bool IsBinary(ContextualType contextualType)
         /// <returns>true or false.</returns>
         private bool IsIAsyncEnumerableType(ContextualType contextualType)
         {
-            return contextualType.TypeName == "IAsyncEnumerable`1";
+            return contextualType.Name == "IAsyncEnumerable`1";
         }
 
         /// <summary>Checks whether the given type is an array type.</summary>
@@ -311,7 +311,7 @@ protected virtual bool IsArrayType(ContextualType contextualType)
                 return false;
             }
 
-            if (contextualType.TypeName == "ObservableCollection`1")
+            if (contextualType.Name == "ObservableCollection`1")
             {
                 return true;
             }
@@ -327,7 +327,7 @@ protected virtual bool IsArrayType(ContextualType contextualType)
         /// <returns>true or false.</returns>
         protected virtual bool IsDictionaryType(ContextualType contextualType)
         {
-            if (contextualType.TypeName == "IDictionary`2" || contextualType.TypeName == "IReadOnlyDictionary`2")
+            if (contextualType.Name == "IDictionary`2" || contextualType.Name == "IReadOnlyDictionary`2")
             {
                 return true;
             }
@@ -339,7 +339,10 @@ protected virtual bool IsDictionaryType(ContextualType contextualType)
 
         private bool HasStringEnumConverter(ContextualType contextualType)
         {
-            dynamic? jsonConverterAttribute = contextualType.Attributes?.FirstOrDefault(a => a.GetType().Name == "JsonConverterAttribute");
+            dynamic? jsonConverterAttribute = contextualType
+                .GetContextOrTypeAttributes(true)?
+                .FirstOrDefault(a => a.GetType().Name == "JsonConverterAttribute");
+
             if (jsonConverterAttribute != null && ObjectExtensions.HasProperty(jsonConverterAttribute, "ConverterType"))
             {
                 var converterType = jsonConverterAttribute?.ConverterType as Type;

diff --git a/src/NJsonSchema/Generation/SystemTextJsonReflectionService.cs b/src/NJsonSchema/Generation/SystemTextJsonReflectionService.cs
@@ -40,14 +40,14 @@ public override void GenerateProperties(JsonSchema schema, ContextualType contex
                 }
 
                 if (accessorInfo.Name == "EqualityContract" &&
-                    accessorInfo.ContextAttributes.OfType<CompilerGeneratedAttribute>().Any())
+                    accessorInfo.IsAttributeDefined<CompilerGeneratedAttribute>(true))
                 {
                     continue;
                 }
 
                 var propertyIgnored = false;
                 var jsonIgnoreAttribute = accessorInfo
-                    .ContextAttributes
+                    .GetAttributes(true)
                     .FirstAssignableToTypeNameOrDefault("System.Text.Json.Serialization.JsonIgnoreAttribute", TypeNameStyle.FullName);
 
                 if (jsonIgnoreAttribute != null)
@@ -61,8 +61,8 @@ public override void GenerateProperties(JsonSchema schema, ContextualType contex
 
                 var ignored = propertyIgnored
                     || schemaGenerator.IsPropertyIgnoredBySettings(accessorInfo)
-                    || accessorInfo.ContextAttributes
-                    .FirstAssignableToTypeNameOrDefault("System.Text.Json.Serialization.JsonExtensionDataAttribute", TypeNameStyle.FullName) != null;
+                    || accessorInfo.GetAttributes(true)
+                        .FirstAssignableToTypeNameOrDefault("System.Text.Json.Serialization.JsonExtensionDataAttribute", TypeNameStyle.FullName) != null;
 
                 if (!ignored)
                 {
@@ -82,7 +82,9 @@ public override void GenerateProperties(JsonSchema schema, ContextualType contex
                         }
                     }
 
-                    var requiredAttribute = accessorInfo.ContextAttributes.FirstAssignableToTypeNameOrDefault("System.ComponentModel.DataAnnotations.RequiredAttribute");
+                    var requiredAttribute = accessorInfo
+                        .GetAttributes(true)
+                        .FirstAssignableToTypeNameOrDefault("System.ComponentModel.DataAnnotations.RequiredAttribute");
 
                     var isDataContractMemberRequired = schemaGenerator.GetDataMemberAttribute(accessorInfo, contextualType.Type)?.IsRequired == true;
 
@@ -132,7 +134,7 @@ public override string GetPropertyName(ContextualAccessorInfo accessorInfo, Json
 
         private static string GetPropertyName(ContextualAccessorInfo accessorInfo, SystemTextJsonSchemaGeneratorSettings settings)
         {
-            dynamic? jsonPropertyNameAttribute = accessorInfo.ContextAttributes
+            dynamic? jsonPropertyNameAttribute = accessorInfo.GetAttributes(true)
                 .FirstAssignableToTypeNameOrDefault("System.Text.Json.Serialization.JsonPropertyNameAttribute", TypeNameStyle.FullName);
 
             if (!string.IsNullOrEmpty(jsonPropertyNameAttribute?.Name))

diff --git a/src/NJsonSchema/Infrastructure/TypeExtensions.cs b/src/NJsonSchema/Infrastructure/TypeExtensions.cs
@@ -59,20 +59,20 @@ public static string GetName(this ContextualAccessorInfo accessorInfo)
 
         private static string GetNameWithoutCache(ContextualAccessorInfo accessorInfo)
         {
-            var jsonPropertyAttribute = accessorInfo.AccessorType.GetContextAttribute<JsonPropertyAttribute>();
+            var jsonPropertyAttribute = accessorInfo.GetAttribute<JsonPropertyAttribute>(true);
             if (jsonPropertyAttribute != null && !string.IsNullOrEmpty(jsonPropertyAttribute.PropertyName))
             {
                 return jsonPropertyAttribute.PropertyName!;
             }
 
-            var dataMemberAttribute = accessorInfo.AccessorType.GetContextAttribute<DataMemberAttribute>();
+            var dataMemberAttribute = accessorInfo.GetAttribute<DataMemberAttribute>(true);
             if (dataMemberAttribute != null && !string.IsNullOrEmpty(dataMemberAttribute.Name))
             {
                 var dataContractAttribute = accessorInfo
                     .MemberInfo
                     .DeclaringType?
                     .ToCachedType()
-                    .GetInheritedAttribute<DataContractAttribute>();
+                    .GetAttribute<DataContractAttribute>(true);
 
                 if (dataContractAttribute != null)
                 {
@@ -89,7 +89,9 @@ private static string GetNameWithoutCache(ContextualAccessorInfo accessorInfo)
         /// <returns>The description or null if no description is available.</returns>
         public static string? GetDescription(this CachedType type, IXmlDocsSettings xmlDocsSettings)
         {
-            var attributes = type is ContextualType contextualType ? contextualType.ContextAttributes : type.InheritedAttributes;
+            var attributes = type is ContextualType contextualType ? 
+                contextualType.GetContextOrTypeAttributes<Attribute>(true) : 
+                type.GetAttributes(true);
 
             var description = GetDescription(attributes);
             if (description != null)
@@ -115,7 +117,7 @@ private static string GetNameWithoutCache(ContextualAccessorInfo accessorInfo)
         /// <returns>The description or null if no description is available.</returns>
         public static string? GetDescription(this ContextualAccessorInfo accessorInfo, IXmlDocsSettings xmlDocsSettings)
         {
-            var description = GetDescription(accessorInfo.AccessorType.Attributes);
+            var description = GetDescription(accessorInfo.GetAttributes(true));
             if (description != null)
             {
                 return description;
@@ -139,7 +141,7 @@ private static string GetNameWithoutCache(ContextualAccessorInfo accessorInfo)
         /// <returns>The description or null if no description is available.</returns>
         public static string? GetDescription(this ContextualParameterInfo parameter, IXmlDocsSettings xmlDocsSettings)
         {
-            var description = GetDescription(parameter.ContextAttributes);
+            var description = GetDescription(parameter.GetAttributes(true));
             if (description != null)
             {
                 return description;

diff --git a/src/NJsonSchema/Infrastructure/XmlObjectExtension.cs b/src/NJsonSchema/Infrastructure/XmlObjectExtension.cs
@@ -22,7 +22,7 @@ public static class XmlObjectExtension
         /// <param name="type">The type of the JSON Schema.</param>
         public static void GenerateXmlObjectForType(this JsonSchema schema, Type type)
         {
-            var attributes = type.ToCachedType().InheritedAttributes;
+            var attributes = type.ToCachedType().GetAttributes(true);
             if (attributes.Any())
             {
                 dynamic? xmlTypeAttribute = attributes.FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlTypeAttribute");
@@ -49,7 +49,7 @@ public static void GenerateXmlObjectForArrayType(this JsonSchema schema)
         public static void GenerateXmlObjectForItemType(this JsonSchema schema, CachedType type)
         {
             // Is done all the time for XML to be able to get type name as the element name if not there was an attribute defined since earlier
-            var attributes = type.InheritedAttributes;
+            var attributes = type.GetAttributes(true);
             dynamic? xmlTypeAttribute = attributes.FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlTypeAttribute");
 
             var itemName = GetXmlItemName(type.OriginalType);
@@ -73,14 +73,14 @@ public static void GenerateXmlObjectForProperty(this JsonSchemaProperty property
 
             if (propertySchema.IsArray)
             {
-                dynamic? xmlArrayAttribute = type.Attributes.FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlArrayAttribute");
+                dynamic? xmlArrayAttribute = type.GetContextOrTypeAttributes<Attribute>(true).FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlArrayAttribute");
                 if (xmlArrayAttribute != null)
                 {
                     xmlName = xmlArrayAttribute.ElementName;
                     xmlNamespace = xmlArrayAttribute.Namespace;
                 }
 
-                dynamic? xmlArrayItemsAttribute = type.Attributes.FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlArrayItemAttribute");
+                dynamic? xmlArrayItemsAttribute = type.GetContextOrTypeAttributes<Attribute>(true).FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlArrayItemAttribute");
                 if (xmlArrayItemsAttribute != null)
                 {
                     var xmlItemName = xmlArrayItemsAttribute.ElementName;
@@ -92,14 +92,14 @@ public static void GenerateXmlObjectForProperty(this JsonSchemaProperty property
                 xmlWrapped = true;
             }
 
-            dynamic? xmlElementAttribute = type.Attributes.FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlElementAttribute");
+            dynamic? xmlElementAttribute = type.GetContextOrTypeAttributes<Attribute>(true).FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlElementAttribute");
             if (xmlElementAttribute != null)
             {
                 xmlName = xmlElementAttribute.ElementName;
                 xmlNamespace = xmlElementAttribute.Namespace;
             }
 
-            dynamic? xmlAttribute = type.Attributes.FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlAttributeAttribute");
+            dynamic? xmlAttribute = type.GetContextOrTypeAttributes<Attribute>(true).FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlAttributeAttribute");
             if (xmlAttribute != null)
             {
                 if (!string.IsNullOrEmpty(xmlAttribute.AttributeName))
@@ -117,7 +117,7 @@ public static void GenerateXmlObjectForProperty(this JsonSchemaProperty property
             // We need to ensure that the property name is preserved
             if (string.IsNullOrEmpty(xmlName) && propertySchema.Type == JsonObjectType.None)
             {
-                dynamic? xmlReferenceTypeAttribute = type.InheritedAttributes.FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlTypeAttribute");
+                dynamic? xmlReferenceTypeAttribute = type.GetAttributes(true).FirstAssignableToTypeNameOrDefault("System.Xml.Serialization.XmlTypeAttribute");
                 if (xmlReferenceTypeAttribute != null)
                 {
                     xmlName = propertyName;

diff --git a/src/NJsonSchema/JsonReferenceResolver.cs b/src/NJsonSchema/JsonReferenceResolver.cs
@@ -309,7 +309,7 @@ private async Task<IJsonReference> ResolveUrlReferenceWithAlreadyResolvedCheckAs
                 foreach (var member in obj
                     .GetType()
                     .GetContextualAccessors()
-                    .Where(p => p.AccessorType.GetInheritedAttribute<JsonIgnoreAttribute>() == null))
+                    .Where(p => p.IsAttributeDefined<JsonIgnoreAttribute>(true) == false))
                 {
                     var pathSegment = member.GetName();
                     if (pathSegment == firstSegment)