Skip to content

Remove unnecessary usage of GetTypeInfo #859

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
merged 1 commit into from
Mar 2, 2023
Merged

Remove unnecessary usage of GetTypeInfo #859

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/MediatR/Registration/ServiceRegistrar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ private static bool CanBeCastTo(this Type pluggedType, Type pluginType)

if (pluggedType == pluginType) return true;

return pluginType.GetTypeInfo().IsAssignableFrom(pluggedType.GetTypeInfo());
return pluginType.IsAssignableFrom(pluggedType);
}

private static bool IsOpenGeneric(this Type type)
{
return type.GetTypeInfo().IsGenericTypeDefinition || type.GetTypeInfo().ContainsGenericParameters;
return type.IsGenericTypeDefinition || type.ContainsGenericParameters;
}

private static IEnumerable<Type> FindInterfacesThatClose(this Type pluggedType, Type templateType)
Expand All @@ -176,33 +176,33 @@ private static IEnumerable<Type> FindInterfacesThatClosesCore(Type pluggedType,

if (!pluggedType.IsConcrete()) yield break;

if (templateType.GetTypeInfo().IsInterface)
if (templateType.IsInterface)
{
foreach (
var interfaceType in
pluggedType.GetInterfaces()
.Where(type => type.GetTypeInfo().IsGenericType && (type.GetGenericTypeDefinition() == templateType)))
.Where(type => type.IsGenericType && (type.GetGenericTypeDefinition() == templateType)))
{
yield return interfaceType;
}
}
else if (pluggedType.GetTypeInfo().BaseType!.GetTypeInfo().IsGenericType &&
(pluggedType.GetTypeInfo().BaseType!.GetGenericTypeDefinition() == templateType))
else if (pluggedType.BaseType!.IsGenericType &&
(pluggedType.BaseType!.GetGenericTypeDefinition() == templateType))
{
yield return pluggedType.GetTypeInfo().BaseType!;
yield return pluggedType.BaseType!;
}

if (pluggedType.GetTypeInfo().BaseType == typeof(object)) yield break;
if (pluggedType.BaseType == typeof(object)) yield break;

foreach (var interfaceType in FindInterfacesThatClosesCore(pluggedType.GetTypeInfo().BaseType!, templateType))
foreach (var interfaceType in FindInterfacesThatClosesCore(pluggedType.BaseType!, templateType))
{
yield return interfaceType;
}
}

private static bool IsConcrete(this Type type)
{
return !type.GetTypeInfo().IsAbstract && !type.GetTypeInfo().IsInterface;
return !type.IsAbstract && !type.IsInterface;
}

private static void Fill<T>(this IList<T> list, T value)
Expand Down