fix: Ensure NullValuePropertyMappingStrategy.SET_TO_DEFAULT initializes empty collection/map when target is null#3871
Merged
filiphr merged 3 commits intomapstruct:mainfrom Jun 15, 2025
Conversation
…es empty collection/map when target is null Signed-off-by: TangYang <[email protected]>
Contributor
Author
|
@filiphr There was a fixture test about I think the bug may be related to this comment，but to be honest, I don’t quite understand what this sentence means. It's correct for SET_TO_NULL and IGNORE, and the else branch should not be generated. But it doesn't apply to SET_TO_DEFAULT
|
filiphr
requested changes
Jun 14, 2025
Member
filiphr
left a comment
filiphr
left a comment
There was a problem hiding this comment.
Looks good to me @tangyang9464. Some small comments to clean up the test a bit before we merge it
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
processor/src/test/java/org/mapstruct/ap/test/bugs/_3865/Issue3865Test.java
Outdated
Show resolved
Hide resolved
1. Remove useless properties and assertions 2. Replace isNotNull with isNotEmpty
Contributor
Author
|
@filiphr added two commit. plz review again |
filiphr
approved these changes
Jun 15, 2025
Member
filiphr
left a comment
filiphr
left a comment
There was a problem hiding this comment.
Thanks for the changes @tangyang9464
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix: #3884
When both source and target Map/List properties are null and
nullValuePropertyMappingStrategy is SET_TO_DEFAULT, the target property should be set to an empty collection instead of remaining null.This commit adds the necessary else branch to
ExistingInstanceSetterWrapperForCollectionsAndMaps.ftlto handle this case correctly.