fix compile ForDestinationType

Yoshka · Feb 12, 2019 · c2d96d9 · c2d96d9
1 parent 770a989
commit c2d96d9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/Mapster.Tests/WhenPerformingAfterMapping.cs b/src/Mapster.Tests/WhenPerformingAfterMapping.cs
@@ -46,6 +46,16 @@ public void After_Mapping_With_DestinationType_Setting()
  result.IsValidated.ShouldBeTrue();
  }
 
+
+ [TestMethod]
+ public void No_Compile_Error_When_ConstructUsing_ForDestinationType()
+ {
+ TypeAdapterConfig.GlobalSettings.ForDestinationType<IValidatable>()
+ .ConstructUsing(() => new SimpleDto());
+ TypeAdapterConfig.GlobalSettings.Compile();
+ }
+
+
  public interface IValidatable
  {
  void Validate();

diff --git a/src/Mapster/TypeAdapterConfig.cs b/src/Mapster/TypeAdapterConfig.cs
@@ -40,15 +40,15 @@ private static List<TypeAdapterRule> CreateRuleTemplate()
  Settings = new TypeAdapterSettings
  {
  //match exact name
- NameMatchingStrategy = NameMatchingStrategy.Exact, 
+ NameMatchingStrategy = NameMatchingStrategy.Exact,
  ShouldMapMember =
  {
  ShouldMapMember.IgnoreAdaptIgnore, //ignore AdaptIgnore attribute
  ShouldMapMember.AllowPublic, //match public prop
  ShouldMapMember.AllowAdaptMember, //match AdaptMember attribute
- }, 
- GetMemberNames = 
- { 
+ },
+ GetMemberNames =
+ {
  GetMemberName.AdaptMember, //get name using AdaptMember attribute
  },
  ValueAccessingStrategies =
@@ -112,7 +112,7 @@ public TypeAdapterSetter When(Func<Type, Type, MapType, bool> canMap)
  return new TypeAdapterSetter(rule.Settings, this);
  }
 
- public TypeAdapterSetter When(Func<PreCompileArgument, bool> canMap) 
+ public TypeAdapterSetter When(Func<PreCompileArgument, bool> canMap)
  {
  var rule = new TypeAdapterRule
  {
@@ -216,7 +216,7 @@ private static TypeAdapterRule CreateDestinationTypeRule(TypeTuple key)
  score--;
  type1 = type1.GetTypeInfo().BaseType;
  }
- return type1 == null ? null : (int?) score;
+ return type1 == null ? null : (int?)score;
  }
  if (!allowInheritance)
  return null;
@@ -328,10 +328,10 @@ private MethodCallExpression CreateProjectionCallExpression(TypeTuple tuple)
  var lambda = CreateMapExpression(tuple, MapType.Projection);
  var source = Expression.Parameter(typeof(IQueryable<>).MakeGenericType(tuple.Source));
  var methodInfo = (from method in typeof(Queryable).GetMethods()
-  where method.Name == nameof(Queryable.Select)
-  let p = method.GetParameters()[1]
-  where p.ParameterType.GetGenericArguments()[0].GetGenericTypeDefinition() == typeof(Func<,>)
-  select method).First().MakeGenericMethod(tuple.Source, tuple.Destination);
+ where method.Name == nameof(Queryable.Select)
+ let p = method.GetParameters()[1]
+ where p.ParameterType.GetGenericArguments()[0].GetGenericTypeDefinition() == typeof(Func<,>)
+ select method).First().MakeGenericMethod(tuple.Source, tuple.Destination);
  return Expression.Call(methodInfo, source, Expression.Quote(lambda));
  }
 
@@ -345,7 +345,7 @@ private static LambdaExpression CreateMapExpression(CompileArgument arg, bool al
  if (allowNull)
  return null;
  else
- throw new CompileException(arg, 
+ throw new CompileException(arg,
  new InvalidOperationException("ConverterFactory is not found"));
  }
  try
@@ -484,6 +484,8 @@ public void Compile()
  var keys = RuleMap.Keys.ToList();
  foreach (var key in keys)
  {
+ if (key.Source == typeof(void))
+ continue;
  _mapDict[key] = Compiler(CreateMapExpression(key, MapType.Map));
  _mapToTargetDict[key] = Compiler(CreateMapExpression(key, MapType.MapToTarget));
  }
@@ -608,7 +610,7 @@ public TypeAdapterConfig Clone()
  if (config != null)
  return (TypeAdapterConfig)config;
 
- lock(_inlineConfigs)
+ lock (_inlineConfigs)
  {
  config = _inlineConfigs[key];
  if (config != null)