Add merge support for Scala collections #481
Merged
Conversation
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
|
@helfper I merged this to the master branch - which is being using to develop jackson 3. One of the MergeTest unit test fails on that branch. Could you have a look? |
Merged
|
@pjfanning There was an extra |
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.
This PR adds support for Jackson's merge feature to Scala collection deserializers. Closes #370
Not sure if this is the best way to go about it, but it's working properly in the examples I've tried. Merge support is done by implementing the method
JsonDeserializer.deserialize(JsonParser p, DeserializationContext ctxt, T intoValue)which takes the previous value to be updated/merged with the new fields coming from JSON. Support for Scala's Maps is particularly tricky becauseGenericMapFactoryDeserializerResolveris based onMapDeserializerwhich tries to accessMap.get(...)for deep merging, but Scala'sBuilderdoesn't have a get, so it wasn't straightforward to add agettoBuilderWrapper.