removed the option to be able to install embedded resources using the PackageInstallerSvcImpl #7298
+71
−10
Conversation
This file contains hidden or 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
Contributor
|
Formatting check succeeded! |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #7298 +/- ##
============================================
+ Coverage 83.41% 83.79% +0.37%
- Complexity 29193 30128 +935
============================================
Files 1843 1833 -10
Lines 113422 116456 +3034
Branches 14251 14762 +511
============================================
+ Hits 94608 97580 +2972
+ Misses 12730 12585 -145
- Partials 6084 6291 +207 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
qligier
reviewed
Oct 15, 2025
Comment on lines
588
to
614
| private final List<String> embeddedCodeSystems = List.of( | ||
| CommonCodeSystemsTerminologyService.LANGUAGES_CODESYSTEM_URL, | ||
| CommonCodeSystemsTerminologyService.MIMETYPES_CODESYSTEM_URL, | ||
| CommonCodeSystemsTerminologyService.CURRENCIES_CODESYSTEM_URL, | ||
| CommonCodeSystemsTerminologyService.COUNTRIES_CODESYSTEM_URL, | ||
| CommonCodeSystemsTerminologyService.UCUM_CODESYSTEM_URL, | ||
| CommonCodeSystemsTerminologyService.USPS_CODESYSTEM_URL); | ||
|
|
||
| private final List<String> embeddedValueSets = List.of( | ||
| CommonCodeSystemsTerminologyService.LANGUAGES_VALUESET_URL, | ||
| CommonCodeSystemsTerminologyService.MIMETYPES_VALUESET_URL, | ||
| CommonCodeSystemsTerminologyService.CURRENCIES_VALUESET_URL, | ||
| CommonCodeSystemsTerminologyService.UCUM_VALUESET_URL, | ||
| CommonCodeSystemsTerminologyService.ALL_LANGUAGES_VALUESET_URL, | ||
| CommonCodeSystemsTerminologyService.USPS_VALUESET_URL); | ||
|
|
||
| private boolean isEmbeddedValueSet(IBaseResource theResource) { | ||
| org.hl7.fhir.r4.model.ValueSet valueSet = myVersionCanonicalizer.valueSetToCanonical(theResource); | ||
| if (!valueSet.hasUrl()) return false; | ||
| return embeddedValueSets.contains(valueSet.getUrl()); | ||
| } | ||
|
|
||
| private boolean isEmbeddedCodeSystem(IBaseResource theResource) { | ||
| org.hl7.fhir.r4.model.CodeSystem codeSystem = myVersionCanonicalizer.codeSystemToCanonical(theResource); | ||
| if (!codeSystem.hasUrl()) return false; | ||
| return embeddedCodeSystems.contains(codeSystem.getUrl()); | ||
| } |
Contributor
There was a problem hiding this comment.
CommonCodeSystemsTerminologyService already contains the methods isCodeSystemSupported(theValidationSupportContext, theSystem), isValueSetSupported(theValidationSupportContext, theValueSetUrl), getValueSetUrl(theFhirContext, theValueSet) and getCodeSystemUrl(theFhirContext, theCodeSystem); they could be used to avoid duplicating code and risking desynchronizing embeddedCodeSystems and embeddedValueSets with CommonCodeSystemsTerminologyService
Contributor
Author
There was a problem hiding this comment.
good catch ... I'll rework it
tadgh
approved these changes
Oct 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 PR introduces a safety check when installing implementation guides that contains already existing embedded terminology as listed on https://hapifhir.io/hapi-fhir/docs/validation/validation_support_modules.html#commoncodesystemsterminologyservice as shadowing existing embedded terminology may lead to unintended behaviour. For instance, when repackaging implementation guides it can easily go wrong if e.g. bcp is referenced and included as a CodeSystem with
not-present(which would be default from https://terminology.hl7.org/CodeSystem-v3-ietf3066.html )