Commit Graph

6635 Commits

Author SHA1 Message Date
Ken Stevens 7322760f5d Merge remote-tracking branch 'origin/spring-batch-integration' into spring-batch-integration 2020-06-25 15:27:46 -04:00
Ken Stevens c11b6eeab6 back out Tx wrap
use qualifier
2020-06-25 15:27:31 -04:00
Tadgh 21567fdc43 Tidy await 2020-06-25 11:42:17 -07:00
Tadgh ed155e7657 wip 2020-06-25 10:37:02 -07:00
Tadgh 1d9641a736 fix empilinks 2020-06-25 10:28:03 -07:00
Ken Stevens 93da042d19 fix empi tests so they work with Spring Batch
(all but one test fixed)
2020-06-25 11:14:42 -04:00
Tadgh e51c5b5263 change transactionmanager name so it doesnt shadow the batchprocessing one 2020-06-24 21:03:02 -07:00
Tadgh 06e1368388 Re-add comment 2020-06-24 21:00:45 -07:00
Tadgh 6875740178 Merge branch 'spring-batch-integration' of github.com:jamesagnew/hapi-fhir into spring-batch-integration 2020-06-24 20:15:47 -07:00
Tadgh 3da4ad280b undoes merge issues 2020-06-24 20:00:52 -07:00
Ken Stevens a69c1478a2 Merge remote-tracking branch 'remotes/origin/master' into spring-batch-integration 2020-06-24 22:07:38 -04:00
ianmarshall 55ff15d039 Merge remote-tracking branch 'remotes/origin/master' into im_20200619_mariadb_expand_valueset_fix 2020-06-24 17:43:34 -04:00
ianmarshall 053094f2a6 Apply recent fixes for MySQL migration tasks to MariaDB as well. 2020-06-24 17:42:46 -04:00
Tadgh 571589d00d Merge branch 'master' into spring-batch-integration 2020-06-24 13:46:13 -07:00
Tadgh 64dbd038c9 Increase min thread count for batch. Add new which waits for all bulkexport jobs to be done 2020-06-24 13:16:11 -07:00
ianmarshall 5e3e7c46a8 Changes to support valueset expansion with Elasticsearch. 2020-06-24 15:48:06 -04:00
Tadgh 99fe66bb58 Fix pom to use project.version 2020-06-24 11:52:05 -07:00
Tadgh a7740922f9 Specify version 2020-06-24 11:02:52 -07:00
Tadgh 59659b2802 Move order of modules 2020-06-24 10:11:30 -07:00
Tadgh 2bd17806c4 Update changelog 2020-06-24 09:46:56 -07:00
Ken Stevens 38a2b00663
Empi 69 and candidates (#1936)
broaden empi blocking searches to support and searchparams as well as ors
2020-06-24 09:12:56 -04:00
Tadgh 4cccc9804b nop for CI 2020-06-23 16:29:36 -07:00
Tadgh bb7a773f41 Merge branch 'master' into spring-batch-integration 2020-06-23 16:02:41 -07:00
James Agnew e65c264927
Support double _has expressions (#1939)
* Support nested _has queries

* Add changelog
2020-06-23 17:58:47 -04:00
James Agnew 6825d2fcf0
Reduce DB roundtrips for revincludes (#1937)
* Reduce DB roundtrips for revincludes

* Add changelog
2020-06-23 16:26:04 -04:00
James Agnew f88298a1fb
Remote terminology service enhancements (#1934)
* Remote terminology service enhancements

* Add changelog
2020-06-23 11:35:26 -04:00
James Agnew 67d363f9e1
Add setting to allow validation of reference targets (#1932)
* Add setting to allow validation of reference targets

* Add changelog

* Add changelog

* License headers

* Plugin version bump

* Experiment with Maven build
2020-06-23 11:35:10 -04:00
Diederik Muylwyk e849ff2cbc
Merge pull request #1933 from jamesagnew/dm-20200622-fix-valueset-expand-with-offset-and-count
Fix ValueSet$expand with offset and count parameters.
2020-06-22 18:30:22 -04:00
Diederik Muylwyk ce0cb8916e Improve tests. 2020-06-22 17:22:21 -04:00
Diederik Muylwyk ced376f7ba Add changelog entry; fix typo. 2020-06-22 17:02:08 -04:00
Diederik Muylwyk 314df43091 BaseValidationSupportWrapper.expandValueSet(...) and ValidationSupportChain.expandValueSet(...) were incorrectly replacing expansion options (i.e. offset and count) with null. 2020-06-22 16:52:52 -04:00
ianmarshall 5bf1e94a23 Fix to accomodate MySQL and MariaDB. 2020-06-19 17:26:45 -04:00
Tadgh 0e86732599 Add changelog 2020-06-19 14:03:22 -07:00
James Agnew 46c00f4efb
Update for Loinc 2.68 (#1917)
* Work on loinc updates

* Work on loinc upload

* Clean up CLI config

* Add changelog

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

Co-authored-by: IanMMarshall <49525404+IanMMarshall@users.noreply.github.com>

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

Co-authored-by: IanMMarshall <49525404+IanMMarshall@users.noreply.github.com>

* Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java

Co-authored-by: IanMMarshall <49525404+IanMMarshall@users.noreply.github.com>

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

Co-authored-by: IanMMarshall <49525404+IanMMarshall@users.noreply.github.com>

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

Co-authored-by: IanMMarshall <49525404+IanMMarshall@users.noreply.github.com>

* Clean up imports

* LOINC fixes

* Loinc loader fixes

Co-authored-by: IanMMarshall <49525404+IanMMarshall@users.noreply.github.com>
2020-06-18 16:55:11 -04:00
jamesagnew 4119cbb0c4 Terser should create correct Enumeration on create 2020-06-17 18:32:27 -04:00
IanMMarshall abf0a0053d
Merge pull request #1928 from jamesagnew/im_20200615_mysql_migration_syntax
Im 20200615 mysql migration syntax
2020-06-17 14:21:17 -04:00
James Agnew b6540064ea
Improve TX scoping for validation (#1925)
* Improve TX scoping for validation

* Test fix

* Test fix

* Some cleanup

* Test fixes

* Test fix
2020-06-17 14:04:12 -04:00
ianmarshall 5b120ee71e Removed unused code and import statement. 2020-06-17 11:57:37 -04:00
ianmarshall 5d22af45bf Added tests for cases where a renamed column is used in a Foreign Key constraint. 2020-06-17 11:56:20 -04:00
ianmarshall eb990e9a68 Enhance added JUnit test. 2020-06-17 09:05:53 -04:00
ianmarshall cc7ed1b036 Cleanup JUnit test. 2020-06-16 17:21:17 -04:00
ianmarshall 2d857f484c Fix broken JUnit. 2020-06-16 17:13:00 -04:00
ianmarshall 0bd8084b5e Additional fixes to migration tasks for MySQL. 2020-06-16 16:05:10 -04:00
Tadgh d32ad74402 some renaming 2020-06-15 21:49:34 -07:00
Tadgh 9222fa3f59 change transaction call 2020-06-15 15:17:25 -07:00
Tadgh eccd280d71 Fix test error 2020-06-15 11:24:39 -07:00
Tadgh 798fdb9cc2 Merge branch 'master' into spring-batch-integration 2020-06-15 09:10:41 -07:00
jamesagnew 0d4e12fe58 Undo accidentally committed file with a weird name 2020-06-15 09:17:52 -04:00
jamesagnew 34c68e15af Add license headers 2020-06-14 19:10:36 -04:00
Ken Stevens d164e2d450
Empi 28 matchers (#1918)
* adding matchers

* reorganize resource matching api

* added precision sensitive date matcher

* stricter rules validation

* validate thresholds

* validate paths.  with FIXMES

* validate searchparams

* fix merge compile error

* add soundex, validate no duplicate names

* add normalize substring

* add exact field to matcher

* EXACT -> STRING, exact=true

* cleanup test method

* match test passes with fixmes

* fixed vector matching

* fixed vector matching

* updating documentation and fixing tests

* updated rules documentation with latest matchers

* updated rules documentation with latest matchers

* created eid page

* eid documentation

* pre-review cleanup

* clean up beans

* disentangling beans

* checkstyle

* noop to trigger CI

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_details.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_details.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_details.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_details.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_rules.md

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>

* review feedback

* review feedback

* review feedback

* review feedback

* review feedback

Co-authored-by: Tadgh <tadgh@cs.toronto.edu>
2020-06-14 17:15:56 -04:00