Get rid of TypeInfo (#84)

destructurama · Jan 24, 2024 · 3e081e6 · 3e081e6
1 parent 6adae75
commit 3e081e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/Destructurama.Attributed/Attributed/AttributedDestructuringPolicy.cs b/src/Destructurama.Attributed/Attributed/AttributedDestructuringPolicy.cs
@@ -48,8 +48,7 @@ public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyV
 
     private CacheEntry CreateCacheEntry(Type type)
     {
-        var ti = type.GetTypeInfo();
-        var classDestructurer = ti.GetCustomAttribute<ITypeDestructuringAttribute>();
+        var classDestructurer = type.GetCustomAttribute<ITypeDestructuringAttribute>();
         if (classDestructurer != null)
             return new(classDestructurer.CreateLogEventPropertyValue);
 

diff --git a/src/Destructurama.Attributed/Util/AttributeFinder.cs b/src/Destructurama.Attributed/Util/AttributeFinder.cs
@@ -18,7 +18,7 @@ namespace Destructurama.Util;
 
 internal static class AttributeFinder
 {
-    public static T GetCustomAttribute<T>(this TypeInfo typeInfo) =>
+    public static T GetCustomAttribute<T>(this Type typeInfo) =>
         typeInfo.GetCustomAttributes().OfType<T>().FirstOrDefault();
 
     public static T GetCustomAttribute<T>(this PropertyInfo propertyInfo) =>

diff --git a/src/Destructurama.Attributed/Util/GetablePropertyFinder.cs b/src/Destructurama.Attributed/Util/GetablePropertyFinder.cs
@@ -22,14 +22,11 @@ public static IEnumerable<PropertyInfo> GetPropertiesRecursive(this Type type)
     {
         var seenNames = new HashSet<string>();
 
-        var currentTypeInfo = type.GetTypeInfo();
-
-        while (currentTypeInfo.AsType() != typeof(object))
+        while (type != typeof(object))
         {
-            var unseenProperties = currentTypeInfo.DeclaredProperties
+            var unseenProperties = type.GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)
                 .Where(p => p.CanRead &&
                             p.GetMethod.IsPublic &&
-                            !p.GetMethod.IsStatic &&
                             (p.Name != "Item" || p.GetIndexParameters().Length == 0) &&
                             !seenNames.Contains(p.Name));
 
@@ -39,7 +36,7 @@ public static IEnumerable<PropertyInfo> GetPropertiesRecursive(this Type type)
                 yield return propertyInfo;
             }
 
-            currentTypeInfo = currentTypeInfo.BaseType.GetTypeInfo();
+            type = type.BaseType;
         }
     }
 }