3-way merge of cardinality of an element #1990
Merged
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
ewoutkramer
approved these changes
Feb 24, 2022
mmsmits
reviewed
Feb 24, 2022
| @@ -278,9 +308,9 @@ internal FhirString mergeMax(FhirString snap, FhirString diff) | |||
| return snap; | |||
| } | |||
|
|
|||
| private FhirString deepCopyAndRaiseOnConstraint(FhirString elt) | |||
| private T deepCopyAndRaiseOnConstraint<T>(T elt) where T : PrimitiveType | |||
mmsmits
approved these changes
Feb 24, 2022
marcovisserFurore
deleted the
feature/1981-max-cardinality-extensions-stu3
branch
Merged
marcovisserFurore
added a commit
that referenced
this pull request
Mar 2, 2022
Merged
marcovisserFurore
added a commit
that referenced
this pull request
Mar 3, 2022
Fix for PR #1990 (R4)
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.
Description
In PR #1826 we introduced a bug in existing functionality. We resolved that now by a 3-way merge of the cardinality of
The most constrained value will win. Let's say we have the following cardinalities on an element:
0..*1..*1..1Then the result cardinality of the element would be:
1..1This behavior is also applied to the "normal" merge of
Min: in the past the Min value of the differential was copied to the snapshot (when it exists). Now both Min values (snap and diff) are compared first, and the highest value wins.Related issues
Resolves #1981.
Testing
SnapshotGeneratorTest2.TestMinMaxSnapshotGeneratorTest2.CardinalityOfExtensionFirelyTeam Checklist