Merge Fix: Fix split logic of canonical into url and version in several places #1663
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
Removed - org.hl7.fhir.r4b.renderers.DataRenderer#versionFromCanonical - org.hl7.fhir.r4b.renderers.DataRenderer#systemFromCanonical - org.hl7.fhir.r5.renderers.DataRenderer#versionFromCanonical - org.hl7.fhir.r5.renderers.DataRenderer#systemFromCanonical The logic of these methods is wrong, the functionality of extracting the version and the system URL have been swapped. Therefore, all usages of aforementioned methods were replaced by the use of org.hl7.fhir.utilities.CanonicalPair. This not only fixes the problem, but also reduces duplicated functionality.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1663 +/- ##
=========================================
Coverage 12.23% 12.23%
- Complexity 31658 31672 +14
=========================================
Files 2198 2198
Lines 672883 672877 -6
Branches 198442 198441 -1
=========================================
+ Hits 82308 82331 +23
+ Misses 561123 561098 -25
+ Partials 29452 29448 -4 ☔ View full report in Codecov by Sentry. |
This was referenced Jun 20, 2024
markiantorno
added a commit
that referenced
this pull request
Jun 27, 2024
## Validator Changes * Change how count is calculated when expanding value sets * Fix value set expansion bugs * Fix for fhirpath issue on command line (#1650) * Add IG dependency validator * work around bad r4 extension definitions * don't reload different sub-version of extensions pack ## Other code changes * Rework rendering library from ground up * Merge Fix: Fix split logic of canonical into url and version in several places (#1663) * Suppress spurious message when code system is unknown * don't raise needless and wrong exceptions about extension definitions when rendering * fix duplicate link creation * Stop recursive rendering crash * Obligation rendering improvements * Handle extra profiles on resources in an IG when converting between versions * Fixed issue with actor title not rendering in obligations * Test and adaption for dateOp #1655 * Use assertj instead of hamcrest (#1662) * More transifex work * Add support for local packages during testing ***NO_CI***
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.
Fixes merge issues with #1619