Commit Graph

3387 Commits

Author SHA1 Message Date
Tadgh e09741cbf6 Merge remote-tracking branch 'origin/master' into issue-2445-support-patient-level-export 2021-03-11 11:08:48 -05:00
Tadgh c8ed81d338 Fix up some mocks, fix empty search param maps being generated 2021-03-10 18:26:16 -05:00
Xiaocheng Luan f752e46e84
Make the search coordinator thread pool size configurable and set a (#2457)
reasonable default value. The default was 1 and all searches were being
executed sequentially.
2021-03-10 16:56:49 -05:00
Tadgh 126fc212a7 Reverting dumb changes 2021-03-10 15:43:51 -05:00
Tadgh b86eee5392 Add more validation of resource types 2021-03-10 15:40:18 -05:00
Tadgh 9e8af41b8b Add test for cache recency 2021-03-10 15:16:21 -05:00
Tadgh 75f756b49f Add changelog 2021-03-10 15:00:54 -05:00
Tadgh 412cf003b0 Add test for cache busting header 2021-03-10 14:52:53 -05:00
Tadgh 827ee33414 Add test for provider type validation pre-submission 2021-03-10 13:52:15 -05:00
Tadgh 420c4f8378 Rework pid translator to accept non-forced-ids 2021-03-10 13:34:04 -05:00
Tadgh 5323486d28 Validate tyepes 2021-03-10 12:48:54 -05:00
Tadgh 374a65db7d Fix bug 2021-03-10 12:03:52 -05:00
Tadgh 3e249d0261 Minor cleanup 2021-03-10 12:03:19 -05:00
Tadgh b7398cb6f2 Merge remote-tracking branch 'origin/master' into issue-2445-support-patient-level-export 2021-03-10 10:33:24 -05:00
Tadgh bfb9d0bc36 Filter default resource types based on export style 2021-03-10 10:30:54 -05:00
jamesagnew 9f5786ba6c License header updates 2021-03-10 05:09:14 -05:00
Tadgh 30a48894cc Add another test 2021-03-09 22:54:51 -05:00
Tadgh e26d757ba3 Merge remote-tracking branch 'origin/master' into issue-2445-support-patient-level-export 2021-03-09 22:54:24 -05:00
James Agnew 807d9d53f0
Improve performance for large transactions (#2462)
* Performance tweaks

* Work on processing speed

* Disable no longer relevant tests

* Work on performance

* Work on tests

* Work on large transaction performance

* Add changelog

* Perf tweaks

* Test fixes

* Resolve FIXME

* Fixes

* Test cleanup

* Fix broken changelog entry
2021-03-09 18:16:02 -05:00
Tadgh 1a1a5ee661 WIP supporting multiple type filters 2021-03-09 12:42:39 -05:00
James Agnew be50a46d76
Tweaks to contained searches (#2461)
* Tweaks to contained searches

* Add changelog

* Build fix
2021-03-09 11:51:30 -05:00
Frank Tao bf8e890a0c
Supported contained resource search (#2441)
* POC for indexing on contained resource - test case may failed

* Test contained url

* Add a spt to handle contained flag

* Added search option for contained resource

* Impl contained resource search

* fixed typo

* Reworked on creating index based on the review comments

* Added changelog

* Added more test cases

Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-03-09 06:50:23 -05:00
Diederik Muylwyk 6cc8a5ce4d
Fix HasParam#doGetQueryParameterQualifier() (#2460)
* Fix HasParam#doGetQueryParameterQualifier(); add changelog entry

* Fix bad test in SearchParameterMapTest
2021-03-09 06:28:40 -05:00
Tadgh 27952ab5e4 add patient export, partial rework for multiple _typeFilters 2021-03-09 00:56:49 -05:00
James Agnew 62df320ceb
Avoid a crash reading an unknown ID on partitioned server (#2451)
* Avoid a crash reading an unknown ID on partitioned server. Fix #1953.

* Attempt 2 at fixing #1953
2021-03-07 10:16:30 -05:00
Tadgh ccf5798634 Fix bug with ignored typeFilters 2021-03-05 14:20:15 -05:00
Diederik Muylwyk 120dc19a54 Merge branch 'master' into 2446-issues-with-placeholder-reference-targets-need-to-be-resolved 2021-03-05 12:34:49 -05:00
Diederik Muylwyk 2945cd9f74 Remove FIXME 2021-03-05 12:33:23 -05:00
Diederik Muylwyk a195eebdec Placeholder extension moved to resource body from meta; tests passing. 2021-03-05 12:09:17 -05:00
Tadgh 5b75ff2425 WIP working out bug in typefilters 2021-03-05 10:35:52 -05:00
Tadgh 9547048848 Add support for Patient export 2021-03-04 20:16:50 -05:00
Diederik Muylwyk bd85c0c362 Remove unnecessary failing test. 2021-03-04 19:38:09 -05:00
Diederik Muylwyk beab3522b9 Enhance isPlaceholder to check value of placeholder extension. 2021-03-04 19:33:00 -05:00
Diederik Muylwyk 96a2151542 Remove unnecessary FIXMEs. 2021-03-04 19:19:34 -05:00
Diederik Muylwyk e3ba4bd1b6 Set default for Populate Identifier in Auto-Created Placeholder Reference Targets to true; update javadocs accordingly 2021-03-04 18:54:04 -05:00
Diederik Muylwyk dfdcfa1365 Add failing tests. 2021-03-04 17:01:39 -05:00
Diederik Muylwyk 9a7bd0e775 Add failing tests. 2021-03-04 16:55:16 -05:00
Tadgh 6129194353 Merge remote-tracking branch 'origin/master' into issue-2445-support-patient-level-export 2021-03-04 16:53:20 -05:00
Tadgh 2f1518344b Add changelogs, add patientbulkredaer implementation 2021-03-04 16:53:05 -05:00
Tadgh c2877e84bb
Merge pull request #2439 from hapifhir/issue-2433-mdm-export
Support MDM expansion in Group Bulk Export
2021-03-04 16:49:19 -05:00
Tadgh ff1c6e4d27 Start with failling test and partial job config 2021-03-04 16:15:51 -05:00
Tadgh 8021396f4f Remove unused mdmlink functions 2021-03-04 14:17:02 -05:00
Diederik Muylwyk 5a952ad980 Add more FIXMEs as my understanding grows. 2021-03-04 14:16:14 -05:00
Tadgh 8eb9ebb797 Add space 2021-03-04 14:07:04 -05:00
Tadgh e5eacdddd6 Fixes bug with uninterpretable string expression in job parameter 2021-03-04 14:06:48 -05:00
Diederik Muylwyk e8c080bb12 Add initial FIXMEs. 2021-03-04 13:45:09 -05:00
Tadgh 94377c1159 Just use boolean 2021-03-04 13:02:17 -05:00
Tadgh f7153a609a Fix formatting error 2021-03-04 10:04:38 -05:00
Tadgh 3d628a4e9c Add test for exporting patients from group 2021-03-03 21:30:40 -05:00
Tadgh de09c7e2da Bit of logic tidying 2021-03-03 19:03:31 -05:00
Tadgh 7b663bfe99 Add constants, fix up some tests 2021-03-03 18:51:03 -05:00
Tadgh 02f38e9532 Fix up other tests for new data reality 2021-03-03 16:16:22 -05:00
Tadgh 3f3e252175 Extract a superclass 2021-03-03 15:48:28 -05:00
Tadgh 57c7d4f3eb Support MDM expansion in group bulk export, re-add capability to use _typeFilter in Bulk Export 2021-03-03 15:02:41 -05:00
Tue Toft Nørgård 70c2808ecd
Fix https://github.com/hapifhir/hapi-fhir/issues/2435 (#2436) 2021-03-03 08:51:27 -05:00
Tadgh 53598c3bdc Start with failing test 2021-03-02 13:18:43 -05:00
Tadgh 74066a81b6
Merge pull request #2420 from hapifhir/issue-2401-add-support-for-group-id-export
Issue 2401 add support for group id export
2021-02-26 10:23:42 -05:00
Ken Stevens 7d769e3b05
Issue 2332 create via put for implementationguide that references some placeholders (#2423)
* begin with failing test

* fixed.  test passes.

* documentation and changelog

* added ConceptMap

* review feedback
2021-02-26 09:44:48 -05:00
Tadgh 604b5d2060 Fix all broken tests 2021-02-25 19:11:18 -05:00
Tadgh 6c6b959cb5 fix test 2021-02-25 16:54:21 -05:00
Tadgh b0209fdaac Fix multi search parameter issue 2021-02-25 16:39:24 -05:00
Tadgh 1a5439fad5 Comment out unused mdm parameter 2021-02-25 16:27:57 -05:00
Tadgh 1663e367a6 Address review comments 2021-02-25 16:23:36 -05:00
Ken Stevens a2a3ffb7ec added failing test 2021-02-25 14:35:20 -05:00
Tadgh f6a913effe Fix NPE 2021-02-25 09:27:28 -05:00
Tadgh 8e060a05e0 remove fixme 2021-02-24 22:46:51 -05:00
Tadgh b725c51172 Change tests 2021-02-24 17:28:46 -05:00
Tadgh a56060a096 Tidy things from preliminary review 2021-02-24 17:16:54 -05:00
Tadgh 3937d2ef01 Remove some dead code 2021-02-24 15:57:55 -05:00
Tadgh 0033827f57 Minor refactor 2021-02-24 15:14:59 -05:00
Kevin Hartmann 26a385a595 Merge remote-tracking branch 'origin/master' into kh-20200222-search-list 2021-02-24 10:29:38 -05:00
Kevin Hartmann 1eab2caf9f Added _list as a valid parameter in MatchUrlService
Wrote tests for and/or/both processing in FhirResourceDaoSearchListTest.
2021-02-24 10:27:22 -05:00
Patrick Werner cf1f2f27db
added nullchecks to prevent NPE (#2417)
* added nullchecks to prevent NPE
fixes #2171

* Add test from #2171 and changelog

Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-02-24 10:09:04 -05:00
Ken Stevens 30905aeba7 Merge remote-tracking branch 'origin/master' into issue-2401-add-support-for-group-id-export 2021-02-24 09:38:59 -05:00
Kevin Hartmann 62bfa2cdbc Merge remote-tracking branch 'origin/master' into kh-20200222-search-list 2021-02-24 09:20:07 -05:00
Tadgh 627d2b9bd0 Tidy test 2021-02-23 18:53:18 -05:00
Tadgh 077225b87c Add chunking 2021-02-23 16:41:17 -05:00
Tadgh 7561889924 Partially complete groupbulkexportjob 2021-02-23 13:05:58 -05:00
Ken Stevens fb884f9f15 test infrastructure 2021-02-23 11:32:02 -05:00
Ken Stevens 330cafa83e initial implementation 2021-02-23 11:25:56 -05:00
Tadgh b5b8d27b39 Tidy code 2021-02-22 22:51:20 -05:00
Tadgh 66c2b456de Add more tests 2021-02-22 22:47:08 -05:00
James Agnew b108e43600
Allow partition date for non-partitionable resources (#2407)
* Allow partition date for searchparam resources

* Cleanup

* Test fix

* Documentation update

* Docs tweak
2021-02-22 20:49:09 -05:00
Tadgh a3c291336c partial add of new style of job 2021-02-22 17:00:01 -05:00
Ken Stevens 24efa97b17 begin with failing test 2021-02-22 11:37:32 -05:00
Tadgh d8ce476e99 Merge branch 'issue-2401-add-support-for-group-id-export' of github.com:jamesagnew/hapi-fhir into issue-2401-add-support-for-group-id-export 2021-02-22 10:25:26 -05:00
Tadgh d31b04ee65 wip 2021-02-22 10:25:24 -05:00
Ken Stevens 61a7f9ed6a added mdm flag 2021-02-19 20:51:52 -05:00
Ken Stevens 9bc051c193 added mdm flag 2021-02-19 20:47:43 -05:00
Ken Stevens 3de51103a3 fixed provider 2021-02-19 20:24:56 -05:00
Ken Stevens 1e0981b416 job call 2021-02-19 13:39:50 -05:00
Ken Stevens 00a8e3897a begin with failing test 2021-02-18 21:54:16 -05:00
Ken Stevens 70b2b83d1a begin with failing test 2021-02-18 21:47:43 -05:00
James Agnew 3eda19c65a
Version bump (#2400)
* Version bump

* Docs changes

* Docs tweaks

* Docs tweak

* Spelling fixes

* Docs tweaks
2021-02-18 11:07:49 -05:00
jamesagnew 919c1dbddc Version bump to 5.3.0 2021-02-17 07:10:13 -05:00
James Agnew 65ac0e80fb
Add CapabilityStatement customizer (#2387)
* Add CapabilityStatement customizer

* Fix javadocs
2021-02-15 14:58:34 -05:00
ianmarshall 88d820bf38 Make LOINC Top2000* files optional in terminology loader. 2021-02-11 09:12:08 -05:00
ianmarshall a383cb94fc Make LOINC Top2000* files optional in terminology loader. 2021-02-10 22:30:19 -05:00
Tadgh 2759db2a31
Merge pull request #2371 from hapifhir/config-error-on-url-protocol
Throw ConfigurationError if you attempt to provide a Rest URL that contains a protocol.
2021-02-09 20:25:14 -05:00
Tadgh 64878c23d3 Update text, add changelog 2021-02-09 19:03:09 -05:00
Tadgh 2e3712357f Throw configueration error when somebody tries to put a protocol in the rest URL 2021-02-09 18:59:11 -05:00
Ken Stevens 7f127f75f9
validate that Terminology beans are proxied so that @Transactional annotated methods are run within transactions (#2362) 2021-02-08 13:11:29 -05:00
Hanan Awwad 6384067e50
Customize concept display in value set expansion (#2282)
* fix issue #2280

* revert the indentation back.

* revert-back untouched changes.
2021-02-07 12:29:05 -05:00
James Agnew 92669b29da
Add elastic test (#2348)
* Add elastic test

* Rework

* Add test
2021-02-04 11:04:27 -05:00
James Agnew 0f31d106e5
Allow empty request details in JPA (#2343)
* Allow empty request details in JPA

* Test fixes
2021-02-02 11:00:14 -05:00
Mike G f61cb163ae refactor and modify for prefix and suffix 2021-02-01 12:11:11 -05:00
Frank Tao 1d835d82d6
Fixed Ucum Conversion NullPointerException issue (#2331)
* Fixed Ucum Conversion NullPointerException issue

* Revoke:save value to the original table if it can't be normalized
2021-01-30 19:30:12 -05:00
Ken Stevens ba63f65115
changed $expand filter matching from left-match to contains match (#2327)
* changed $expand filter matching from left-match to contains match

* changelog

* pure substring match is too generous (a regression test checked for that).  Tightened the match up to word boundaries.

* CLean up to avoid intermittent test failure

Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-29 12:37:54 -05:00
jamesagnew 8854f344b3 Add test 2021-01-28 16:22:36 -05:00
Nick Goupinets 3be480c9f0 Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-27 16:47:40 -05:00
James Agnew 909d9f742c
Enable Auto-reference versions in JPA (#2323)
* Automatic reference versions

* Auto reference versions

* resolve fixmes

* Add changelog

* Test fixes

* Test fixes

* Resolve fixmes

* Work on versioning

* Add support for _includes

* Update headers

* Change visibility

* One more tweak

* One more API tweak

* Fixes

* Account for review comments

* Fix errorprone reported issue

* Test fix

* Test fixes

* Test fixes
2021-01-27 14:49:10 -05:00
Nick Goupinets 04db4ed229 Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-26 09:18:20 -05:00
Ken Stevens 86ea0d60ef
reduce _count to the maximum page size rather than throwing an error. (#2319)
* reduce _count to the maximum page size rather than throwing an error.

Also when setting the paging provider on a restful server, automatically set the default page size and max page sized of the restful server from the paging provider.

* reword log message

* fixing this paging issue has uncovered all sorts of interesting things, including this long hidden bug!

* fix tests in sub-optimal way

* fix NPE

* fix test

* fixed a couple of bugs in SearchCoordinatorSvcImpl that surfaced when i added a default page size to RestfulServer
2021-01-25 08:19:29 -05:00
Frank Tao 1d1ebcf5e8
Improved DateQuery and removed 'OR' in the SQL (#2302)
* improved DateQuery and removed 'OR' in the SQL

* improved DateQuery and removed 'OR' in the SQL

* Date handling cleanup (#2316)

* Date handling cleanup

* Fix codecov

* One more fix

* Fix tests

Co-authored-by: James Agnew <jamesagnew@gmail.com>
2021-01-23 17:53:18 -05:00
Ken Stevens 749934d5f1
fixed name text indexing (#2309)
* fixed name text indexing

* fixed name text indexing
2021-01-22 15:39:26 -05:00
dependabot[bot] feff734736
Bump jaxb-runtime from 2.3.1 to 3.0.0 (#2289)
* Bump jaxb-runtime from 2.3.1 to 3.0.0

Bumps jaxb-runtime from 2.3.1 to 3.0.0.

Signed-off-by: dependabot[bot] <support@github.com>

* Bump jaxb-runtime from 2.3.1 to 3.0.0

Bumps jaxb-runtime from 2.3.1 to 3.0.0.

Signed-off-by: dependabot[bot] <support@github.com>

* Add jakarta bindings

* Dependency cleanup

* More depndency cleanup

* Work on deps

* Replace transaction annotation

* Cleanup

* Another fix

* Build fix

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-22 11:24:23 -05:00
Nick cfc798cb2b Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-22 09:45:04 -05:00
Frank Tao 341eb404e6
Improved the performance for multiple _has by exclude previous pids (#2304)
* Improved the performance for multiple _has by exclude prev pids

* Removed extra import

* Added test case for SQL contains RES_ID NOT IN ()
2021-01-21 14:42:10 -05:00
Nick ed5727d795 Fixed missing imports 2021-01-21 10:04:16 -05:00
jamesagnew 7cf41a7e85 One more build fix (grrrrrr) 2021-01-21 09:24:42 -05:00
Nick 82e52750e7 Merge branch 'master' into ng_20201218_survivorship_poc 2021-01-21 09:00:28 -05:00
jamesagnew 078a94f1a6 Fix nonnull annotations 2021-01-21 08:47:44 -05:00
James Agnew 14b0688f69
Bump core version to 5.2.16 (#2308)
* Bump core library version

* Test fix

* Build fixes

* Some test fixes

* One more bit of docs

* Build fix

* Test fix

* Test fix

* Docs fix
2021-01-21 05:30:23 -05:00
Tadgh 3d5255d88c Bump ES version running in tests 2021-01-20 11:34:51 -05:00
Nick f5e2086cfd Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-19 09:35:31 -05:00
Tadgh edbc789a93 Add annotation to skip test classes which require docker if it is not found on the host 2021-01-18 21:49:43 -05:00
Tadgh 7c6c64bfb7 Remove dead import 2021-01-18 15:53:49 -05:00
Tadgh 5b2530a948 Remove dead beans 2021-01-18 14:55:33 -05:00
Tadgh 8f72970063 Add bean to config 2021-01-18 14:09:38 -05:00
Nick b00f47ef81 Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-18 09:25:58 -05:00
James Agnew 66e1a51e01
Add validation options to RepositoryValidingInterceptor (#2294)
* Add repository validating interceptor outcome to response

* Add a doc

* Add a test and some docs

* Rework validation
2021-01-17 16:40:32 -05:00
dependabot[bot] 391a6d1a3f
Bump ph-schematron from 5.2.0 to 5.6.5 (#2184)
* Bump ph-schematron from 5.2.0 to 5.6.5

Bumps [ph-schematron](https://github.com/phax/ph-schematron) from 5.2.0 to 5.6.5.
- [Release notes](https://github.com/phax/ph-schematron/releases)
- [Commits](https://github.com/phax/ph-schematron/compare/ph-schematron-parent-pom-5.2.0...ph-schematron-parent-pom-5.6.5)

Signed-off-by: dependabot[bot] <support@github.com>

* Fix compile error

* Build fix

* Add test logging

* Test fix

* Resolve classpath duplicates

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-17 14:27:26 -05:00
James Agnew 29cf20aac3
Add repo validation outcome to response (#2293)
* Add repository validating interceptor outcome to response

* Add a doc

* Add a test and some docs
2021-01-17 12:50:13 -05:00
vedion 99b646eed7
Mapping noExtensibleWarnings and noBindingMsgSuppressed between FhirInstanceValidator and InstanceValidator (#2054)
Co-authored-by: ahn <anders.havn@systematic.com>
2021-01-17 09:21:08 -05:00
James Agnew 1dc4fb2206
Make quantity indexes use double datatype (#2290)
* Make quantity indexes use double datatype

* Add changelog

* Test fixes

* Test fixes

* Disable test
2021-01-16 18:44:15 -05:00
Nick 1d7ec3cc13 Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-15 14:18:27 -05:00
jamesagnew 4791c81aec Improve package loading logs 2021-01-15 06:19:57 -05:00
Nick 57662eedb3 Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-12 09:22:38 -05:00
jamesagnew ef407d85bf Add logging 2021-01-12 08:56:12 -05:00
Ken Stevens 520400d6ea
added IPagingProvider.canSearchByOffset() (#2281)
* init rev

* added IPagingProvider.canSearchByOffset()
consolidated parameters in bundle link methods

* fix refactoring error

* add @Nonnull to BundleLinks parameter

* null check

* fix test

* cleanup

* fix refactoring

* final cleanup

* review feedback

* review feedback

* review feedback
2021-01-11 20:42:41 -05:00
Nick 5aa85c7e17 Survivorship 6 2021-01-11 17:22:06 -05:00
Nick 684b77d396 Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-11 09:21:29 -05:00
Frank Tao f6d4a40388
UCUM Service Support (#2261)
* Added UcumServiceUtil

* Removed ucum-essense.xml

* Added ucum service existing test cases passed

* Added more test cases

* Merge branch 'master' into ft-ucum-support

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Added back extractReferenceParamsAsQueryTokens

* Added changelog and migration script

* Added length for the string type

* Moved UCUM util to hapi-fhir-jpaserver-model

* Renamed UCUM support to Normalized Quantity Search Support

* Moved setNormalizedQuantitySearchNotSupported to AfterEach

* Changed migrate task to 530

* Removed comments

* Fixed in memory search issue and added more test cases

* Fixed the version order

* License header updates

* Updated based on review comments

* Updated the migration task based on review comments

* Fixed RES_TYPE with type String and length 100

* Changed myParamsQuantityNormalizedPopulated type to Boolean class
2021-01-10 21:05:24 -05:00
Frank Tao 88b01a3bb4
Changed the minGramSize back to 3 (#2279) 2021-01-10 09:02:59 -05:00
Nick 9338a4e73e Survivorship 5 2021-01-08 19:25:25 -05:00
jamesagnew 0b6e8e3f4d Add license header 2021-01-08 16:35:42 -05:00
ianmarshall 14270e8aa4 Remove the now redundant PackageSystemRequestDetails class. 2021-01-07 10:18:39 -05:00
ianmarshall e23e3c660c Merge remote-tracking branch 'origin/master' into im_2021_01_04_package_load_with_partitioning 2021-01-06 12:23:21 -05:00
ianmarshall 634f7a8026 Fix typo. 2021-01-06 10:33:47 -05:00
ianmarshall 659e83f451 Address use case where packages include non-conformance resources. Update documentation as well. 2021-01-06 10:29:10 -05:00
jamesagnew 496a8bd3cd Test fix 2021-01-05 18:41:43 -05:00
James Agnew 0bb878e4a8
Repository validation enhancements (#2270) 2021-01-05 18:22:34 -05:00
jamesagnew 12d366c86e License header updates 2021-01-05 18:13:14 -05:00
Tadgh efc6809ea6
Replacing Hibernate Search 5 with Hibernate Search 6 (#2190)
* Beginning work on converting to hibernate search 6
* replace all out of date properties
* replace all POM references to old versions
* remove the shaded ES jars as HS6 supports 7.9
* Convert "Bridges" to RoutingBinder and RoutingBridge
* Modernize all indexing annotations
* Begin refactoring of search queries (wip)

* Fix spatial API changes, work on BaseTermReadSvcImpl

* Most of the way through the various filter property conversions

* Finished i think with BaseTermReadSvcImpl

* Compiling, but definitely broken

* Start test compilation failures

* All tests compiling (i think)

* remove suggest keywords operation

* Fix bootstrap errors, still have to deal with transient fields

* Rollback CR

* More refactoring, got IDs baked back into docs

* Fix coord util, fix a few more fields which require projection

* merge fixes

* begin refactor of valuesetexpansion tests

* fix another test

* Update tests

* remove todos, add TestContainers

* Fix descendant in

* Add testcontainers, fix another test

* fix more tests, replace embedded es

* Rip out embedded elastic, replace with TestContainer

* merge conflicts for new analyzers

* Bump to CR2 for hibernate search 6. Add forgotten CLI dep. Add backwards compatible codecs

* Remove dead deps, update testcontainer

* Remove java-hamcrest

* Pull asserts up, refactor tests to pass in RP tests

* Update V2 check

* Remove suggest keyword tests

* Split line for testing

* Fix perhaps one of the dumbest programming mistakes in my career so far

* Refactor tests which no longer rely on a strict known order

* Fix up test config, disable log test temporarily

* Remove log4j from being transitively pulled in. re-enable test

* Update log4j exclusions with new bridge. Update test to check for core class

* Move dependency to root pom in dep management section

* Update changelog, add changelog for HS6 with ES requirements. Remove dead comment

* update testst, remove todos

* Add hibernate props provider method, add elastic regexp query

* Add todo for high level client builder

* Modify ElasticsearchRestClientFactory to support HTTPS hosts

* Remove protocol extraction from rest url

* do we even need to index this...?

* remove purge of non-indexed resources

* Add longer timeout to testcontainers

* Add task to add docker CLI to azure pipeline via task, for testcontainers

* WIP remove this

* Dont update version

* Add test for duplicate termconcepts

* Use real hibernate ORM methods

* merge issues

* Add partitionsettigns bean to match master

* Trying to debug testcontainers on azure...

* Trying to debug testcontainers on azure...

* Run even on previous failure

* Fix testcontainer port binds

* Add full text logs attaching, and test reporting

* I love yaml

* Remove comment

* Refactor delta remove to not do a once-over traversal and flatten all children pre-delete. Resolves transaction commit boundary issue

* Modify TX beheaviour

* wip

* Rework to use config and mocked beans for partition-aware lastN

* rework to not use beans and just inject vars i need for test, keps test envs cleaner

* update azure pipeline to only copy test results

* Remove erroneous publish

* Always get test logs

* Make it so indexing works,

* Add todos

* revert deleteByPid

* Work on test fixes

* Test fixes

* Test fixes

* Another test fix

* Test fix

* Work on tests

* Test fixes

* All tests passing locally

* Fix test failure

* FIx build error

* Rename usages of HibernateDialectProvider -> HibernatePropertiesProvider

* Update ngram of token filters

* Tidying

* subvert the purpose of hibernate elastic props builder to inject template

* dead space

* Rename changed class

Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-05 17:56:59 -05:00
ianmarshall 446dd5c782 Fixed package loading to enable loading of binary package files into the default partition when partitioning is enabled. 2021-01-05 17:51:04 -05:00
James Agnew d943260927
Rework valueset index for MySQL (#2269)
* Rework valueset index for MySQL

* Add changelog
2021-01-05 10:03:33 -05:00
ianmarshall 1f0ea21cde Changes per code review plus test fixes. 2021-01-04 19:09:04 -05:00
ianmarshall bac47dbbf6 Changes per code review plus test fixes. 2021-01-04 19:06:39 -05:00
ianmarshall 8a2dfe86fd Merge remote-tracking branch 'origin/master' into 2260-fix-sorting-for-mysql 2021-01-04 09:00:21 -05:00
James Agnew 3e6d80bdc2
Fix SQL Server paging with new querybuilder (#2265)
* Fix SQL Server paging with new querybuilder

* Add changelog
2021-01-02 11:13:51 -05:00
jamesagnew d20b07c78e Update license headers 2021-01-01 15:50:24 -05:00
jamesagnew f30999b053 License header updates 2021-01-01 15:07:23 -05:00
James Agnew 8f8c5c31f1
Add validation rules interceptor (#2264)
* Start work on validation rules interceptor

* Work on interceptor

* Add tests

* Work on validation interceptor

* Work on interceptor

* Test fix

* Documentation tweaks
2021-01-01 14:29:10 -05:00
ianmarshall 63e0c90023 Change order by clause in search query to support MySQL, MSSQL and MariaDB. 2020-12-24 13:54:37 -05:00
Frank Tao 89cf6e6293
Fixed the pre-expansion with filter issue (#2257)
* Fixed the pre-expansion with filter issue

* Changed minGramSize to 3 instead of 2
2020-12-17 23:31:33 -05:00
Tadgh e79114e2ec
Un-revert the MDM changes, now that issues have been addressed (#2226)
* Backward compatibility changes

* Revert "Revert "Remove all references to Person from EMPI.""

* Updated docs

* Removed mdm channel references

* Initial implementation

* fix coarseness bug. Fix tests. reinitialize silly bean

* Add forgotten json file

* Generic provider PoC

* Refactored provider to use BundleBuilder

* Removed version-specific MDM providers

* Addressed code review comments

* Fixed after merge

* Fixed docs

* MDM SVG for Update Use Cases

* Removed obsolete docs

Co-authored-by: Nick <nick.goupinets@smilecdr.com>
Co-authored-by: Nick Goupinets <73255752+nvg-smile@users.noreply.github.com>
2020-12-17 10:12:53 -05:00
Frank Tao effbd19924
Merge pull request #2240 from hapifhir/ft_support_composite_sort
Add support for composite sorting
2020-12-16 16:54:56 -05:00
Frank Tao de845300c2 Updated based on the review comments 2020-12-16 15:48:10 -05:00
Frank Tao 0411967e26 Added composite sort test case for R5 2020-12-11 22:25:12 -05:00
Frank Tao dcbdc83d8e Supported composite sort 2020-12-11 21:50:32 -05:00
Ruslan Zinovyev 368e9a9b56
Rz 20201207 remove component scan (#2228)
* deleted component scan

* added fixme

* fix abstract bean

* fixed

* final bean fixes

* added fixes

Co-authored-by: Ken Stevens <khstevens@gmail.com>
2020-12-11 09:18:27 -05:00
James Agnew e4d6c51290
Allow plus symbol in email address match url (#2224)
* Allow plus symbol in email address match url

* Add changelog
2020-12-09 21:52:03 -05:00
Tadgh 0938d72b51
Revert "Remove all references to Person from EMPI." 2020-12-09 14:57:00 -05:00
Nick efb429b319 Fixed todos and reverted FK check in the test 2020-12-08 13:00:02 -05:00
Nick 6018dd0537 Fixed ambitious schema update 2020-12-08 10:44:11 -05:00
Nick d3c0944388 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-07 22:02:45 -05:00
Nick fd90eb699f Review updates 2020-12-07 18:03:56 -05:00
James Agnew fd528a0f7d
Improve error message on unsupported resource type (#2221)
* Improve error message on unsupported resource type

* Add changelog
2020-12-07 17:35:51 -05:00
Nick f5f7f2df14 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-07 11:55:51 -05:00
James Agnew d958764d49
Partition data leaks across searches (#2220)
* Partition data leaks across searches

* Add changelog

* Resolve FIXME

* Add test logging

* Test fix

* Test fix
2020-12-06 16:32:07 -05:00
Nick 4352e0a61f Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-03 11:28:21 -05:00
James Agnew 1eae5db374
autoCreatePlaceholderReferenceTargets true breaks multitenancy (#2215)
* Fix #2209 - autoCreatePlaceholderReferenceTargets true breaks multi-tenancy

* Add changelog

* Address fixme
2020-12-03 08:53:37 -05:00
James Agnew 35f4d48eee
Fix validating capabilitystatements (#2214)
* Fix validating capabilitystatements

* Add changelog
2020-12-03 05:31:04 -05:00
Nick Goupinets ffee7a894f Removed person refs 2020-12-02 17:41:42 -05:00
James Agnew a3ae6c3813
Add partition selector to id parameter (#2208)
* Add partition selector to id parameter

* Add changelog
2020-12-02 14:10:37 -05:00
Nick Goupinets 417ae55cb4 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-02 09:29:47 -05:00
James Agnew 6e72ee8f6b
Fix new searchbuilder on oracle (#2205)
* Fix new searchbuilder on oracle

* Add changelog
2020-12-02 06:22:41 -05:00
jamesagnew 18541d4388 Correctly chunk resource version queries 2020-12-01 17:20:44 -05:00
Nick Goupinets d63c580e82 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-01 13:18:42 -05:00
James Agnew c309737166
Allow reading from multiple partitions (#2198)
* Partitioning rework

* Work on partition improvements

* Partition updates

* Work on partitiong

* Test fixes

* Add docs

* Add changelog

* Resolve FIXME

* Test fixes

* Test fixes

* Test fixes

* Compile fix

* Fix compile error

* Test fix

* Test fixes
2020-11-30 17:59:52 -05:00
Nick Goupinets 3f3b811b16 Fixed Foreign Key references 2020-11-30 17:21:56 -05:00
jamesagnew 74aed5d107 License headers 2020-11-29 20:53:19 -05:00
Ken Stevens 3d3242cf9a
Resource change listener (#2191)
* init rev

* fix build

* Tweaked the POM config settings and also added some dependency exclusions (commented out for now).

* More re-factoring of the CQL Unit Tests.

* Removed a LogMessages.html file and a minor Unit Test change.

* Unit Tests.

* added debug logging to troubleshoot the dao that has no name

* added debug logging to troubleshoot the dao that has no name

* workaround to get past null dao resourceName issue

* fix jsons to get test to pass.  Test still fails with library id problem

* gitignore

* gitignore

* test passes!  Woohoo!

* undo troubleshooting logging

* added timer and logging.

* added asserts and time multiple evaluations and measure the average

* readme

* adding explanations

* added more explanatory notes

* measure 2 patients

* move pom to use cqf snapshot

* roughed out cache

* roughed out cache

* Added code to VersionChangeCache class.

* added tests

* added polling test

* wrote init version

* wrote init version

* optimized versioncache

* worked on getting tests to pass

* redesigned interfaces

* all tests pass

* fixmes

* fixmes

* rename param

* Added Unit Tests.

* javadoc

* Fixed the 2-Patient Unit Test.

* More Unit Test work.

* make ResourceVersionMap immutable

* Fixed a Unit Test that was failing intermittently by adding a new way to refresh the cache.

* Use a new method called doRefreshAllCaches(0) to force a refresh and have all Listeners called immediately.

* Cleaned up IVersionChangeListenerRegistry interface to make methods more clear and resolved all Unit Tests.

* disabled tests

* disabled tests

* removed unused test method

* fixed refresh logic and added asserts

* moved cache so it can be used by searchparamregistry

* Updated the Cql Unit Tests to be properly configured for Dstu3 or R4.

* started rewriting SearchParamRegistryImpl to use new cache
added init method to listener interface

* added fixmes

* adding tests

* tests pass

* added tests

* Fixed the way CqlProviderFactory Autowires Beans so it can work with both Dstu3 and R4 contexts.

* moar tests

* fix test

* work tests

* reverting unneccessary refactors

* undo unneccessary import changes to reduce MR size

* undo unneccessary import changes to reduce MR size

* Unit Test fixes...more to come...

* add unregister

* fix tests

* Changed ResourceVersionCache to use a Map of Maps.

* searchparam test

* test passes

* resolved fixme

* fixmies

* strengthen test asserts

* More Unit Test changes and added some FIMXME items.

* changed from long to changeresult

* renamed VersionChange -> ResourceChange

* fixed delete bug

* organize imports

* fix test

* add update test

* add test reset function

* fix stack overflow

* fix startup race condition (might still be intermittent)

* found the problem.  delete doesn't work because we can't look up the deleted resource to find out what its name is

* fixed regression

* abandoned idea of incrementally updating searchparam registry.  Rebuilding every time--it doesn't change that often.

* fix test

* begin with failing test

* test passes

* fixmes and javadoc

* fix test

* fixme

* fix test

* whack-a-mole.  Either subs pass or cql passes.  Something's fishy with the FhirContext

* fix subscription test initialization

* fix method name

* Re-factored the CqlProvider Unit Tests.

* changed ResourceChange API

* add interface

* add interface

* fix test

* add schedule test

* add doc

* init rev

* FIXME

* modify FhirContext change

* change fhirContext.getResourceTypes to lazy load

* converted subscriptions

* converted subscriptions

* begin with failing test

* test passes

* fix test

* test coverage

* test coverage

* test coverage

* test coverage

* good coverage now

* pre-review cleanup.  I think I found a bug.

* moved cache into listener entry
tests pass with fixmes

* fix test

* fix test

* fix test

* fixme

* FIXMEs

* merge cache and registry

* method reorg

* javadoc

* javadoc done.  all FIXMEs resolved.

* change log

* changes needed by cdr

* spring config cleanup

* james feedback

* james feedback

* might not work. Try moving resourcechangeconfig into searchparam config

* merge ResourceChangeListenerRegistryConfig.java into SearchParamConfig

* fix test

* fix SubscriptionLoader

* fix SubscriptionLoader

* create ResourceVersionMap from resources

* added cache handle interface

* fix test

* javadoc

* fix test

* fix test

* James feedback: clone searchparametermap

* fix startup

* fix test

* fix test

* fix intermittent

* pre-review cleanup

* FIXME

* final FIXME yay!

* Address a couple of my own reviw comments

Co-authored-by: Kevin Dougan <kevin.dougan@smilecdr.com>
Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2020-11-29 19:42:40 -05:00
James Agnew 1e5def260c
Bump woodstox version (#2199) 2020-11-27 19:49:06 -05:00
Nick Goupinets 2a3b72db17 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-11-27 16:54:04 -05:00
Nick Goupinets dc2a9e55c5 Renamed sourceResource to goldenResource 2020-11-27 16:53:47 -05:00
jamesagnew fbbba11417 Formatting only 2020-11-27 16:16:01 -05:00
IanMMarshall 722e24d80c
Merge pull request #2175 from jamesagnew/ft-fix-expend-filter-contains-issue
Fixed expand filter issue
2020-11-27 14:47:05 -05:00
ianmarshall bbba4428ee Changed name for new tokenFilter to make it unique. 2020-11-27 11:38:24 -05:00
ianmarshall be88a256d0 Changed name for new tokenFilter to make it unique. 2020-11-27 11:32:08 -05:00
Frank Tao 014e2ba9cb Rework on the expand issue replaced the EdgeAnalyzer 2020-11-26 20:37:51 -05:00
Frank Tao a511543e77 Merge branch 'master' into ft-fix-expend-filter-contains-issue
# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoValueSetR4.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoValueSetR5.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java
2020-11-26 18:47:10 -05:00
swagers cb693afe25
Changed the names URIs and IDs of a few LOINC concept maps (#2197)
Changed to match what LOINC uses for these concept maps

Co-authored-by: Steven Wagers <swagers@regenstrief.org>
2020-11-26 10:06:17 -05:00
James Agnew fb8658da70
Always apply vs filters correctly (#2195)
* Always apply valueset filters correctly

* Test fix

* Testfix

* Test fix

* Add changelog

* Test fix
2020-11-24 18:12:02 -05:00
Frank Tao 3d9e0aeac1 Added more test cases 2020-11-23 21:32:46 -05:00
Frank Tao 5a05513250 Revoked filter op to EQUAL and enabled NGramAnalyzer 2020-11-21 14:46:26 -05:00
Frank Tao 5b471602c6 Merge branch 'master' into ft-fix-expend-filter-contains-issue 2020-11-20 10:29:58 -05:00
James Agnew a01f5ae906
Fix subsumption test direction (#2183)
* Fix subsumption test direction

* Add changelog

* Test fixes
2020-11-19 21:48:54 -05:00
James Agnew 8b65db0c98
Improve error message on unique constraint violation (#2182)
* Improve error message on unique constraint violation

* Add changelog

* Test fixes

* Test fix
2020-11-19 21:20:59 -05:00
Frank Tao e551f1837e Updated based on review 2020-11-19 20:22:13 -05:00
Tadgh 953b662827 Merge branch '2161-refactor-empi' into gg_20201105-remove-person-references 2020-11-19 14:24:51 -05:00
ianmarshall d99db2dbcc Fixed NPE in package loader when package description is null. Also renamed tests that would have caught this problem sooner. 2020-11-18 22:37:35 -05:00
Frank Tao 878c22192e Added expand filter impl for R5 and dstu3, changed the filter logic 2020-11-18 22:26:21 -05:00
Frank Tao f65fdb0d52 Merge branch 'master' into ft-fix-expend-filter-contains-issue 2020-11-18 19:54:01 -05:00
Tadgh 75c0c25d7b remove references to EMPI 2020-11-18 19:50:00 -05:00
jamesagnew 0c31741eec Version bump to 5.3.0-SNAPSHOT 2020-11-18 14:52:43 -05:00
jamesagnew 4d441ad7f2 Version bump to 5.2.0 2020-11-18 06:30:20 -05:00
Tadgh 805d5b1d6c Merge branch '2161-refactor-empi' into gg_20201105-remove-person-references 2020-11-17 09:28:37 -05:00
IanMMarshall 7532313c0f
Change to not set ValueSet expansion component parameter id HibernateSearch not enabled. (#2178)
Co-authored-by: ianmarshall <ian@simpatico.ai>
2020-11-17 07:46:55 -05:00
Frank Tao 78f730c4ca Fixed expend filter issue 2020-11-15 22:39:14 -05:00
jamesagnew 1db0944243 Improve logging for terminology ingestion 2020-11-13 17:25:14 -05:00
IanMMarshall ed953d82f8
Rename index that was recently changed. (#2173)
* Restoring name of index that was changed in migration task.

* Rename TermValueSetConcept index that was recently changed.

Co-authored-by: ianmarshall <ian@simpatico.ai>
2020-11-13 14:12:25 -05:00
Tadgh f648d8ec2b renaming in personsvc 2020-11-13 09:44:15 -05:00
Nick Goupinets 2bbfb6dfaa WIP 2020-11-11 15:27:57 -05:00
Nick Goupinets b0f449ff5e MergerSvcTest WIP 2020-11-11 10:17:03 -05:00
IanMMarshall bf9e02bc16
Merge pull request #2164 from jamesagnew/im_20201029_ig_package_long_description
Truncate package descriptions that are longer than 200 characters.
2020-11-10 12:01:53 -05:00
James Agnew 63b7b379c2
Improve ValueSet filtering (#2162)
* Improve filter search

* Filter improvements

* Tests passing

* Test fixes

* Fix transaction filter

* Add changelog

* Test fix

* Update hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

* Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

* Resolve FIXME

* Test fix

* Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-11-10 11:01:13 -05:00
ianmarshall 881193cf24 Truncate package descriptions that are longer than 200 characters. 2020-11-09 16:19:05 -05:00
jamesagnew 4f6be9d9a7 Reduce test timeout 2020-11-09 14:46:15 -05:00
Nick Goupinets 4c0fab8cec Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-11-09 09:06:50 -05:00
jamesagnew 22fe9420ac Add tests 2020-11-06 09:10:47 -05:00
Tadgh 5797cd0682 * Add source_resource_id column
* Add source_resource columm
Still need to depracate the old columns.
Reworked a Matcher to ignore Person
2020-11-05 13:07:45 -05:00
Frank Tao ce1caee9fa
Feature 2020 10 28 reverse chain (#2160)
* Added test cases for multiple '_has'

* Fixed composite search for the new SearchBuilder

* Added more test cases
2020-11-05 05:27:11 -05:00
IanMMarshall 38a975f09d
Im 20201028 fix versioned valueset expansions (#2151)
* Fixes to ValueSet expansion for cases where CodeSystem is versioned.

* Fixes to ValueSet expansion for case where URL and filter parameters specified.

* Restore maven-wrapper.properties file inadvertently deleted from GitHub.

* Fix JUnit tests and ValueSet exclude.

Co-authored-by: ianmarshall <ian@simpatico.ai>
2020-11-04 16:36:43 -05:00
James Agnew 228e75b501
Bump core to latest versions (#2154)
* Bump core to latest versions

* Compile fix

* Bump to non snapshot core library
2020-11-03 15:43:37 -05:00
jamesagnew 783cbb3cf8 Bump postgres driver version 2020-10-26 19:34:50 -04:00
James Agnew 72294fc0a0
Suport typeFilter parameter for bulk export (#2147)
* Cleanup

* Fix tests

* Work on bulk export

* Work on export

* Test fixes

* Add changelog

* Address review comments

* Address review comments
2020-10-26 12:28:07 -04:00
James Agnew 8000d2d0cf
SQL Join Rework (#2086)
* switched to adding annotations.  Just did a test with Token, but the sql looks clean.

* switched to adding annotations.  Just did a test with Token, but the sql looks clean.

* added the other six index links

* trying different annotations

* Start testing

* Update resources on package install

* Add changelog

* Join rework

* CLean up SQL builder

* Add docs

* SP rework

* Join work

* Work on params

* Work on refactor

* Work on chains

* Work on joins

* Rework queries

* Work on queries

* Many more tests passing

* Refs test

* Work on sorting

* Work on tests

* More joins work

* Work on tests

* Work on queries

* Tests passing

* More test fixes

* Test fixes

* Work on SQL

* Tests passing

* Add some tests

* Add some tests

* License headers

* Use entity manager to get datasourcd

* One more fix

* Model cleanup

* Ongoing work

* Fixes

* Fixes

* Work on joins

* Ongoing fixes

* Merge conflict

* Cleanup

* clean up unused fields

* Work on join

* COmpile fix

* Rework querying

* Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HibernateDialectProvider.java

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Address review comments

* Resolve fixmes

* Test fix

* Test fixes

* Test fix

Co-authored-by: Ken Stevens <khstevens@gmail.com>
2020-10-26 05:24:26 -04:00
James Agnew 4a5f5199b5
Add custom partition interceptor examples (#2145)
* Add custom partition interceptor examples

* Add documentation

* Test fixes

* Remove outdated test

* Test modification
2020-10-25 19:19:40 -04:00
blangley28 d468183edd
Validate theSearchParamRegistry is not null (#2142) 2020-10-23 10:29:55 -04:00
IanMMarshall 1c9e4dcc81
Merge pull request #2135 from jamesagnew/im_20201015_loinc_versioned_resourceids
Im 20201015 loinc versioned resourceids
2020-10-22 19:01:31 -04:00
IanMMarshall fd46d0965f
Merge pull request #2141 from jamesagnew/im_20201020_package_installer_enhancements
Enable package installer to load non-Conformance resources
2020-10-21 18:28:15 -04:00
ianmarshall 115b09e4d4 Throw exception if any resources in package have no url and no identifier. 2020-10-21 17:23:40 -04:00
ianmarshall 756432e61a Enable package installer to load resources other than conformance resources. 2020-10-21 15:47:31 -04:00
jamesagnew 9b4c1a58a6 License header updates 2020-10-21 12:58:29 -04:00
Ken Stevens 3b91873b7c
delete expunge (#2131)
Added delete _expunge=true
2020-10-20 17:21:50 -04:00
James Agnew 9e8e98b6fb
Rework scheduler to use Spring factory (#2134)
* Rework scheduler to use Spring factory

* Add test
2020-10-19 10:33:12 -04:00
ianmarshall f3639ee1ce Changes to terminology loader to support preserving the original resource IDs for LOINC even when multiple versions are loaded. 2020-10-16 16:30:37 -04:00
Tuomo Ala-Vannesluoma 1435540320
Improve synchronous searching by providing offset & limit support (#2059)
* Improve synchronous searching by providing offset & limit support

Add support for offset querying which leverages paging at the query level
Add configuration for search default page size and search maximum page size
If using offset, always use synchronous searching to avoid extra database insert/update etc.
When using offset, only calculate count if it's wanted
Validate params closer to provider and handle size if search returned "all" (or last)

* Review and test fixes

Comment _offset as nonstandard parameter
Make synchronous search always count the total value (for now)
Fix issue with FulltextSearchSvcImpl mutating param map
Dirty fix for BaseJpaTest (not sure how to fix the including resources issue)

* Remove temporary count querying fix for synchronous loads

* Fix offsetting of everything operations, do not drop zero offset

* Fix jpa test default and maximum page size, add some fixmes to tests before resolved

* Ignore one failing test, fix others

* Fix Dereferenced variable may be null

* Fix everything paging in R4 by adding DISTINCT if synchronous load is used

Also fix assertion of size when hitting fetchSizeDefaultMaximum

* Add documentation about offset annotation and paging

Co-authored-by: James Agnew <jamesagnew@gmail.com>
2020-10-12 17:42:03 -04:00
vedion e4214a4cbe
Exposing hasIncludes PersistedJpaBundleProvider (#2047)
Co-authored-by: ahn <anders.havn@systematic.com>
2020-10-12 17:37:12 -04:00
James Agnew 2134d40f1c
Account for timezones in lastUpdated search (#2113)
* Add test

* Fix

* Add changelog

* Test fixes

* Test fix

* Test fixes

* Resolve fixme

* Test fixes

* Remove debug logs

* Try to get CI tests passing again
2020-10-09 07:52:46 -04:00
IanMMarshall a44037daf3
Merge pull request #2122 from jamesagnew/im_20201007_conceptmap_sourcesystemversion
Fixed loader so that it now sets source system version for ConceptMap…
2020-10-08 14:04:49 -04:00
James Agnew d2aae361bf
Rewrite deferred interceptor callback framework (#2121)
* Rewrite deferred interceptor callback framework

* Improve deferred handling

* Null guard

* Test fix
2020-10-07 20:08:18 -04:00
ianmarshall 476eba676e Fixed loader so that it now sets source system version for ConceptMap resources. 2020-10-07 15:07:25 -04:00
ianmarshall 46b2fde1db Fixed tests to accommodate suggested changes from code review. 2020-10-07 11:07:34 -04:00
IanMMarshall 1bac646dc3
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-07 11:01:54 -04:00
IanMMarshall e24e233ec6
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-07 11:01:47 -04:00
ianmarshall 0f39eeb0e9 Bug fix and test improvements. 2020-10-06 21:22:09 -04:00
ianmarshall d9841e59ac Restore ability to load LOINC PartLink data from a single file for pre-2.68 versions. 2020-10-06 14:36:23 -04:00
IanMMarshall 5ec1284b8a
Apply suggestions from code review
Edits per code review.

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-05 15:14:39 -04:00
ianmarshall 2258d37283 Documentation for terminology. 2020-10-05 09:02:00 -04:00
IanMMarshall f1710fd0be
Merge pull request #2081 from jamesagnew/feature_2020_09_02_term_multi_version_support
Feature 2020 09 02 term multi version support
2020-10-01 12:24:40 -04:00
ianmarshall 90f1981817 Updated tests for missed dstu2 code coverage. 2020-09-30 18:10:57 -04:00
ianmarshall dc3443665c Changes per code review. 2020-09-29 21:12:27 -04:00
ianmarshall 8e7b4e8437 Changes per code review. 2020-09-29 21:05:28 -04:00
Ken Stevens 09d09233ff
empi bugfixes and enhancements (#2104) 2020-09-29 17:27:43 -04:00
IanMMarshall c593958d2c
Apply suggestions from code review
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 15:16:46 -04:00
IanMMarshall d63c15ef09
Apply suggestions from code review
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:27:57 -04:00
IanMMarshall 43c16e1737
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:27:03 -04:00
IanMMarshall 43b6bd38ff
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:26:30 -04:00
IanMMarshall 2be47b5567
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:18:21 -04:00
IanMMarshall b8531e599f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:18:00 -04:00
IanMMarshall 3940e7526f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:17:36 -04:00
IanMMarshall 6aa1a5ec3f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:17:19 -04:00
IanMMarshall ebb3fa0ca1
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:16:56 -04:00
IanMMarshall 10620a8bb4
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderCodeSystemDstu3.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:16:13 -04:00
ianmarshall 9d8664ccd8 Additional tests and updates. 2020-09-27 21:09:06 -04:00
ianmarshall e86d9deaac Additional tests. 2020-09-27 17:45:15 -04:00
ianmarshall 732624bfaf Fix broken JUnit test. 2020-09-25 22:55:01 -04:00
ianmarshall 1dc4a533d6 Fixes to terminology loader. 2020-09-25 21:43:15 -04:00
ianmarshall 47244c54dc Merge remote-tracking branch 'origin/feature_2020_09_02_term_multi_version_support' into im_20200728_term_multi_version_support
# Conflicts:
#	hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java
#	hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
#	hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java
2020-09-25 09:10:07 -04:00
ianmarshall 6f9874468a Merge remote-tracking branch 'origin/master' into feature_2020_09_02_term_multi_version_support 2020-09-25 08:54:17 -04:00
ianmarshall 2bceacd9a6 Update loader to ensure that ConceptMap and ValueSet Ids are unique for each version loaded. 2020-09-25 08:51:53 -04:00
ianmarshall 5fe46be41c Validate code changes and new tests. 2020-09-24 18:51:47 -04:00
ianmarshall e5daea17b7 Additional cleanup and migration tasks. 2020-09-23 17:17:07 -04:00
ianmarshall dffc02a126 Missing fixes for DSTU3 and R5. 2020-09-23 16:51:18 -04:00
ianmarshall 640ee94c5c Merge remote-tracking branch 'origin/master' into im_20200728_term_multi_version_support 2020-09-23 16:43:22 -04:00
ianmarshall ceb5ec6384 Use canonical identifiers for code systems rather than specifying version separately. 2020-09-23 16:42:29 -04:00
Frank Tao 3d3d013d72 Changed import of IdType to r5. 2020-09-23 09:19:06 -04:00
Frank Tao b6d86dc5f2 Added fail(); in the invalid test cases 2020-09-22 20:39:20 -04:00
Frank Tao 20661c7a2b Removed unused import 2020-09-22 20:19:43 -04:00
Frank Tao 673274a966 Added invalid test cases for CodeSystem/$validate-code R3 2020-09-22 20:18:18 -04:00
ianmarshall b32c4f01a8 Fixed lookupCode implementation in InMemoryTerminologyServerValidationSupport. 2020-09-22 18:46:16 -04:00
ianmarshall 4216cee8c6 Added and enhanced tests plus fixes arising from tests. 2020-09-22 14:44:32 -04:00
James Agnew ef4f3df945
Don't install draft package contents (#2099)
* Don't install draft package contents

* Add changelog

* Add changelog
2020-09-22 09:44:36 -04:00
James Agnew 072e63be5a
Avoid a crash on double date chains (#2097)
* Avoid a crash on double date chains

* Add changelog

* Address coverage warning
2020-09-21 15:43:07 -04:00
ianmarshall f9f8bf6515 Merge remote-tracking branch 'origin/master' into im_20200728_term_multi_version_support 2020-09-20 22:02:08 -04:00
ianmarshall 302bbca8fd Changes to support multi-versioning in ValueSet $expand operation. 2020-09-20 22:01:21 -04:00
Frank Tao 8f692a4776 CodeSystem/$validate-code not supported for DSTU2, DSTU3 2020-09-19 22:54:39 -04:00
Frank Tao a3a032584b Made Transactional 2020-09-19 15:18:28 -04:00