Fix JsonEx::Merge to handle chunked properties #7490
+208
−5
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 fix makes JsonEx::Merge aware of chunked properties and make sure the merged result cleans up "left over" checked properties.
createOptionsis one of these chunked properties that needs special handling when merging. If merging a JSON-object that containscreateOptionsandcreateOptions01with a JSON-object that ONLY containscreateOptionsthe original implementation ofMerge(...)will keepcreateOptions01the the base JSON-object. From a JSON perspective this is correct but from a JSON-object which the chunked propertycreateOptionsthis is wrong.The pull-request contains added test-cases for JsonEx::Merge that shows how it handled chunked properties, for example
createOptions.Azure IoT Edge PR checklist:
This checklist is used to make sure that common guidelines for a pull request are followed.
General Guidelines and Best Practices
Testing Guidelines
Draft PRs
Draftmode if it is:Note: We use the kodiakhq bot to merge PRs once the necessary checks and approvals are in place. When it merges a PR, kodiakhq converts the PR title to the commit title, PR description to the commit description, and squashes all the commits in the PR to a single commit. The net effect is that entire PR becomes a single commit. Please follow the best practices mentioned here for the PR title and description