GEODE-6196 Replace use of org.json with Jackson JSON library #3259
Conversation
This file contains 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
NOT READY FOR REVIEW This removes most of the code from TypedJson and replaces it with Jackson ObjectMapper. Type information for things like Enums isn't being generated in this commit. All TypedJson tests are passing as are QueryDataFunction tests (which is the only thing that uses TypedJson).
most of TypedJson's internals were replaced so I just renamed it to QueryResultFormatter to better show its intended purpose. Object traversal depth is now limited to the element-count being passed by the QueryDataFunction function. This will prevent the stack-overflow problems seen in GEODE-1842.
also reverting another test change that is no longer needed.
agingade
approved these changes
Mar 7, 2019
| // insert a RegionEntry serializer because they're too messy looking | ||
| mapperModule.addSerializer(Region.Entry.class, new RegionEntrySerializer()); | ||
|
|
||
| // mapper.setFilterProvider(new SimpleFilterProvider().setDefaultFilter(new DepthFilter(4))); |
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 removes TypedJson and replaces it with QueryResultFormatter that uses Jackson ObjectMapper to serialize query results into a JSON document. Custom serializers for collections, PdxInstance, query Structs, etc. do most of the work. It also wraps the default serializer in order to keep Jackson from going crazy if there is a circular reference and to limit the depth of serialization (GEODE-1842, which was never really fixed).
Most of the changes in this PR are replacing the TypedJson class name with QueryResultFormatter and changing the expected query result strings. The bulk of the code to be reviewed is in the new QueryResultFormatter class.
Thank you for submitting a contribution to Apache Geode.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
Has your PR been rebased against the latest commit within the target branch (typically
develop)?Is your initial contribution a single, squashed commit?
Does
gradlew buildrun cleanly?Have you written or updated unit tests to verify your changes?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.