#3931 Fix @DeepClone to clone Date and Calendar instead of copying references - #4092
Open
kamilkrzywanski wants to merge 1 commit into
Open
#3931 Fix @DeepClone to clone Date and Calendar instead of copying references#4092kamilkrzywanski wants to merge 1 commit into
kamilkrzywanski wants to merge 1 commit into
Conversation
…opying references When DIRECT mapping is disabled (e.g. via @deepClone), java.util.Date and java.util.Calendar were still assigned by reference because types from the java package are treated as always-direct. Clone them instead so mutations on the source no longer affect the target.
filiphr
requested changes
Jul 25, 2026
filiphr
left a comment
Member
There was a problem hiding this comment.
Thanks for the PR @kamilkrzywanski. This might work for the use case. However, this is not the right solution for the problem at hand. There are other types that are mutable where we cannot do a direct assignment.
One can argue that we should perhaps always create a clone of the objects that are mutable. Are you interested in working on a right fix that would fix in the architecture of MapStruct? If not, then we'll have to reject the PR and work on a fix for this separately
Author
|
@filiphr thanks. Agreed this isn't the right approach. I won't be able to take on the broader fix, so please close if you prefer to handle it yourselves. |
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
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.
Summary
@Mapper(mappingControl = DeepClone.class),java.util.Datefields were assigned by reference (setDate(source.getDate())) instead of being cloned.DIRECTis disabled, types from thejavapackage are still treated as always-direct. That is correct for immutable types likeString, but wrong for mutableDate/Calendar.MappingResolverImpl: excludejava.util.Dateandjava.util.Calendarfrom the always-direct rule whenDIRECTis off, and emit an inline clone:Date→new Date(source.getTime())Calendar→((Calendar) source.clone())DIRECTenabled) are unchanged and still copy the reference.Generated code (after)
Test plan
Issue3931Test— Date/Calendar independence under@DeepClone, null handlingMappingControlTest— existing deep-clone / mapping-control behaviourDateConversionTest— normal Date conversion paths still pass