Skip to content

Get rid of TypeInfo #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sungam3r merged 3 commits into from
Jan 24, 2024
Merged

Get rid of TypeInfo #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ba2dbc
Get rid of TypeInfo
sungam3r Jan 22, 2024
366f716
Merge branch 'master' into typeinfo
sungam3r Jan 22, 2024
215d744
Merge branch 'master' into typeinfo
sungam3r Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Destructurama.Attributed/Attributed/AttributedDestructuringPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/Destructurama.Attributed/Util/AttributeFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) =>
Expand Down
9 changes: 3 additions & 6 deletions src/Destructurama.Attributed/Util/GetablePropertyFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -39,7 +36,7 @@ public static IEnumerable<PropertyInfo> GetPropertiesRecursive(this Type type)
yield return propertyInfo;
}

currentTypeInfo = currentTypeInfo.BaseType.GetTypeInfo();
type = type.BaseType;
}
}
}