Skip to content
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

Improvements to Ignore() processing and Fix MapToTarget behavior for RecordTypes #769

Open
wants to merge 19 commits into
base: development
Choose a base branch
from
+515 −57
Open

Improvements to Ignore() processing and Fix MapToTarget behavior for RecordTypes #769

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
623f940
add Ignor Ctor Param
DocSvartz Jan 21, 2025
5e9b8df
add Test
DocSvartz Jan 21, 2025
0685bb3
refactoring algorithm
DocSvartz Jan 22, 2025
fdf059a
add supporting Ignored() to readonly interface
DocSvartz Jan 22, 2025
6cf1320
add test Interface Ctor param Ignored()
DocSvartz Jan 22, 2025
7f6cdde
fix misprints
DocSvartz Jan 22, 2025
0f2302a
fix maToTarget behavior From RecordType
DocSvartz Jan 23, 2025
f8469e9
add To RecordTypeAdapter
DocSvartz Jan 23, 2025
d02756f
fix mapToTarget test from Record
DocSvartz Jan 23, 2025
15e710d
merge
DocSvartz Jan 24, 2025
564da6d
fix map to target from recordType
DocSvartz Jan 24, 2025
f29d935
update RecordType Tests
DocSvartz Jan 25, 2025
0c5384d
refactoring Map to target record
DocSvartz Jan 28, 2025
f5a3ce6
Fix error with Using Destination Value From Record Type
DocSvartz Jan 28, 2025
5c2d4a7
add Null check destination from mapToTarget RecordType
DocSvartz Feb 2, 2025
32f0a34
add support from RecordType
DocSvartz Feb 2, 2025
0711eb8
add Test for RecordType check
DocSvartz Feb 2, 2025
892c42f
fix null Check
Feb 3, 2025
23a5089
fix IgnoreNullValues for RecordType when used Map mapping
DocSvartz Feb 3, 2025
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
Prev Previous commit
Next Next commit
refactoring algorithm
  • Loading branch information
@DocSvartz
DocSvartz committed Jan 22, 2025
commit 0685bb31ad4175295292761fab993e78cf0db2b7
21 changes: 7 additions & 14 deletions src/Mapster/Adapters/BaseClassAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,25 +158,18 @@ protected Expression CreateInstantiationExpression(Expression source, ClassMappi
getter = Expression.Condition(condition, getter, defaultConst);
}
else
if (arg.Settings.Ignore.Count != 0)
if (arg.Settings.Ignore.Any(x => x.Key == member.DestinationMember.Name))
{
if (arg.MapType != MapType.MapToTarget && arg.Settings.Ignore.Any(x => x.Key == member.DestinationMember.Name))
getter = defaultConst;
getter = defaultConst;

if (arg.MapType == MapType.MapToTarget && arg.DestinationType.IsRecordType())
{
if (arg.Settings.Ignore.Any(x => x.Key == member.DestinationMember.Name))
{
var find = arg.DestinationType.GetFieldsAndProperties(arg.Settings.EnableNonPublicMembers.GetValueOrDefault()).ToArray()
.Where(x => x.Name == member.DestinationMember.Name).FirstOrDefault();

if (find != null)
getter = Expression.MakeMemberAccess(destination, (MemberInfo)find.Info);
}
else
getter = defaultConst;
}
var find = arg.DestinationType.GetFieldsAndProperties(arg.Settings.EnableNonPublicMembers.GetValueOrDefault()).ToArray()
DocSvartz marked this conversation as resolved.
Show resolved Hide resolved
.Where(x => x.Name == member.DestinationMember.Name).FirstOrDefault();

if (find != null)
getter = Expression.MakeMemberAccess(destination, (MemberInfo)find.Info);
}
}
}
arguments.Add(getter);
Expand Down
Loading