Fix deserialization ExclusionStrategy incorrectly affecting serialization (#2190)#3020
Open
Vikashksingh1308 wants to merge 2 commits intogoogle:mainfrom
Open
Conversation
…tion (google#2190) When a deserialization only ExclusionStrategy excludes a runtime subtype, the Excluder's wrapping TypeAdapter was not recognized as reflective by TypeAdapterRuntimeTypeWrapper, causing custom serializers to be ignored. - Excluder: anonymous TypeAdapter now extends SerializationDelegatingTypeAdapter - TypeAdapterRuntimeTypeWrapper: use isReflective() instead of bare instanceof check
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
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
1 participant
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.
Fixes #2190
Problem
When a deserialization-only 'ExclusionStrategy' excludes a runtime subtype (e.g. 'Sub'), the 'Excluder' creates a wrapping 'TypeAdapter' for 'Sub' that delegates to the reflective adapter for serialization. However
TypeAdapterRuntimeTypeWrapperdid not recognise this wrapper as reflective, so it incorrectly preferred it over a user-registered custom 'TypeAdapter', producing wrong serialization output.Fix
Excluder.java: The anonymousTypeAdapternow extendsSerializationDelegatingTypeAdapterso theisReflective()traversal correctly sees through itTypeAdapterRuntimeTypeWrapper.java: Changed the check from bareinstanceof ReflectiveTypeAdapterFactory.Adapterto!isReflective()for consistency and correctnessTypeAdapterRuntimeTypeWrapperTest.java: Added regression testtestDeserializationExclusionStrategy_CustomBaseAdaptercovering this caseTesting
All existing tests pass and new regression test added