Commit Graph

976 Commits

Author SHA1 Message Date
Grahame Grieve e18cfcf0f8 Add reading translations 2023-03-30 23:30:53 +11:00
Grahame Grieve 1b6137967f i18n framework for HTML generation in renderers - step #1 2023-03-30 10:16:51 +11:00
Grahame Grieve 12de53f336 Work on language translations 2023-03-30 06:32:10 +11:00
Grahame Grieve bbdb3dea89 undo dependency on test case packages (memory reasons) 2023-03-29 17:10:38 +11:00
Grahame Grieve d7817c785a XML utils - add tag 2023-03-29 15:06:59 +11:00
Grahame Grieve 520d13ab51 fix R5 path for spec 2023-03-29 15:06:35 +11:00
Grahame Grieve 0233e48a1c suppress prism if ttl source is too big 2023-03-29 15:06:24 +11:00
Grahame Grieve 9460f1f64b
Merge pull request #1183 from hapifhir/do-20230315-pathbuilder
Give finer grained control over path building with dedicated PathBuilder class
2023-03-28 05:47:26 +11:00
dotasek 3044a188d9 Add PathBuilder documentation clean up code. 2023-03-27 10:41:44 -04:00
Grahame Grieve 7bf243f593
Merge pull request #1188 from hapifhir/gg-202303-ftp-windows
Fix FTP problem on windows
2023-03-24 22:20:05 +11:00
Grahame Grieve ac64a6bbd7 Fix FTP problem on windows 2023-03-24 21:13:54 +11:00
Grahame Grieve 37206a1f30
Merge pull request #1187 from hapifhir/gg-202303-r5-final-gen
Gg 202303 r5 final gen
2023-03-24 11:50:23 +11:00
Grahame Grieve b8777319da update tests to use R5 package from test case repo everywhere 2023-03-24 10:18:42 +11:00
Grahame Grieve d16e6d3249
Merge pull request #1184 from hapifhir/gg-202303-r5-final-gen
Gg 202303 r5 final gen
2023-03-23 21:42:19 +11:00
Grahame Grieve b5c48d1934 rebuild .index.json if it's empty 2023-03-23 20:49:55 +11:00
Grahame Grieve f122dc164f update code for R5 final 2023-03-23 20:48:38 +11:00
dotasek 36dce28691 Make getter for remote separator 2023-03-22 17:31:40 -04:00
dotasek 8ce7cd8323 Merge remote-tracking branch 'origin/master' into do-20230315-pathbuilder 2023-03-22 12:09:56 -04:00
Grahame Grieve 6173d77a24
Merge pull request #1181 from hapifhir/gg-202303-vs-example-urls
Gg 202303 vs example urls
2023-03-22 23:56:01 +11:00
Grahame Grieve 74a69de992 validate example URLs in value sets correctly 2023-03-22 23:06:33 +11:00
Grahame Grieve 05a367b088 validate example URLs in value sets correctly 2023-03-22 23:06:06 +11:00
dotasek 1442f1609c
Stop re-initializing file type and mode with each upload (#1178)
* Stop re-initializing file type and mode with each upload

* Methods for setting up buffer size
2023-03-21 15:36:19 -04:00
Grahame Grieve f796ffc57f fix issues with help16.png 2023-03-21 18:21:42 +11:00
Grahame Grieve c053ed9c6e suppress data attributes in XHTML 2023-03-21 17:27:14 +11:00
Grahame Grieve 5444c3a33a Inline help6.png in resources 2023-03-21 17:26:51 +11:00
Grahame Grieve 7ea1e5197d Fix OS issue with zipslip protection 2023-03-21 06:14:01 +11:00
dotasek 7a85bc00c9 Merge branch 'master' into do-20230315-pathbuilder 2023-03-20 11:38:53 -04:00
Grahame Grieve e1fed0a8eb Merge remote-tracking branch 'origin/master' 2023-03-19 08:52:55 +11:00
Grahame Grieve 95f3fdd187 Add file: to URL scheme list 2023-03-19 08:52:49 +11:00
dotasek cbf864b1b9
Refactor FTPClient to perform fewer directory creates (#1159)
* Refactor FTPClient to perform fewer directory creates

* Restore old main

* More lenient test for delete timing (delete is fast)

* More timing leniency

* Add more checks for command completion, switch time track to nanos

* Logging logging logging
2023-03-16 14:53:59 -04:00
Grahame Grieve cf9bd54a74 fix bug in XhtmlNode 2023-03-16 15:42:04 +11:00
Grahame Grieve 413cbb115a fix issues with R3R4MapTester 2023-03-16 14:08:00 +11:00
Grahame Grieve 27598a382d Fix issues with xhtml handling 2023-03-16 14:07:11 +11:00
Grahame Grieve 19cb639d37 refactor how types are handled loading packages 2023-03-16 13:26:34 +11:00
dotasek 0ae4aa9a0f Start pathbuilder work 2023-03-15 16:20:51 -04:00
Grahame Grieve 6be0becc61 fix for NPE 2023-03-14 21:28:37 +11:00
Grahame Grieve a45de03431 add tail() to Utilities 2023-03-13 13:53:41 +11:00
Grahame Grieve 96f265653e fix run time test 2023-03-12 23:02:46 +11:00
Grahame Grieve 957e9fe7cc Load all types not no types from Npm Package when no types are specified 2023-03-11 18:54:23 +11:00
Grahame Grieve 10d560c859 Add support for locally processed special case code systems (and an example - rgb) 2023-03-10 21:28:08 +11:00
Grahame Grieve 1212b85b5e Change from Error to FHIRException when wrong value type is wrong on polymorphic element 2023-03-10 16:12:59 +11:00
dotasek cedadbcbe7
Convenience method for unchecked read only use of Utilities.path (#1164)
* Convenience method for unchecked read only use of Utilities.path

* Restore remove first null behaviour

* Method rename and update JavaDoc
2023-03-09 22:08:41 -05:00
dotasek 909f7e64fe
Additional zip-slip tests (#1162)
* Additional zip-slip tests

* Fix windows path test
2023-03-09 14:30:53 -05:00
Grahame Grieve 95813d9004 Fix FML Comments parsing, and add StructureMap rendering to pretty FML 2023-03-09 19:44:57 +11:00
Grahame Grieve 187d3e98c7 More fixes for structure map validation 2023-03-09 09:11:31 +11:00
Grahame Grieve 53e67bc1cb handle re-use of mapping groups when validating maps 2023-03-08 09:11:24 +11:00
Grahame Grieve 26eb1311a4 release notes 2023-03-07 23:33:35 +11:00
Grahame Grieve 6bf26255ab fix structure map validation issues around type 2023-03-07 20:58:51 +11:00
Grahame Grieve 58a933094f fix json escaping 2023-03-07 06:30:01 +11:00
Grahame Grieve 0c26f09721 revise whitespace handling for unicode conformance in validator 2023-03-07 06:25:45 +11:00
Grahame Grieve 5eca02f879 bug fixes 2023-03-06 23:33:38 +11:00
Grahame Grieve 6559c4b245 improve SM validation message 2023-03-06 20:45:05 +11:00
Grahame Grieve 507ff74c23 recognise R4B and R5 core packages 2023-03-06 20:44:41 +11:00
Grahame Grieve adafa7eec8 Improve Specification Difference Engine 2023-03-06 16:55:02 +11:00
Grahame Grieve 36d22c522a make xhtml nodes use less memory 2023-03-06 10:32:54 +11:00
Grahame Grieve 356e500ab6 finish ConceptMap validation 2023-03-05 23:25:12 +11:00
Grahame Grieve ec72b1fcdd fix parsing and validating of concept maps in structure maps + validate terminology part of structure maps 2023-03-05 18:29:11 +11:00
Grahame Grieve c42da7af68 more package hacking work 2023-03-05 06:14:22 +11:00
Grahame Grieve 52c97f3c70 test primitive regexes if other tests pass 2023-03-05 06:14:07 +11:00
Grahame Grieve 99d2421014 fix using wrong version of extensions package 2023-03-02 08:49:22 +11:00
Grahame Grieve 31b770db8a ping build 2023-03-02 07:36:10 +11:00
Grahame Grieve abba72d099 Fix bug in CommaSeparatedStringBuilder 2023-03-01 21:48:43 +11:00
Grahame Grieve 4c30621491 structuremap validation and invariant fixes for forthcoming R5 release 2023-02-27 18:32:38 +11:00
Grahame Grieve 2bd73c650e Work on StructureMap validation 2023-02-27 07:30:04 +11:00
Grahame Grieve d3a407e369 FML validation 2023-02-25 14:05:03 +11:00
Grahame Grieve 521e72a5ff
Merge pull request #1110 from balhoff/rdf-wg-r5-with-generated
Implement R5 RDF format changes
2023-02-24 10:21:19 +11:00
Grahame Grieve 1eeee429ce More markdown detection work 2023-02-21 16:52:32 +11:00
Grahame Grieve 3eda8580fc fix rendering for conditional references 2023-02-21 16:46:02 +11:00
Grahame Grieve 76a3129b30 fix validation of conditional references 2023-02-20 23:48:16 +11:00
Grahame Grieve 455d2774da remove reference to package-client folder 2023-02-20 10:44:11 +11:00
Grahame Grieve 38a55d261d update table generator to suppress external links in base row and column 2023-02-18 15:13:13 +11:00
Grahame Grieve fecf024952 FHIR-40387 Improve guidance for markdown datatype 2023-02-16 13:03:37 +11:00
Grahame Grieve 3011b37df4 fix bugs in XHTML parser (common entities) 2023-02-16 10:07:18 +11:00
Jim Balhoff c3580528bb Fix Turtle syntax errors with multiline comments. 2023-02-15 09:58:25 -05:00
Grahame Grieve d1690a9416
Merge pull request #1101 from hapifhir/do-20230202-fix-jsonobject-instant-test
Fix JsonObjectTests interaction with Instant
2023-02-15 08:31:58 +11:00
Jim Balhoff 97772ada1e Merge branch 'master' into rdf-wg-r5 2023-02-14 13:47:28 -05:00
Grahame Grieve 33a84012f2 fix bug parsing html entities 2023-02-14 17:32:26 +11:00
Grahame Grieve d5d83bea9c fix broken links in R5 builds 2023-02-14 09:53:22 +11:00
Grahame Grieve 3a427385c5 FHIR QA driven changes 2023-02-12 17:53:41 +11:00
Grahame Grieve e6548bcccd add unCamelCaseKeepCapitals 2023-02-09 17:39:47 +11:00
Grahame Grieve 1d4f1e9d90 fix bug with duplicate value in getResourceNames() 2023-02-06 05:38:02 +11:00
dotasek 7b3e206b1c Fix JsonObjectTests interaction with Instant 2023-02-02 13:52:01 -05:00
Jim Balhoff 5dc19cd052 Tweak spacing. 2023-02-01 11:55:11 -05:00
Jim Balhoff 69ce2b45f2 Output lists in examples using RDF lists. Don’t output fhir:index. 2023-01-31 14:11:29 -05:00
Grahame Grieve 08ed54fd35 Rework Package API to allow for authentication on package servers 2023-01-31 10:32:21 +11:00
Grahame Grieve 4ab03c5c93 cater for "." in XML element and attribute names 2023-01-31 07:23:52 +11:00
dotasek cca38587ce
Cleanup jetbrains annotations (#1090)
Co-authored-by: dotasek <david.otasek@smilecdr.com>
2023-01-23 18:27:47 -05:00
dotasek b50aec5912
Advisory fix 1 (#1089)
* Update cache and comparison downloads to use https

* Zip Slip tests and fix

* Zip Slip tests 2 and fix

* Add missing tempDir child in ScannerTest

* Add win format zip test

* Add tests to r4b

* Add tests and fixes for slips in tgz processing

* Update fhir-test-cases version
2023-01-20 16:56:57 -05:00
Grahame Grieve f8e6371e1f
Merge branch 'master' into gg-202301-sm-errors 2023-01-20 19:44:24 +11:00
Grahame Grieve 68b36d3cb5 go-publish related changes 2023-01-20 11:23:17 +11:00
dotasek f58b7acfb5
Swaps isBase64 with internal implementation for Android compatibility (#1079)
* Adding animal sniffer to display all issues related to android compatibility.

* Duplicate isBase64 internally

Co-authored-by: Vitor Pamplona <vitor@vitorpamplona.com>
Co-authored-by: dotasek <david.otasek@smilecdr.com>
2023-01-18 18:40:24 -05:00
dotasek 885e55352f
FTPClient: upload file path creation, logging, and improved default path (#1078)
* More logging of errors.

* WIP create path for file to upload.

* WIP Tests

* More tests

* Improved logging and path fixes

* Clean up imports

* Rename test

* add testing code

Co-authored-by: dotasek <david.otasek@smilecdr.com>
Co-authored-by: Grahame Grieve <grahameg@gmail.ccom>
2023-01-18 12:42:59 -05:00
Grahame Grieve 829cea8d33 Add check for slicing at the root of a profile 2023-01-17 11:41:42 +11:00
Grahame Grieve 4b1a3dba46 Improve URN validation 2023-01-16 22:13:53 +11:00
Grahame Grieve a61d860ddb FTP passive mode 2023-01-16 22:13:38 +11:00
Grahame Grieve 615ed8d63f
Update R4 FHIRPath implementation from R5, and get all tests passing (#1063)
* Update R4 FHIRPath implementation from R5, and get all tests passing

* test NPE in markdown processing

* go-publish support

* Start implementing loading structure maps with validation

* release notes

* more work on FTP

* Fix breaking test.

* Add fhir-test-cases to r4 pom to fix breaking test

Co-authored-by: Grahame Grieve <grahameg@gmail.ccom>
Co-authored-by: dotasek <david.otasek@smilecdr.com>
2023-01-13 23:08:40 -05:00
dotasek dc9d5d0ed1 Set file transfers to binary type, ensure file contents match 2023-01-11 13:41:43 -05:00
dotasek edf6d75551
Implement FTP Client (#1064)
* Start with tests against fake FTP

* Dummy test file

* Switch to our FTPClient, make tests break

* Implement FTPClient

* Rely on end caller to set path delimiters

* User port 8021 for tests (not protected in azure pipelines)

* Let mocks use Windows filesystem

* Gentle refactor

Co-authored-by: dotasek <david.otasek@smilecdr.com>
2023-01-09 20:06:21 -05:00
Grahame Grieve e794eca959 Changes to support upgrades to IG publisher -go-publish process 2023-01-05 08:44:45 +11:00
Grahame Grieve 19f1171962 json date handling related changes 2023-01-05 08:43:57 +11:00
Jim Balhoff 673e36b989 Merge branch 'master' into rdf-wg-r5-merging 2023-01-04 15:04:48 -05:00
Grahame Grieve db48892b66 fix failing test 2023-01-03 14:57:08 +11:00
Grahame Grieve f3fc19a906 refactor profile generation (utils -> renderer) + add new views 2023-01-03 14:54:11 +11:00
Grahame Grieve b894cc6da7
Merge pull request #1048 from qligier/pr-fix-text-appending
Fix appending text in ProfileUtilities
2022-12-31 09:10:24 +11:00
Quentin Ligier 858c06f097
Fix appending text in ProfileUtilities
If the base text was null, appending a text in the derived element (using "...") would show a "null" before the text. This commit adds the method Utilities.appendDerivedTextToBase() to implement to correct behavior.
2022-12-23 18:52:47 +01:00
Grahame Grieve 37844bd395 update xver dependency 2022-12-17 08:07:43 +11:00
Grahame Grieve 6b1ae35ef3 * Add validator support for fhir_comments in R2/R2B (#1042) + Add validator checks around versions in extension URLs 2022-12-17 07:11:06 +11:00
Grahame Grieve 8b7890bea2 removing caching package client - rests on invalid assumptions 2022-12-16 08:49:30 +11:00
Grahame Grieve 9aeb39671b fix to get tests passing again. If I'm lucky 2022-12-14 11:54:14 +11:00
Grahame Grieve 72eae55218 fix new bug in package manager 2022-12-14 09:59:25 +11:00
Grahame Grieve e9d8400a78 fix package loading bug 2022-12-14 09:09:53 +11:00
Grahame Grieve d1d391496e upgrade to new R5 release 2022-12-13 21:13:29 +11:00
Grahame Grieve f5d486f171 refactoring package-list.json handling 2022-12-12 19:54:37 +11:00
Grahame Grieve 1786122763
Update org.hl7.fhir.utilities/src/main/resources/Messages.properties
Co-authored-by: Vadim Peretokin <vperetokin@hey.com>
2022-12-09 23:30:59 +11:00
Grahame Grieve ee8a58b7e1
Update org.hl7.fhir.utilities/src/main/resources/Messages.properties
Co-authored-by: Vadim Peretokin <vperetokin@hey.com>
2022-12-09 23:30:06 +11:00
Grahame Grieve 7c2c44b333 Add Accept header fetching JSON 2022-12-09 20:09:12 +11:00
Grahame Grieve 474f84c903 fix bug doing version comparison 2022-12-09 20:09:01 +11:00
Grahame Grieve 771fb0ac00 Changes related to validation of document and message links 2022-12-09 11:09:17 +11:00
Grahame Grieve 064c4ce896 Add contents to .index.json in package (per update to spec) 2022-12-06 16:21:56 +11:00
Grahame Grieve 66f46bc319 remove test that shouldn't have been committed 2022-12-05 17:56:12 +11:00
Grahame Grieve b778641cf6 fix bug in XHTML generation 2022-12-05 17:27:52 +11:00
Grahame Grieve 5d29a88552 fix npe appending slashes 2022-12-05 17:27:43 +11:00
Grahame Grieve a0c28f3326 Round trip XHTML faithfully wrt empty elements 2022-12-05 13:41:31 +11:00
Grahame Grieve cd8c970045 Add logging to package client 2022-12-01 16:56:55 +11:00
Grahame Grieve d24cc6c5ee Merge remote-tracking branch 'origin/master' 2022-12-01 08:22:19 +11:00
Grahame Grieve fedfa88ffb refactor resource reference resolution to use package dependencies whereever possible 2022-12-01 08:16:00 +11:00
dotasek d53aabe2e5
Do not delete previously undefined xmlns attributes when processing Xhtml nodes (#985)
* Add tests

* Add back unseen namespace attributes

* Gentle refactor, document setOriginalNamespacePrefix

* Update validator_test_case_version

Co-authored-by: dotasek <david.otasek@smilecdr.com>
2022-11-30 16:01:28 -05:00
Grahame Grieve 49f798de48 Consistency around rendering comments in examples in IGs 2022-11-26 22:24:17 -03:00
Grahame Grieve 53fb08ab19 update JSON parser used by validator to JSON5 parser 2022-11-26 18:24:29 -03:00
Grahame Grieve 363a95bb8a more replacing json library 2022-11-25 22:37:43 -03:00
Grahame Grieve 450fa1d02c minor improvements to json library 2022-11-25 22:37:18 -03:00
Grahame Grieve 61d998963a fix debugging 2022-11-24 19:56:07 -03:00
Grahame Grieve 618f98e323 Add spanish messages 2022-11-24 18:02:02 -03:00
Grahame Grieve 1617315ed8 minor improvements to validator message 2022-11-24 17:58:15 -03:00
Grahame Grieve 80f275ff18 upgrade to new JSON parser 2022-11-24 17:57:46 -03:00
Grahame Grieve b2e2c68f7e minor typo fixes in validation messages 2022-11-22 12:45:33 -03:00
Grahame Grieve 24331956f1 Add rule date to validation messages so new rules can be highlighted 2022-11-22 05:58:02 -03:00
Grahame Grieve 8136b00c86 work on loading speed for validator 2022-11-21 18:46:47 -03:00
Grahame Grieve 8e3833f58a Fix broken LOINC link 2022-11-19 03:39:35 -03:00
Grahame Grieve 28d107b4ae Validate XHTML entities in XML 2022-11-17 15:21:17 -03:00
Grahame Grieve 47443acaf3 prepare release 2022-11-16 18:36:02 -03:00
Grahame Grieve 011e2488a3 New Json Parser 2022-11-16 15:11:33 -03:00
Grahame Grieve 24656a20fa typo fix in name 2022-11-15 18:13:45 +11:00
Grahame Grieve 0f3e8be43b
Merge pull request #989 from vadi2/patch-1
Fix missing space in slicing validation failure message
2022-11-15 17:49:32 +11:00
Vadim Peretokin 2de7220db4
Fix missing space in slicing validation failure message 2022-11-14 21:18:38 +01:00
Grahame Grieve cf7ef7218a
Merge pull request #979 from lmckenzi/NewIGHelp
Change default help location for tables
2022-11-15 07:18:13 +11:00
Grahame Grieve 231aae6043 Fix issue rendering resource by name 2022-11-14 18:04:27 +11:00
Grahame Grieve e01216b7f3 more xver package related changes 2022-11-11 12:29:45 +11:00
Grahame Grieve 21b0577249 track hint about code validation 2022-11-10 05:16:10 +11:00
Grahame Grieve 96218a5ce4 refactor resource narrative generation rules 2022-11-10 05:14:59 +11:00