d23c319a90
Merge branch 'master' into gg-202203-vs-system
2022-03-11 11:30:07 +11:00
a3e8fca51a
Merge pull request #759 from hapifhir/R4B-datatypes-and-xml-cleanup
...
R4 b datatypes and xml cleanup
2022-03-11 10:53:52 +11:00
0b3ccbbe37
Reverted lower-casing of version comparison
2022-03-10 16:48:41 -07:00
6b3d7d4eaa
infer system when value set has includes
2022-03-11 10:37:10 +11:00
56c52ab7dd
make fhir version code case independent
2022-03-11 10:34:18 +11:00
791f16a05d
fix failing tests.
2022-03-10 11:18:03 +11:00
33f6c57d48
fix NPE
2022-03-10 06:52:44 +11:00
89b912dde2
Fix cross version extension validation, and check that extensions are consistent wrt isModifier in profiles
2022-03-09 17:37:26 +11:00
d7754a321f
Fix snapshot generation - always populate constraint source properly
2022-03-09 17:36:39 +11:00
2ff53e9bf1
merge
...
# Conflicts:
# RELEASE_NOTES.md
2022-03-08 13:25:16 +11:00
478663cdf8
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core into R4B-datatypes-and-xml-cleanup
2022-03-07 19:20:19 -07:00
cc983073cd
more cross version extensions
2022-03-08 13:19:19 +11:00
32c2ad96b7
Merge pull request #755 from hapifhir/gg-202203-extensions
...
Gg 202203 extensions
2022-03-08 09:39:54 +11:00
074da98066
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core into R4B-datatypes-and-xml-cleanup
...
# Conflicts:
# org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java
2022-03-04 22:01:48 -07:00
9f01f7c9f2
Per FHIR-31722 and FHIR-34453, ensure that CodeableReference and RatioRange aren't allowed in extensions Parameters, etc. in R4B
2022-03-04 21:58:17 -07:00
ca91cfad1a
When running in Eclipse, the version comes in as upper-case, and the enum comparison needs it to be lower-case, so fold it to be that way.
2022-03-04 21:56:27 -07:00
6f57013f98
Fix intermittent failures in NarrativeGenerationTests
2022-03-03 16:19:39 -05:00
38e84a46f2
Merge pull request #750 from cqframework/master
...
Fix include resolution in LiquidRenderer
2022-03-03 07:46:12 +11:00
64aed90f1e
fix handling of xver extensions with choice sub-extensions
2022-03-03 07:43:43 +11:00
4f652bceee
more presenting extensions when rendering.
2022-03-03 07:43:09 +11:00
23fe900624
Merge branch 'gg-202202-various' of https://github.com/hapifhir/org.hl7.fhir
2022-02-26 08:09:27 +11:00
df89ca1df3
remdering work
2022-02-26 08:09:15 +11:00
6975397675
Fix breaking SimpleWorkerContextTests
2022-02-25 15:36:04 -05:00
a5060d9475
fix failing JUnit test
2022-02-26 06:42:43 +11:00
c918f724ee
fix problem missing profiles on references in discriminators
2022-02-26 06:22:42 +11:00
f32895da67
Fix ValueSet presentation
2022-02-26 06:21:14 +11:00
c5b3e022a4
fix bug where inactive codes always put in expansions, and add unit tests for this
2022-02-25 13:07:07 +11:00
778738d3ac
Fix constructor argument
2022-02-23 20:20:38 -07:00
8212604250
Fix missing argument
2022-02-23 20:09:17 -07:00
5544460d20
Added documentation
2022-02-23 19:44:21 -07:00
ab329c8c63
Added a Liquid template resolver to narrative generation to support include resolution in the publisher
2022-02-21 15:05:42 -07:00
905f8a7197
Merge pull request #746 from lmckenzi/Suppress-ignoring-ignore-messages
...
When you have a dependency on the R4 examples package, you get 100s o…
2022-02-20 08:00:04 +11:00
98ba40748e
Follow content reference when rendering XML resources
2022-02-19 21:46:05 +11:00
a1912cd423
fix various rendering issues from core spec
2022-02-19 21:41:50 +11:00
4d26ca64fb
When you have a dependency on the R4 examples package, you get 100s of messages about every value set, profile, etc. that's being ignored. Changed this so it's only a debug log message rather than something that happens all the time.
2022-02-16 23:17:09 -07:00
84f7133cf1
remove debugging statements
2022-02-17 02:05:02 +11:00
db19b0dd00
Fix broken links + remove error about regex in core package
2022-02-16 14:04:35 +11:00
0f1d9db24f
Fix wrong URL links + txCache errors + questionnaire rendering at root
2022-02-16 13:14:55 +11:00
c13193835e
Preserve code validation error
2022-02-15 22:17:08 +11:00
4983b0122c
Fix error accessing experimental on NamingSystem
2022-02-15 19:32:04 +11:00
d91f6a450b
Fix Patient Renderer
2022-02-14 16:23:22 +11:00
6310b1158e
#722 fix ListResource name misuse
2022-02-13 08:29:01 +11:00
b861ca4744
clean up
2022-02-12 09:07:07 +11:00
7700a0cb11
missed rendering fix
2022-02-12 08:29:00 +11:00
e4d886dfec
Fix handling of cross version extensions on choice types
2022-02-12 08:27:56 +11:00
fb1a08dca8
Rendering improvements: partial dates, questionnaire links, and patient renderer
2022-02-12 08:27:29 +11:00
76ed4abba7
Changes for debugging on OSX (fhir-tools-settings.conf)
2022-02-12 07:55:59 +11:00
0fa757b426
Fix markdown relative link issues + start working on additional bindings extension
2022-02-12 07:53:23 +11:00
b49e791cd1
Updates for changes to package.json type
2022-02-11 09:36:47 +11:00
0e3e410ea1
Merge branch 'master' into simpleworkercontextbuilder
2022-02-04 09:50:42 -05:00
e0bdbda5b7
Fix package location for CacheVerificationLogger
2022-02-03 16:35:26 -05:00
239c436ca5
Code cleanup
2022-02-02 10:07:13 -05:00
847ede5f88
Refactor SimpleWorkerContext and ValidationEngine
2022-02-01 15:28:19 -05:00
5092be9a1d
Clean txCache + update CacheVerificationLogger output
2022-02-01 10:09:23 -05:00
96538ba249
Merge pull request #704 from lmckenzi/Add_map_compile
...
Add map compile
2022-02-01 11:50:41 +11:00
cae92c8621
Merge pull request #727 from hapifhir/ja_20220130_graphql_cleanup
...
Updates to GraphQL
2022-02-01 11:49:10 +11:00
bac81752c8
merge and fix testing bugs
2022-02-01 10:20:56 +11:00
4c48d597a6
Merge pull request #721 from dotasek/tx-server-cache-analysis
...
TX Server Caching for Tests
2022-02-01 08:09:41 +11:00
180035d306
One more tweak
2022-01-30 18:37:22 -05:00
846866472b
Updates to GraphQL
2022-01-30 17:04:10 -05:00
1aa1e288ec
merge
2022-01-30 07:57:39 +11:00
3559bd6638
fix tests problems with date formats and java versions
2022-01-29 09:16:48 +11:00
7b24e9d4ee
Update FHIRPathEngine.java
...
As mentioned on https://github.com/hapifhir/org.hl7.fhir.core/issues/703
2022-01-28 20:44:39 +01:00
bd9d486846
Significant speed improvement for terminology cache
2022-01-29 06:06:20 +11:00
42f75dfee0
#703 - fix missing .guessSystem() in opMemberOf
2022-01-29 06:05:51 +11:00
fdc6e02b49
Don't log requests when rebuilding cache
2022-01-26 09:31:58 -05:00
39e30a10c4
Clean up comments
2022-01-26 09:28:19 -05:00
a41287a74d
Additional logging for requests in test
2022-01-25 18:02:16 -05:00
9ec63bc1b9
Test capability caching.
...
Just when I think I'm done...
2022-01-25 16:36:13 -05:00
7c58619528
Testing Part 7
2022-01-25 14:43:13 -05:00
38728f2c82
Testing part 6
2022-01-25 10:48:42 -05:00
b5e9a7aa1e
Testing Part 5
2022-01-24 18:16:10 -05:00
1715574a7e
Testing Part 4
2022-01-24 17:00:17 -05:00
33cdfffa55
More consistent version management in TerminologyCache
2022-01-23 13:21:40 -05:00
97c11a9be0
Testing Part 3
2022-01-23 12:06:44 -05:00
09ddd964ff
Merge remote-tracking branch 'origin/master' into tx-server-cache-analysis
2022-01-21 17:39:51 -05:00
6416ccce36
Testing Part 2
2022-01-21 17:39:43 -05:00
f9561f2685
Testing Part 1
2022-01-21 15:29:17 -05:00
315604759c
Another attempt to avoid parser classload
2022-01-21 14:59:50 -05:00
7d8569e9e7
Test that no requests are made for cached tests
2022-01-20 13:28:47 -05:00
4826424499
Make additional caches to cover NativeHostService and ValidationService
2022-01-19 18:36:39 -05:00
0a3e9d3f31
Merge branch 'master' into tx-server-cache-analysis
2022-01-18 16:10:21 -05:00
d9d0f22ff3
cache CapabilityStatement and TerminologyCapabilities
2022-01-18 16:09:59 -05:00
0ed91721b0
One more revert
2022-01-18 06:16:18 -05:00
bc3759dc03
Roll back change
2022-01-18 06:16:18 -05:00
d3007ea73f
Cleanup
2022-01-18 06:16:18 -05:00
f902d1d273
Avoid reflection
2022-01-18 06:16:18 -05:00
942d4f15aa
Avoid unnecessary JsonParser/XmlParser class load
2022-01-18 06:16:18 -05:00
06e690e54f
fix bug in package generator where files go in the wrong place
2022-01-18 07:30:12 +11:00
c13c291949
more work on value set renderer (designations, expand-groups)
2022-01-17 10:51:48 +11:00
bd74bf3cee
Fix typos
2022-01-14 14:53:36 -05:00
6e0b14b0b6
Merge branch 'master' into tx-server-cache-analysis
2022-01-13 09:46:45 -05:00
554a458b57
fix up logging problem
2022-01-13 17:38:39 +11:00
758c2ebe7b
fix caching problem for value sets doing validation
2022-01-13 17:36:15 +11:00
4566035d85
fix issue generrating profile comparison
2022-01-13 17:26:30 +11:00
a764269611
update comparison of element cardinality based on discussion at Jan 2022 connectathon
2022-01-13 05:15:33 +11:00
c661dae9f5
fix NPE setting locale
2022-01-13 05:14:36 +11:00
7d3f34b0ca
fix error in FHIRPath handling for incomplete FHIR Path expressions
2022-01-12 17:44:11 +11:00
ecad7cc5f8
Fix issue with comparer not rendering properly and add explicit checks around cardinality
2022-01-12 17:43:39 +11:00
73737b5b4c
Merge pull request #706 from lmckenzi/IntroChanges
...
Changes relevant to improving the rendering of artifact intros. Spec…
2022-01-12 03:44:03 +11:00
3a98e0b5fa
Add code system if no unit and not UCUM.
2022-01-11 08:24:33 -07:00
d5ed9eefbd
Fixed spacing with non-breaking spaces issue
2022-01-10 12:41:54 -07:00
6b5f43df9b
fix rendering problem
2022-01-11 05:48:15 +11:00
cec1a365ec
add missing file
2022-01-10 20:50:19 +11:00
0bb4628f6b
fix NPE in validator & rendering fixes: concept map display + name rendering issue for Med Resources + fix locale date issue
2022-01-10 20:29:06 +11:00
5635d96576
Configure error cacheing at code level + create profile for cache clean
2022-01-07 12:01:46 -05:00
6e6184a425
Lombok for noCacheing and CacheErrors
2022-01-06 19:35:19 -05:00
06cbe7245c
Better name for cacheErrors
2022-01-06 19:01:45 -05:00
a12324c3a6
Remove unnecessary synchronized block + System.out
2022-01-06 16:56:19 -05:00
1a2e995104
Store cache in resources
2022-01-06 16:20:22 -05:00
86c3609288
Changes relevant to improving the rendering of artifact intros. Specifically:
...
- ensure that when validating codes against value sets, the valid coding is actually returned
- strip out the new extensions we add for FMM
- improve the rendering of Quantity and Range. (The former was horrid and the latter wasn't as nice as it could be.)
2022-01-04 21:46:57 -07:00
2d4bbe3749
Clean code
2022-01-04 13:57:39 -05:00
7ee5d0c5e4
Merge remote-tracking branch 'origin/master' into tx-server-cache-analysis
2022-01-04 13:23:32 -05:00
c627ec43d9
Add R4B code + update generator for R4B generation
2022-01-01 16:33:10 +11:00
0c108545b4
fix compile issues
2021-12-28 07:45:04 +11:00
9c669437f6
restore search parameter
2021-12-28 06:42:32 +11:00
98f218fe78
Improved Error messages validating bundle entries
2021-12-22 22:39:54 +11:00
04c7111eb6
get .ofType() working in discriminators (round #1!) + Improve Error message when snapshot can't be generated
2021-12-22 22:39:00 +11:00
c86b8114dd
Fix rendering of QuestionnaireResponses - render items in answers properly
2021-12-22 22:37:07 +11:00
bb78aeea8e
Fix rendering of QuestionnaireResponses - render items in answers properly
2021-12-22 22:36:51 +11:00
4ce07531ef
Fix wrong reference rendering questionnaire
2021-12-22 22:36:11 +11:00
b527039d78
Improve rendering of uris that point to known resources
2021-12-22 22:35:35 +11:00
939b377fe2
* ignore canonical resources found in the examples package
2021-12-22 22:33:50 +11:00
ef0afae743
More support for R4B
2021-12-22 07:31:09 +11:00
3a33cb2174
## Validator
...
* Allow both -output and -output-style parameters (output-style applies to output now) + add csv output style
* Implement the ```-level``` parameter
* Add support for R4B validation
* fix bug in deep profiles (profiles that don't start at the root)
## Other code changes
* Regenerate R5 code for 5.0.0-snapshot1 & many consequential changes
* Add version support for R4B and R5 (R4B code generation still to be done)
2021-12-21 19:53:20 +11:00
2540755c40
Fix unsupportedCodeSystems updating
2021-12-17 14:54:44 -05:00
47dd580868
Add searchparameter analyser
2021-12-17 12:21:38 +11:00
3118cdc132
Add support for new FHIR Versions
2021-12-17 12:08:40 +11:00
aa70fc1338
Use "null" instead of null for getNamedCache
2021-12-16 13:36:03 -05:00
80382865de
Merge branch 'master' into tx-server-cache-analysis
2021-12-15 16:49:39 -05:00
a6ba3e8a21
handle vs.url properly so that we can rely on just url + version for internal caching (no hashing needed)
2021-12-15 09:34:54 +11:00
c15e60f2c6
main Build fixes: new version of FHIR (4.3.0) + transit to using release indicators in version + fix various build issues
2021-12-15 07:28:19 +11:00
cbd1394549
Merge branch 'master' into tx-server-cache-analysis
2021-12-13 15:22:21 -05:00
11503115df
Set error cacheing via system property
2021-12-13 12:57:37 -05:00
ac5e2b14a2
missing file
2021-12-13 19:22:18 +11:00
65e65d3e7b
fix bug in client caching for unidentified value sets + look for code system definitions in local context + fix path error in Questionnaire Response validation
2021-12-13 18:39:44 +11:00
3b58aef820
More cacheing for tests + allow cacheing for error responses
...
WORK IN PROGRESS; cacheErrors is set to TRUE always at this stage.
2021-12-10 16:46:26 -05:00
394452b747
Fix cacheing for large valuesets
2021-12-09 15:50:03 -05:00
ccdb0c434f
* Fix count on erroneous element defintions when generating snapshots
...
* add version specific access to context resources
* enforce minValue and maxValue for decimal and Quantity types
2021-12-09 08:20:56 +11:00
e5976307f4
Refactor to get consistent ValidationEngine with txCache in tests
2021-12-08 12:34:35 -05:00
1c1e7d22ca
WIP track server requests
2021-12-07 16:08:28 -05:00
ab2212d9fc
Add delayed load resources to all resources, and don't load resources from core examples package over other resources
2021-12-07 18:03:22 +11:00
1225bfbaee
remove relative URL prefixing
2021-12-07 18:00:31 +11:00
6e95c3abe5
Removing unused HTTP dep
2021-12-06 14:01:51 -05:00
444c8951c6
removing jetbrains annotations
2021-12-06 12:54:40 -05:00
00f3dfc4b9
set up release
2021-12-03 15:25:54 +11:00
d303dba48d
fix problem resolving nested contained value sets in QuestionnaireResponses + fix NPE rendering questionnaire + fix bug validating profile on resource at root of Bundle
2021-12-03 06:51:23 +11:00
4babbd9724
clean up test logging
2021-12-01 08:06:31 +11:00
5b99283a52
more work on date time test cases
2021-11-30 18:05:18 +11:00
c94cf32a8e
try test again
2021-11-30 17:52:13 +11:00
521343d777
fix date/time rendering test
2021-11-30 17:35:07 +11:00
b4597687b8
fix bug in code system handling (NPE) + add support for json test cases in fhirpath tests + fix error validating references in bundles
2021-11-30 15:37:12 +11:00
7f5a1d95cc
extend policy advisor to control terminology validation + hack fixes for problems in R4B
2021-11-30 10:57:56 +11:00
93d266b363
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2021-11-29 16:11:23 +11:00
96b5bce878
fix up SHC parsing problem
2021-11-29 16:11:13 +11:00
6a735d4319
improvements to code system rendering + fix date/time rendering tests
2021-11-29 16:10:58 +11:00
4d0692ff61
Validate contains ( #669 )
...
* wip
* first go at this, still some failing tests
* post-pairing with Grahame
* wip
* failing test cases
* fixed InstanceValidator to respect new validation options for both references and contained resources
* removed dead code
* put copyright back in BaseValidator
* wip
2021-11-25 15:52:29 -05:00
e997f7bb08
Add request logging for dstu3 FhirRequestBuilder
2021-11-23 14:09:42 -05:00
0352ac1f66
disable all date rendering tests
2021-11-22 22:03:40 +11:00
4200493fa6
fix tests
2021-11-22 21:50:28 +11:00
7cc9c59bf9
fix bug in renderer rendering R3 resources
2021-11-22 21:30:34 +11:00
7dd7926fc6
locale consistency test
2021-11-22 10:10:06 +11:00
894d645de1
take out date format tests.
2021-11-22 09:35:43 +11:00
87c2811645
try Again!
2021-11-22 09:12:33 +11:00
e012b9e9cb
try again
2021-11-22 08:53:15 +11:00
b356de2415
more localization fixes
2021-11-22 08:41:29 +11:00
b7fab78b22
ping build
2021-11-22 08:07:00 +11:00
0dfdb20f2b
ping build
2021-11-22 07:56:44 +11:00
bf5c621f43
update rendering to get timezones right, and add tests for that
2021-11-22 07:41:52 +11:00
412e4931fb
fix bug in testing code
2021-11-21 21:47:36 +11:00
41b7a0566c
fix processing of modifier extensions and cross-version modifier extensions
2021-11-21 19:37:05 +11:00
73fa4fb242
fix bug doing non-namespaced XML comparison
2021-11-20 06:33:07 +11:00
21128fb670
add locale to rendering context
2021-11-20 06:32:27 +11:00
9b3adb9883
improvements to data types rendering based on new test cases (URLs, Money, Markdown)
2021-11-20 06:31:31 +11:00
dbf8179b6d
Merge pull request #663 from hapifhir/gg-202111-cs-work
...
Gg 202111 cs work
2021-11-18 11:43:37 +11:00
de15633f4f
Address issues around fragment and example code systems + fix value set related validation messages
2021-11-18 10:59:49 +11:00
bbac44fc52
reduce spurious logging
2021-11-18 08:09:43 +11:00
dd5f204797
fix fragile handling of URLs in XVerExtensionManager
2021-11-16 17:24:35 +11:00
4339299b27
Extensions for contained resources in IGs
2021-11-16 17:24:05 +11:00
ddba4b77c1
Date tracking in new Terminology Cache
2021-11-16 17:23:39 +11:00
105e073e35
Fix NPEs rendering code system properties
2021-11-16 17:23:07 +11:00
4cd0a3e56c
Render Expressions + Fix NPE rendering date with no value (only extension)
2021-11-16 17:22:30 +11:00
c3c6653f87
Further CapabilityStatement improvements
2021-11-15 15:48:45 -06:00
9c31554101
Add support for CapabilityStatement.resource.supportedProfile in the renderer
2021-11-15 13:23:18 -06:00
042e936287
Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
2021-11-11 14:36:22 +11:00
0f4b966988
fix concept map rendering
2021-11-11 14:36:00 +11:00
78eeba7045
fix bugs in TerminologyCacheManager
2021-11-10 17:05:32 +11:00
f508f7279a
fix NPE in QuestionnaireRenderer
2021-11-10 17:04:28 +11:00
4c939c4f75
I am a dummy
2021-11-09 16:09:21 -05:00
76504db802
ping build
2021-11-09 17:47:45 +11:00
5a33d5c15a
merge conflicts + rework rendering + gather all HTTP access to SimpleHTTPClient + add TerminologyCacheManager
2021-11-09 16:24:21 +11:00
7bcd2b6434
Adding changes for logging request and resp
2021-11-08 16:10:04 -05:00
d91b26e69b
Add getServerVersion to tooling client
2021-11-09 06:13:18 +11:00
227664a9b3
fix versions for 5.0 extensions
2021-11-05 17:25:14 +11:00
43c25ae4f8
fix rule around request/response when logging
2021-11-05 17:14:08 +11:00
80e1606bf9
fix broken links
2021-11-05 17:09:59 +11:00
27852389d6
fix missing logging of requests
2021-11-04 12:41:27 +11:00
83b1702cc5
SHCParser file cleanup ( #640 )
...
* Use File.createTempFile to manage SHCParser payload writing
* Undo auto-reorg imports
* Remove JsonTrackingParser.write
2021-11-03 10:40:06 -04:00
4cde3369ff
Merge pull request #637 from hapifhir/gg-202110-CVE-2021-42574
...
Gg 202110 CVE 2021 42574
2021-11-03 12:08:42 +11:00
5494b14b4b
fix tests
2021-11-03 11:33:50 +11:00
Grahame Grieve
Lloyd McKenzie
Grahame Grieve
dotasek
Bryn Rhodes
jamesagnew
Jens Kristian Villadsen
dotasek
markiantorno
Mark Iantorno
Vassil Peytchev