Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
</Reference>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.2.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.2\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
</Reference>
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion AgileMapper.PerformanceTester.Net45/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net452" />
<package id="AgileObjects.ReadableExpressions" version="2.3.1" targetFramework="net452" />
<package id="AgileObjects.ReadableExpressions" version="2.3.2" targetFramework="net452" />
<package id="AutoMapper" version="7.0.1" targetFramework="net452" />
<package id="Expressmapper" version="1.9.1" targetFramework="net452" />
<package id="Mapster" version="3.3.1" targetFramework="net452" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net35\AgileObjects.NetStandardPolyfills.dll</HintPath>
</Reference>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.1\lib\net35\AgileObjects.ReadableExpressions.dll</HintPath>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.2.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.2\lib\net35\AgileObjects.ReadableExpressions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Dynamic, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Dynamic.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion AgileMapper.UnitTests.Net35/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net35" />
<package id="AgileObjects.ReadableExpressions" version="2.3.1" targetFramework="net35" />
<package id="AgileObjects.ReadableExpressions" version="2.3.2" targetFramework="net35" />
<package id="DynamicLanguageRuntime" version="1.1.2" targetFramework="net35" />
<package id="NUnit" version="3.6.1" targetFramework="net35" />
<package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net35" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
</Reference>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.2.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.2\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion AgileMapper.UnitTests.NonParallel/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net461" />
<package id="AgileObjects.ReadableExpressions" version="2.3.1" targetFramework="net461" />
<package id="AgileObjects.ReadableExpressions" version="2.3.2" targetFramework="net461" />
<package id="xunit" version="2.4.1" targetFramework="net461" />
<package id="xunit.abstractions" version="2.0.3" targetFramework="net461" />
<package id="xunit.analyzers" version="0.10.0" targetFramework="net461" />
Expand Down
4 changes: 2 additions & 2 deletions AgileMapper.UnitTests/AgileMapper.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
</Reference>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
<Reference Include="AgileObjects.ReadableExpressions, Version=2.3.2.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.2\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion AgileMapper.UnitTests/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net461" />
<package id="AgileObjects.ReadableExpressions" version="2.3.1" targetFramework="net461" />
<package id="AgileObjects.ReadableExpressions" version="2.3.2" targetFramework="net461" />
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
<package id="xunit" version="2.4.1" targetFramework="net461" />
Expand Down
2 changes: 1 addition & 1 deletion AgileMapper/AgileMapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.0" />
<PackageReference Include="AgileObjects.ReadableExpressions" Version="2.3.1" />
<PackageReference Include="AgileObjects.ReadableExpressions" Version="2.3.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net35'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ internal class DictionaryMappingConfigurator<TValue> :
ISourceDynamicTargetTypeSelector
#endif
{
private readonly MappingConfigInfo _configInfo;

internal DictionaryMappingConfigurator(MappingConfigInfo configInfo)
: base(configInfo)
{
_configInfo = configInfo;
}

#region Mapping Settings
Expand Down Expand Up @@ -102,24 +99,24 @@ private DictionaryMappingConfigurator<TValue> RegisterElementKeyPattern(

private MappingConfigInfo GetConfigInfo(DictionaryContext context)
{
return (_configInfo.TargetType != typeof(object))
? _configInfo.Copy().Set(context)
return (ConfigInfo.TargetType != typeof(object))
? ConfigInfo.Copy().Set(context)
: GetGlobalConfigInfo(context);
}

private MappingConfigInfo GetGlobalConfigInfo(DictionaryContext context)
=> _configInfo.Copy().ForAllRuleSets().ForAllTargetTypes().Set(context);
=> ConfigInfo.Copy().ForAllRuleSets().ForAllTargetTypes().Set(context);

#region AndWhenMapping

MappingConfigStartingPoint IGlobalDictionarySettings<TValue>.AndWhenMapping
=> new MappingConfigStartingPoint(_configInfo.MapperContext);
=> new MappingConfigStartingPoint(ConfigInfo.MapperContext);

public ISourceDictionaryTargetTypeSelector<TValue> AndWhenMapping => this;

#if FEATURE_DYNAMIC
MappingConfigStartingPoint IGlobalDynamicSettings.AndWhenMapping
=> new MappingConfigStartingPoint(_configInfo.MapperContext);
=> new MappingConfigStartingPoint(ConfigInfo.MapperContext);

ISourceDynamicTargetTypeSelector ISourceDynamicSettings.AndWhenMapping => this;
#endif
Expand All @@ -130,7 +127,7 @@ MappingConfigStartingPoint IGlobalDynamicSettings.AndWhenMapping
#region Dictionaries

public ISourceDictionaryMappingConfigurator<TValue, TTarget> To<TTarget>()
=> CreateDictionaryConfigurator<TTarget>(_configInfo.ForAllRuleSets());
=> CreateDictionaryConfigurator<TTarget>(ConfigInfo.ForAllRuleSets());

public ISourceDictionaryMappingConfigurator<TValue, TTarget> ToANew<TTarget>()
=> CreateDictionaryConfigurator<TTarget>(Constants.CreateNew);
Expand All @@ -143,7 +140,7 @@ public ISourceDictionaryMappingConfigurator<TValue, TTarget> Over<TTarget>()

private SourceDictionaryMappingConfigurator<TValue, TTarget> CreateDictionaryConfigurator<TTarget>(
string ruleSetName)
=> CreateDictionaryConfigurator<TTarget>(_configInfo.ForRuleSet(ruleSetName));
=> CreateDictionaryConfigurator<TTarget>(ConfigInfo.ForRuleSet(ruleSetName));

private static SourceDictionaryMappingConfigurator<TValue, TTarget> CreateDictionaryConfigurator<TTarget>(
MappingConfigInfo configInfo)
Expand All @@ -155,7 +152,7 @@ private static SourceDictionaryMappingConfigurator<TValue, TTarget> CreateDictio
#region Dynamics

ISourceDynamicMappingConfigurator<TTarget> ISourceDynamicTargetTypeSelector.To<TTarget>()
=> CreateDynamicConfigurator<TTarget>(_configInfo.ForAllRuleSets());
=> CreateDynamicConfigurator<TTarget>(ConfigInfo.ForAllRuleSets());

ISourceDynamicMappingConfigurator<TTarget> ISourceDynamicTargetTypeSelector.ToANew<TTarget>()
=> CreateDynamicConfigurator<TTarget>(Constants.CreateNew);
Expand All @@ -168,7 +165,7 @@ ISourceDynamicMappingConfigurator<TTarget> ISourceDynamicTargetTypeSelector.Over

private SourceDynamicMappingConfigurator<TTarget> CreateDynamicConfigurator<TTarget>(
string ruleSetName)
=> CreateDynamicConfigurator<TTarget>(_configInfo.ForRuleSet(ruleSetName));
=> CreateDynamicConfigurator<TTarget>(ConfigInfo.ForRuleSet(ruleSetName));

private static SourceDynamicMappingConfigurator<TTarget> CreateDynamicConfigurator<TTarget>(
MappingConfigInfo configInfo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public ICustomTargetDictionaryKeySpecifier<TSource, TValue> MapMember<TSourceMem

private QualifiedMember GetSourceMemberOrThrow(LambdaExpression lambda)
{
var sourceMember = lambda.Body.ToSourceMember(ConfigInfo.MapperContext);
var sourceMember = lambda.Body.ToSourceMember(MapperContext);

if (sourceMember != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public ICustomTargetDynamicMemberNameSpecifier<TSource> MapMember<TSourceMember>

private QualifiedMember GetSourceMemberOrThrow(LambdaExpression lambda)
{
var sourceMember = lambda.Body.ToSourceMember(ConfigInfo.MapperContext);
var sourceMember = lambda.Body.ToSourceMember(MapperContext);

if (sourceMember != null)
{
Expand Down
20 changes: 11 additions & 9 deletions AgileMapper/Api/Configuration/MappingConfigurator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public MappingConfigurator(MappingConfigInfo configInfo)

protected MapperContext MapperContext => ConfigInfo.MapperContext;

private UserConfigurationSet UserConfigurations => MapperContext.UserConfigurations;

#region IFullMappingInlineConfigurator Members

public MappingConfigStartingPoint WhenMapping
Expand Down Expand Up @@ -96,7 +98,7 @@ public IFullProjectionInlineConfigurator<TSource, TTarget> RecurseToDepth(int re
{
var depthSettings = new RecursionDepthSettings(ConfigInfo, recursionDepth);

ConfigInfo.MapperContext.UserConfigurations.Add(depthSettings);
UserConfigurations.Add(depthSettings);
return this;
}

Expand Down Expand Up @@ -213,7 +215,7 @@ private FactorySpecifier<TSource, TTarget, TObject> CreateFactorySpecifier<TObje

public IFullMappingSettings<TSource, TTarget> PassExceptionsTo(Action<IMappingExceptionData<TSource, TTarget>> callback)
{
MapperContext.UserConfigurations.Add(new ExceptionCallback(ConfigInfo, callback.ToConstantExpression()));
UserConfigurations.Add(new ExceptionCallback(ConfigInfo, callback.ToConstantExpression()));
return this;
}

Expand All @@ -223,13 +225,13 @@ public IFullMappingSettings<TSource, TTarget> PassExceptionsTo(Action<IMappingEx

private IFullMappingSettings<TSource, TTarget> SetMappedObjectCaching(bool cache)
{
MapperContext.UserConfigurations.Add(new MappedObjectCachingSetting(ConfigInfo, cache));
UserConfigurations.Add(new MappedObjectCachingSetting(ConfigInfo, cache));
return this;
}

public IFullMappingSettings<TSource, TTarget> MapNullCollectionsToNull()
{
MapperContext.UserConfigurations.Add(new NullCollectionsSetting(ConfigInfo));
UserConfigurations.Add(new NullCollectionsSetting(ConfigInfo));
return this;
}

Expand All @@ -239,7 +241,7 @@ public IFullMappingSettings<TSource, TTarget> MapNullCollectionsToNull()

private IFullMappingSettings<TSource, TTarget> SetEntityKeyMapping(bool mapKeys)
{
MapperContext.UserConfigurations.Add(new EntityKeyMappingSetting(ConfigInfo, mapKeys));
UserConfigurations.Add(new EntityKeyMappingSetting(ConfigInfo, mapKeys));
return this;
}

Expand All @@ -251,7 +253,7 @@ public IFullMappingSettings<TSource, TTarget> DoNotAutoReverseConfiguredDataSour

private IFullMappingSettings<TSource, TTarget> SetDataSourceReversal(bool reverse)
{
MapperContext.UserConfigurations.Add(new DataSourceReversalSetting(ConfigInfo, reverse));
UserConfigurations.Add(new DataSourceReversalSetting(ConfigInfo, reverse));
return this;
}

Expand Down Expand Up @@ -299,7 +301,7 @@ private MappingConfigContinuation<TSource, TTarget> IgnoreMembersByFilter(
#else
var configuredIgnoredMember = new ConfiguredIgnoredMember(ConfigInfo, memberFilter);
#endif
MapperContext.UserConfigurations.Add(configuredIgnoredMember);
UserConfigurations.Add(configuredIgnoredMember);

return new MappingConfigContinuation<TSource, TTarget>(ConfigInfo);
}
Expand All @@ -323,7 +325,7 @@ private MappingConfigContinuation<TSource, TTarget> IgnoreMembers(
#else
var configuredIgnoredMember = new ConfiguredIgnoredMember(ConfigInfo, targetMember);
#endif
MapperContext.UserConfigurations.Add(configuredIgnoredMember);
UserConfigurations.Add(configuredIgnoredMember);
ConfigInfo.NegateCondition();
}

Expand Down Expand Up @@ -461,7 +463,7 @@ private MappingConfigContinuation<TSource, TTarget> RegisterMapToNullCondition()
{
var condition = new MapToNullCondition(ConfigInfo);

MapperContext.UserConfigurations.Add(condition);
UserConfigurations.Add(condition);

return new MappingConfigContinuation<TSource, TTarget>(ConfigInfo);
}
Expand Down
6 changes: 3 additions & 3 deletions AgileMapper/Configuration/ConfiguredIgnoredMember.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
namespace AgileObjects.AgileMapper.Configuration
{
using System;
using DataSources;
using Members;
using ReadableExpressions;
#if NET35
using Microsoft.Scripting.Ast;
#else
using System.Linq.Expressions;
#endif
using DataSources;
using Members;
using ReadableExpressions;

internal class ConfiguredIgnoredMember :
UserConfiguredItemBase,
Expand Down
2 changes: 1 addition & 1 deletion AgileMapper/Configuration/MappingConfigInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

internal class MappingConfigInfo : ITypePair
{
private static readonly MappingRuleSet _allRuleSets = new MappingRuleSet("*", null, null, null, null, null, null);
private static readonly MappingRuleSet _allRuleSets = new MappingRuleSet("*");

public static readonly MappingConfigInfo AllRuleSetsSourceTypesAndTargetTypes =
AllRuleSetsAndSourceTypes(null).ForAllTargetTypes();
Expand Down
2 changes: 1 addition & 1 deletion AgileMapper/Configuration/MemberSelector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace AgileObjects.AgileMapper.Configuration
using NetStandardPolyfills;

/// <summary>
/// Provides a fluent interface to select members by their characteristics.
/// Provides a fluent interface to select target members by their characteristics.
/// </summary>
public class TargetMemberSelector
{
Expand Down
14 changes: 7 additions & 7 deletions AgileMapper/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Extensions.Internal;
using NetStandardPolyfills;
#if NET35
using Microsoft.Scripting.Ast;
#else
using System.Linq.Expressions;
#endif
using Extensions.Internal;
using NetStandardPolyfills;

internal static class Constants
{
Expand All @@ -23,13 +23,13 @@ internal static class Constants

public static readonly Expression EmptyExpression = Expression.Empty();

public const string CreateNew = "CreateNew";
public const string CreateNew = nameof(CreateNew);

public const string Merge = "Merge";
public const string Merge = nameof(Merge);

public const string Overwrite = "Overwrite";
public const string Overwrite = nameof(Overwrite);

public const string Project = "Project";
public const string Project = nameof(Project);

public const int BeforeLoopExitCheck = 0;

Expand Down Expand Up @@ -57,7 +57,7 @@ internal static class Constants
typeof(ulong)
};

public static readonly Type[] NumericTypes = WholeNumberNumericTypes
public static readonly IList<Type> NumericTypes = WholeNumberNumericTypes
.Append(new[] { typeof(float), typeof(decimal), typeof(double) });

public static readonly IDictionary<Type, double> NumericTypeMaxValuesByType = GetValuesByType("MaxValue");
Expand Down
4 changes: 2 additions & 2 deletions AgileMapper/DataSources/ConfiguredDataSource.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
namespace AgileObjects.AgileMapper.DataSources
{
using Extensions.Internal;
using Members;
#if NET35
using Microsoft.Scripting.Ast;
#else
using System.Linq.Expressions;
#endif
using Extensions.Internal;
using Members;

internal class ConfiguredDataSource : DataSourceBase, IConfiguredDataSource
{
Expand Down
2 changes: 2 additions & 0 deletions AgileMapper/DataSources/DataSourceBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ private static bool IsNotOptionalEntityMemberId(IMemberMapperData mapperData)

public bool IsConditional => Condition != null;

public virtual bool IsFallback => false;

public virtual Expression Condition { get; }

public ICollection<ParameterExpression> Variables { get; }
Expand Down
Loading