SO-4264: use JSON patch to apply property conflicts during merge #680
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
…rops-change-tracking
Apply recognized property diff conflict resolutions as JSON patch directly on the source document.
ivelina-yordanova
referenced
this pull request
in babylonhealth/snow-owl
Oct 7, 2020
* SO-4034: Add field aliases for CodeSystemEntry's 'name' property * SO-4246: Allow limiting concept map compare results * SO-4034: Add utility method to split paths to segments * SO-4034: Allow searching code systems by name * SO-4034 Exposed ConstraintViolationImpl class for custom validations. * SO-4207: add conatinerURI and memberId to ConceptMapMapping * SO-4207: add new ConceptMapMapping props to builder * SO-4207: add referencedComponentId and mapTarget filter to ConceptMapMappingSearcher * SO-4207: add referencedComponentId and mapTarget filter to ConceptMapMappingSearcher * SO-4207: fetch every refSet when set filter is not set * SO-4207: support filtering by source or target component id * SO-4207: add test-case for reference set member component filter * SO-4265: expand selected snomed display term type instead of hard-coded pt() * [releng] prepare 7.10.0-SNAPSHOT * SO-4268: Move generic SNOMED CT validation rules to snowowl repository * SO-4207: fixing minor model and API issues * [index] commit progress on analyzer improvements * [validation] - exclude inactive concept from the scope of rulec * SO-4274: Allow reusing of fsn expand logic by other classes * SO-4282: Log unexpected exceptions in ClassificationJobRequest * SO-4282: Store the message of the causing Exception as an additional... ...info key in ReasonerApiException * SO-4282: Fix registration of special axioms (GCI, ... ...TransitiveObjectProperty, property chaining etc.) * [conceptMap]: store container set uri as snomed concept * [validation] Preserve locale order in computing issue labels * SO-4246: Set default limit to concept map compare results (5000) https://snowowl.atlassian.net/browse/SO-4246 * Revert "[conceptMap]: store container set uri as snomed concept" This reverts commit 44e3b60. * [snomed] move SnomedDisplayTermType to snomed.core * [conceptMap] add option to set preferred display to show * [conceptMap] use the configured display term type * [conceptMap] use the reference set's map target as term * SO-4246: Expose limit on ConceptMapCompareResult https://snowowl.atlassian.net/browse/SO-4246 * SO-4274: Move description ordering logic to separate class https://snowowl.atlassian.net/browse/SO-4274 * [cis] decrease CIS bulk request size to 10_000 ids * [cis] do not report incorrect status when registering IDs in CIS client * [snomed] fix owlExpressions() expand in member converter * SO-3917: Change meaning of -a flag in CIS status update script * [folder deletion] Make DeleteRequest public * [conceptMap] fetch reference set term to display on editor * [validation] Move rule 113 from SNOMED CT common validation * [conceptMap] add target/container icon id to model * [conceptMap] fetch icon ids by SnomedConceptMapSearchRequestEvaluator * [conceptMap] refactor code * [snomed] Refactor indexBestPreferredByConceptId method - the old method which extracted preferred language refset ids for a given description could throw NSE in case the description did not have any preferred language refset members (see: Maps.filterValues(description.getAcceptabilityMap(), Predicates.equalTo(Acceptability.PREFERRED)).keySet()) This could lead to a NPE when requesting best preferred description for a given concept - refactored and moved the method to SnomedDescriptionUtils - added unit tests for the expected behavior * [validation] Use indexBestPreferredByConceptId method when looking for validation issue labels - improved and simplified label fetching parts * [snomed] Do no return any preferred descriptions for a concept if ... ... the best hit does not have any members in the expected list of locales * [validation] Rename validation rule parameter * [validation] Fix typo * [validation] Set default value for ruleParameter in builder ... ... instead of request * [SnomedDisplayTermType] create custom method to get enum's value * [SnomedDisplayTermType] return ID_ONLY enum when value is not found * [snomed] Fix expand parameter building * [core] support ID prefix and ID regexp queries * SO-4264 #resolve Apply recognized property diff conflict resolutions as JSON patch directly on the source document. Use JSON patch to apply property conflicts during merge (#680) * SO-4264: add test for nested prop change tracking issue * SO-4264: add test case to verify merging of nested property on rebase * SO-4264: upgrade zjsonpatch to 0.4.11 * SO-4264: support document deserialization into JsonNode * [index] move tests around conflict detection/resolution to a new class * [index] serialize nested objects when adding them to commit details * [index] use either `add` or `replace` JSON patch operation... ...depending on whether the current JsonNode has the path or not. * [releng] update changelog with 7.10.0 changes * [releng] release 7.10.0 Co-authored-by: András Péteri <[email protected]> Co-authored-by: aalaswadi <[email protected]> Co-authored-by: Balazs Banfai <[email protected]> Co-authored-by: Kovacs Tamas <[email protected]> Co-authored-by: Mark Czotter <[email protected]> Co-authored-by: Gabor Nagy <[email protected]>
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.
No description provided.