Move GetAllInterfaces to ReflectionUtils

src/Mapster.Tests/DynamicTypeGeneratorTests.cs

@@ -8,7 +8,6 @@ namespace Mapster.Tests
  [TestClass]
  public class DynamicTypeGeneratorTests
  {
-
  private interface INotVisibleInterface
  {
  int Id { get; set; }
@@ -58,7 +57,6 @@ public void CreateTypeForSimpleInterface()
  ISimpleInterface instance = (ISimpleInterface)Activator.CreateInstance(iClass);
 
  instance.ShouldNotBeNull();
- instance.ShouldBeAssignableTo<ISimpleInterface>();
 
  instance.Id = 42;
  instance.Name = "Lorem ipsum";
@@ -75,7 +73,6 @@ public void CreateTypeForInheritedInterface()
  IInheritedInterface instance = (IInheritedInterface)Activator.CreateInstance(iClass);
 
  instance.ShouldNotBeNull();
- instance.ShouldBeAssignableTo<IInheritedInterface>();
 
  instance.Id = 42;
  instance.Name = "Lorem ipsum";
@@ -94,7 +91,6 @@ public void CreateTypeForComplexInterface()
  IComplexInterface instance = (IComplexInterface)Activator.CreateInstance(iClass);
 
  instance.ShouldNotBeNull();
- instance.ShouldBeAssignableTo<IComplexInterface>();
 
  instance.Id = 42;
  instance.Name = "Lorem ipsum";

src/Mapster/Utils/DynamicTypeGenerator.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Threading;
@@ -47,7 +46,7 @@ private static Type CreateTypeForInterface(Type interfaceType)
  {
  TypeBuilder builder = _moduleBuilder.DefineType("GeneratedType_" + Interlocked.Increment(ref _generatedCounter));
 
- foreach (Type currentInterface in GetAllInterfaces(interfaceType))
+ foreach (Type currentInterface in ReflectionUtils.GetAllInterfaces(interfaceType))
  {
  builder.AddInterfaceImplementation(currentInterface);
  foreach (PropertyInfo prop in currentInterface.GetProperties())
@@ -71,30 +70,6 @@ private static Type CreateTypeForInterface(Type interfaceType)
 #endif
  }
 
- // GetProperties() and GetMethods() do not return properties/methods from parent interfaces,
- // so we need to process every one of them.
- private static IEnumerable<Type> GetAllInterfaces(Type interfaceType)
- {
- var allInterfaces = new List<Type>();
- var interfaceQueue = new Queue<Type>();
- allInterfaces.Add(interfaceType);
- interfaceQueue.Enqueue(interfaceType);
- while (interfaceQueue.Count > 0)
- {
- var currentInterface = interfaceQueue.Dequeue();
- foreach (var subInterface in currentInterface.GetInterfaces())
- {
- if (allInterfaces.Contains(subInterface))
- {
- continue;
- }
- allInterfaces.Add(subInterface);
- interfaceQueue.Enqueue(subInterface);
- }
- }
- return allInterfaces;
- }
-
  private static void CreateProperty(Type interfaceType, TypeBuilder builder, PropertyInfo prop)
  {
  const BindingFlags interfacePropMethodFlags = BindingFlags.Instance | BindingFlags.Public;

src/Mapster/Utils/ReflectionUtils.cs

@@ -84,18 +84,57 @@ public static IEnumerable<IMemberModelEx> GetFieldsAndProperties(this Type type,
  {
  var bindingFlags = BindingFlags.Instance | accessorFlags;
 
- var properties = type.GetProperties(bindingFlags)
+ IEnumerable<IMemberModelEx> getPropertiesFunc(Type t) => t.GetProperties(bindingFlags)
  .Where(x => x.GetIndexParameters().Length == 0)
  .Where(x => !requireSetter || x.CanWrite)
  .Select(CreateModel);
 
- var fields = type.GetFields(bindingFlags)
+ IEnumerable<IMemberModelEx> getFieldsFunc(Type t) => t.GetFields(bindingFlags)
  .Where(x => !requireSetter || !x.IsInitOnly)
  .Select(CreateModel);
 
+ IEnumerable<IMemberModelEx> properties;
+ IEnumerable<IMemberModelEx> fields;
+
+ if (type.IsInterface)
+ {
+ IEnumerable<Type> allInterfaces = GetAllInterfaces(type);
+ properties = allInterfaces.SelectMany(currentInterface => getPropertiesFunc(currentInterface));
+ fields = allInterfaces.SelectMany(currentInterface => getFieldsFunc(currentInterface));
+ }
+ else
+ {
+ properties = getPropertiesFunc(type);
+ fields = getFieldsFunc(type);
+ }
+
  return properties.Concat(fields);
  }
 
+ // GetProperties(), GetFields(), GetMethods() do not return properties/methods from parent interfaces,
+ // so we need to process every one of them separately.
+ public static IEnumerable<Type> GetAllInterfaces(Type interfaceType)
+ {
+ var allInterfaces = new List<Type>();
+ var interfaceQueue = new Queue<Type>();
+ allInterfaces.Add(interfaceType);
+ interfaceQueue.Enqueue(interfaceType);
+ while (interfaceQueue.Count > 0)
+ {
+ var currentInterface = interfaceQueue.Dequeue();
+ foreach (var subInterface in currentInterface.GetInterfaces())
+ {
+ if (allInterfaces.Contains(subInterface))
+ {
+ continue;
+ }
+ allInterfaces.Add(subInterface);
+ interfaceQueue.Enqueue(subInterface);
+ }
+ }
+ return allInterfaces;
+ }
+
  public static bool IsCollection(this Type type)
  {
  return typeof(IEnumerable).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()) && type != typeof(string);