Removed extension PropertyInfo.HasAttribute in favor of builtin IsDef…

…ined
domaindrivendev · Apr 14, 2024 · 638d825 · 638d825
1 parent a6dba76
commit 638d825
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonSerializerDataContractResolver.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonSerializerDataContractResolver.cs
@@ -166,8 +166,8 @@ private IEnumerable<DataProperty> GetDataPropertiesFor(Type objectType, out Type
                     return
                         (property.IsPubliclyReadable() || property.IsPubliclyWritable()) &&
                         !(property.GetIndexParameters().Any()) &&
-                        !(property.HasAttribute<JsonIgnoreAttribute>() && isIgnoredViaNet5Attribute) &&
-                        !(property.HasAttribute<SwaggerIgnoreAttribute>()) &&
+                        !(property.IsDefined(typeof(JsonIgnoreAttribute)) && isIgnoredViaNet5Attribute) &&
+                        !(property.IsDefined(typeof(SwaggerIgnoreAttribute))) &&
                         !(_serializerOptions.IgnoreReadOnlyProperties && !property.IsPubliclyWritable());
                 })
                 .OrderBy(property => property.DeclaringType.GetInheritanceChain().Length);
@@ -176,7 +176,7 @@ private IEnumerable<DataProperty> GetDataPropertiesFor(Type objectType, out Type
 
             foreach (var propertyInfo in applicableProperties)
             {
-                if (propertyInfo.HasAttribute<JsonExtensionDataAttribute>()
+                if (propertyInfo.IsDefined(typeof(JsonExtensionDataAttribute))
                     && propertyInfo.PropertyType.IsConstructedFrom(typeof(IDictionary<,>), out Type constructedDictionary))
                 {
                     extensionDataType = constructedDictionary.GenericTypeArguments[1];

diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/PropertyInfoExtensions.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/PropertyInfoExtensions.cs
@@ -5,12 +5,6 @@ namespace Swashbuckle.AspNetCore.SwaggerGen
 {
     public static class PropertyInfoExtensions
     {
-        public static bool HasAttribute<TAttribute>(this PropertyInfo property)
-            where TAttribute : Attribute
-        {
-            return property.GetCustomAttribute<TAttribute>() != null;
-        }
-
         public static bool IsPubliclyReadable(this PropertyInfo property)
         {
             return property.GetMethod?.IsPublic == true;