Commit Graph

1651 Commits

Author SHA1 Message Date
James Agnew 45dac5c5a8 A couple more test fixes 2018-09-11 08:47:00 -04:00
James Agnew a26779de81 FIx compile error 2018-09-11 08:42:46 -04:00
James Agnew 261f2c73ab Merge branch 'jpa_migration' 2018-09-11 08:09:15 -04:00
James Agnew 94eb12aca3 Add a retry to database expunge routines 2018-09-11 07:59:11 -04:00
jamesagnew 0e75c8ed39 A few test fixes 2018-09-10 08:50:12 -04:00
James Agnew 29f324f8de
Merge branch 'master' into master 2018-09-07 23:25:49 -04:00
James Agnew daef975734 Version bump to 3.5.0 2018-09-08 07:22:21 +08:00
James Agnew f5d567cd00 Work on migrator 2018-09-08 03:30:35 +08:00
James Agnew 979b1287d0 Add ability to suspend scheduled reindexer 2018-09-05 16:22:09 +08:00
James Agnew 77305eb570 Work on migrator 2018-09-04 10:32:08 +08:00
James Agnew 0f7c4219cb Merge branch 'master' into jpa_migration 2018-09-02 06:05:11 +08:00
James Agnew bc270584d2 Work on terminology expansion 2018-09-01 22:56:42 +08:00
James Agnew a4d8df3c6d Test fixes 2018-09-01 17:19:21 +08:00
James Agnew f4a21eadda Fix this issue 2018-09-01 14:38:52 +08:00
James Agnew fee0166800 Work on removing validstion cache 2018-08-28 05:26:06 -04:00
jamesagnew d0761ea604 Add a test 2018-08-27 08:58:10 -04:00
James Agnew 07cfed14b8 Work on migrator 2018-08-27 08:21:20 -04:00
James Agnew 54c07263b6 Increase code lengths 2018-08-26 12:32:35 -04:00
James Agnew b2741dab0d Fix crash in mapping 2018-08-23 16:51:35 -04:00
James Agnew 731658eef8 Remove accidental double initialization 2018-08-23 09:32:10 -04:00
James Agnew f8c03a3c37 Prefetch subscriptions on app startup 2018-08-22 12:48:03 -04:00
James Agnew bbe4de2842 Support for LOINC externally defined answerlists added 2018-08-20 09:38:44 -04:00
jamesagnew 8ee701c934 License header update 2018-08-19 20:21:45 -04:00
jamesagnew fef105cfdb More intermittent test failure fixes 2018-08-19 16:51:04 -04:00
jamesagnew 77e35f5a56 Test fixes 2018-08-19 16:12:35 -04:00
James Agnew 6511545d25 Don't re-activate already active identical subscriptions 2018-08-17 11:56:33 -04:00
James Agnew ddc4464552 Make constant public 2018-08-13 13:52:47 -04:00
James Agnew 9b61a8cdbe Make constant public 2018-08-13 13:52:08 -04:00
James Agnew bc1ee1f9dc Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-08-13 11:54:36 -04:00
James Agnew 8a19682ce3 Subscription cleanup trying to get tests passing again 2018-08-13 10:25:16 -04:00
Patrick Werner 6420e0e515
Merge pull request #1025 from jamesagnew/documentOperation
$document operation added
2018-08-13 15:39:28 +02:00
James Agnew 39ef79ff2c Subscription logic cleanup 2018-08-13 08:40:29 -04:00
patrick-werner fc03b1b1d4 switched myClient -> ourClient 2018-08-13 13:50:11 +02:00
patrick-werner b4001b7324 switched myClient -> ourClient 2018-08-13 13:29:42 +02:00
patrick-werner 956cd093ed fixed comments of merge request
added JPAConstants Operation Names
2018-08-13 13:12:34 +02:00
patrick-werner 89bdf40b55 Merge remote-tracking branch 'origin/master' into documentOperation
# Conflicts:
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
2018-08-13 13:05:09 +02:00
jamesagnew 086b95013e Add logging 2018-08-13 05:43:45 -04:00
James Agnew 5feec85662 Clean up subscription processing 2018-08-13 05:27:17 -04:00
James Agnew 5ef31a505c One more test fix 2018-08-12 21:36:26 -04:00
James Agnew f5d330dd03
Merge branch 'master' into 1053-lastupdate-shouldnt-apply-to-includes 2018-08-12 17:58:21 -04:00
jamesagnew d63cd267ab Test fixes 2018-08-12 16:52:13 -04:00
James Agnew 52cfdb7b8b Add some test logging 2018-08-12 13:43:31 -04:00
James Agnew 0a1ae541e6 Fix some test failures 2018-08-12 12:12:09 -04:00
James Agnew ea70683604 Merge branch 'subscription_cleanup' of github.com:jamesagnew/hapi-fhir into subscription_cleanup 2018-08-12 11:13:24 -04:00
James Agnew 0f6188b73c Improve error message for unknown UUIDs in transaction bundles 2018-08-12 09:58:34 -04:00
jamesagnew e0b188d574 Add test 2018-08-11 15:25:01 -04:00
jamesagnew 6d10260d8f Unit test cleanup 2018-08-11 15:12:33 -04:00
jamesagnew 8284734a07 Fix failing test with new filter logic 2018-08-11 14:01:53 -04:00
James Agnew ea1f17762e Don't apply last updated to includes 2018-08-11 12:20:07 -04:00
James Agnew acfe442cf9 Add equivalency flag to reverse lookup 2018-08-11 09:55:28 -04:00
James Agnew 98d794e30f Bug fix in subscription processing 2018-08-10 13:07:06 -04:00
Anthony Sute 416054ddff Fixes for issue #1048 2018-08-10 12:51:12 -04:00
James Agnew ece0c9defe Subscription cleanup 2018-08-10 09:07:55 -04:00
James Agnew ec4604c498 Work on splitting subscriptions out into separate channels 2018-08-06 20:58:04 -04:00
jamesagnew d59a40d01a Subscription cleanup started (won't build) 2018-08-06 19:03:30 -04:00
jamesagnew c98a1e0c62 Cleanup of subscription processing 2018-08-06 18:37:12 -04:00
jamesagnew 0556dfa7af Work on subscriptions 2018-08-03 11:56:06 -04:00
jamesagnew d07fd76d60 Dont keep resource bodies in the queue for JPA subscription delivery 2018-08-03 10:44:15 -04:00
jamesagnew cffe4c9df2 License header updates 2018-07-30 21:22:00 -04:00
James Agnew d6293cf9b3 Merge branch 'client_enhancements' 2018-07-30 09:42:38 -04:00
James Agnew 518092cbd4 More updates 2018-07-29 17:10:26 -04:00
Ana Maria Radu 3399fa04de Fixed issue 2018-07-27 17:47:27 +03:00
anamariaradu10 3a5556006b
Merge branch 'master' into master 2018-07-27 16:59:52 +03:00
Ana Maria Radu 9c39733aff Fixed issues 2018-07-27 16:48:44 +03:00
James Agnew f03d6b7c22 Allow configuration of default page size in SimpleBundleProvider 2018-07-27 18:34:12 +07:00
James Agnew 75a68a0332 Unit test fix 2018-07-26 18:58:23 +07:00
James Agnew a4e4111376 Fix a unit test 2018-07-26 18:08:59 +07:00
James Agnew 3c80238f0e Ongoing work on interceptors 2018-07-24 17:22:21 +07:00
James Agnew 23083a9283 Improvements to client and SP indexing in JPA server 2018-07-23 17:37:49 +09:00
James Agnew 8f2d3998f6
Merge branch 'master' into documentOperation 2018-07-19 17:44:46 -04:00
James Agnew b4aa4c0e89 Add protection against HTML injection attacks 2018-07-19 08:56:22 -04:00
James Agnew 24b220ef5f Fix expansions for ValueSet 2018-07-16 10:39:08 -04:00
James Agnew 4b3287c6a9 Code cleanup 2018-07-16 08:16:40 -04:00
jamesagnew 401a4cd738 Clean up concept reindexing 2018-07-15 17:18:07 -04:00
jamesagnew 116b9e335d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-07-15 15:23:11 -04:00
jamesagnew 43ac912033 Clean up terminology uploading 2018-07-15 15:22:52 -04:00
jamesagnew 84b57f04d3 Fixed tests 2018-07-14 13:51:11 -04:00
James Agnew 738abc415c Disable scheduled tasks during unit tests 2018-07-14 13:24:51 -04:00
jamesagnew 36b4ed28e4 Header updates 2018-07-14 10:16:53 -04:00
James Agnew 81e8f77232 Work on indexes 2018-07-13 09:58:54 -04:00
James Agnew e6ca408f67 Permissions for operations 2018-07-12 18:40:15 -04:00
James Agnew 03e7b018a6 Add skeleton for the $process-message operation in JPA erver 2018-07-12 17:52:24 -04:00
patrick-werner b275d20aba added R4 document operation & merge master 2018-07-11 16:21:13 +02:00
patrick-werner 68772f1e3a removed unnecessary test 2018-07-10 16:02:39 +02:00
patrick-werner df7a9322e9 Merge branch 'master' into documentOperation 2018-07-10 14:35:51 +02:00
James Agnew e992043a22 Fix ID 2018-07-06 09:43:43 -04:00
James Agnew f03b1dec8e Remove warning 2018-07-06 09:40:23 -04:00
James Agnew 60f57f2a6f Fix property handler 2018-07-06 09:36:04 -04:00
James Agnew 1533746bbe Add tests 2018-07-06 09:29:51 -04:00
James Agnew c8f0e0047f Test fixes 2018-07-05 19:17:06 -04:00
James Agnew c9d7b88cab Loinc updates 2018-07-05 18:52:19 -04:00
James Agnew 3b794a4f39 Fix a crash when reindexing deleted resources 2018-07-02 09:17:48 -04:00
jamesagnew 6d83edabb6 License header updates 2018-07-01 20:59:04 -04:00
James Agnew 328541f537 Test fix 2018-07-01 12:57:05 -04:00
James Agnew b929864873 Merge branch 'improve_jpa_indexes' 2018-07-01 12:08:03 -04:00
James Agnew 6ef34a8c5f
Merge pull request #1018 from jamesagnew/jpa_view
Jpa view
2018-07-01 11:47:17 -04:00
James Agnew 495fd9f68e Add support for patch in AuthorizationInterceptor 2018-07-01 11:46:11 -04:00
frankjtao 2c06a1437b merged master to jpa_view 2018-06-30 22:16:30 -04:00
frankjtao 0ab15a05d6 Merge branch 'jpa_view' of https://github.com/jamesagnew/hapi-fhir.git into jpa_view
Conflicts:
	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceSearchView.java
2018-06-29 22:18:22 -04:00
frankjtao ccf3c17f59 impl ResourceSearchView, reduce sql to db 2018-06-29 21:24:43 -04:00
frankjtao af4b9f1c7b impl ResourceSearchView, reduce sql to db 2018-06-29 21:24:02 -04:00
James Agnew 6afc2a7296 Improve indexing 2018-06-29 16:25:11 -04:00
James Agnew bb637c5433 Work on presence API 2018-06-29 14:32:08 -04:00
James Agnew 03fc593cb9 Fix broken test 2018-06-28 18:11:19 -04:00
James Agnew 32fefefcd8 Allw successful deletion of concept maps 2018-06-28 18:01:00 -04:00
James Agnew 7b809f059a Terminology updates 2018-06-27 18:48:36 -04:00
James Agnew 32ddfff191 Improve indexing 2018-06-27 18:33:04 -04:00
James Agnew 24beebe32f Fix valueset URI for loinc groups 2018-06-27 13:15:37 -04:00
James Agnew 79ede4c5ee Remove orphanremoval 2018-06-27 11:31:53 -04:00
James Agnew 4dca271735 Clean up concept deletion 2018-06-27 11:19:11 -04:00
James Agnew 050f9939ac Merge branch 'master' into improve_jpa_indexes 2018-06-27 10:44:18 -04:00
James Agnew 2b992cfb3b Fix compile issue 2018-06-27 10:34:06 -04:00
James Agnew 8c849b16a4
Merge pull request #1015 from jschneid-nmdp/resolve-term-upload-deferred-short-circuit
avoid potential short circuit during saveDeferred processing of uploaded (e.g. LOINC) terminology
2018-06-27 10:33:06 -04:00
James Agnew fb2976d0d2 Improve code system deletion from terminology service 2018-06-27 10:22:13 -04:00
Joel Schneider b2853b3f9d modify BaseHapiTerminologySvcImpl saveDeferred method to avoid short circuit that could potentially prevent processing of some deferred value sets and concept maps 2018-06-27 02:20:12 -05:00
James Agnew 52e3c9496e Fix slow upload 2018-06-26 21:59:01 -04:00
James Agnew 74bca0562e Merge branch 'improve_jpa_indexes' of github.com:jamesagnew/hapi-fhir into improve_jpa_indexes 2018-06-26 21:54:32 -04:00
James Agnew a63205ecff Merge branch 'master' into improve_jpa_indexes 2018-06-26 21:54:12 -04:00
James Agnew f7029b9a0f Update part code url for loinc 2018-06-26 17:17:31 -04:00
jamesagnew a77896ff2d Add callback for resource deletion 2018-06-26 07:54:21 -04:00
James Agnew f0da7a33de Fix expunge transaction boundaries 2018-06-25 10:22:49 -04:00
jamesagnew e5cb609f4d Performance improvements 2018-06-24 20:02:27 -04:00
jamesagnew 9a880361b6 Merge branch 'master' into improve_jpa_indexes 2018-06-24 15:15:31 -04:00
jamesagnew 2d57699066 Work on index improvements 2018-06-24 15:09:53 -04:00
frankjtao f38f71cf0a Merge remote-tracking branch 'origin/master' into
1008_fix_jpa_sql_loop_issue
2018-06-22 15:34:56 -04:00
James Agnew 60ed0dab48 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-06-22 11:22:36 -04:00
James Agnew e9fffd3cdc Allow indexing in custom search params to descend into contained
resources
2018-06-22 11:22:07 -04:00
James Agnew d46b9b00be Liinc updates 2018-06-22 09:59:54 -04:00
Frank Tao 103b587ab5 #1008: Fixed sql looping issue 2018-06-21 22:32:08 -04:00
James Agnew cef4596211 Loinc updates 2018-06-21 19:23:23 -04:00
James Agnew d6bfce4a1d Make all loinc files mandatory 2018-06-21 18:30:57 -04:00
James Agnew 1b40188aab FIx missing import 2018-06-21 14:48:39 -04:00
jamesagnew b3f7ab274d License header updates 2018-06-21 14:44:34 -04:00
James Agnew b9a4e1ae0f Merge branch 'improve_jpa_indexes' of github.com:jamesagnew/hapi-fhir into improve_jpa_indexes 2018-06-21 13:48:27 -04:00
James Agnew 5b6cde8a9f Merge branch 'master' into improve_jpa_indexes 2018-06-21 13:48:04 -04:00
jamesagnew ecc8e1eda0 More work on indexes 2018-06-21 13:42:34 -04:00
James Agnew cc98f65500 Merge branch 'master' into valueset_expansion_fixes 2018-06-21 10:20:24 -04:00
James Agnew 2dc445fd10 ValueSet enhancements 2018-06-21 10:19:14 -04:00
James Agnew e63604afc9
Merge pull request #1000 from rhausam/update-filenames
Updated LOINC filenames to match 2.64 and future releases.
2018-06-21 10:18:36 -04:00
patrick-werner f9a19c4b1f starting implementing check if only one Composition is returned 2018-06-20 16:12:58 +02:00
James Agnew 218937e425 Several fixes 2018-06-20 05:53:32 -04:00
frankjtao 6e7d67ba70 Update due to Spring version change 2018-06-19 20:16:27 -04:00
patrick-werner b76ad6870f Merge remote-tracking branch 'origin/master' into documentOperation 2018-06-19 16:57:54 +02:00
patrick-werner 0a8afb38ba moved the BundleProvider -> DocumentBundle code from DAO to Service Layer 2018-06-19 15:20:35 +02:00
patrick-werner 627491ad95 fixed Test if maxThreads >= 2 2018-06-19 14:50:04 +02:00
James Agnew 127efd55b0
Merge branch 'master' into 963_jpa_performance 2018-06-19 06:50:05 -04:00
frankjtao 299cf5b230 Changed retval to resource id instead of SearchResult in SearchResultDao 2018-06-16 22:37:12 -04:00
jamesagnew 24ad8870cf Add to indexes 2018-06-16 18:23:05 -04:00
James Agnew d13d53c8ef Add a bit of logging 2018-06-15 14:01:07 -04:00
Rob Hausam 215e224e3d Updated terminology upload tests and artifacts to the new LOINC filenames. 2018-06-14 20:30:32 -05:00
James Agnew 99f80eef88 Performance enhancements to JPA searching 2018-06-15 01:13:44 +08:00
Rob Hausam 75c1b7baa8 Updated LOINC filenames to match 2.64 and future releases. 2018-06-14 11:33:35 -05:00
James Agnew a46b4a4637 Reindexing shouldn't stop unexpectedly 2018-06-13 22:03:15 +08:00
patrick-werner c2b2a7eaa7 added missing CORS Headers for Test Setup 2018-06-11 11:09:23 +02:00
James Agnew cc0e836680
Auth interceptor early checks (#995)
* Validator fix

* Enhance AuthorizationInterceptor so that it tries to deny access earlier
for compartment searches that are outside the allowable compartment.

* FIx DSTU2 test that wasn't updated

* More test fixes
2018-06-10 17:48:20 -04:00
frankjtao 35991cd21b #963: renamed the parameter to 'the*' 2018-06-07 14:19:44 -04:00
Diederik Muylwyk 903df68d2a
978 cli tools for importing exporting terminology mappings need to be fixed (#988)
* Fixed export issue.

* Fixed import issue.

* Fixed tests.

* Fixed tests.
2018-06-07 10:22:41 -04:00
patrick-werner 6bcddea416 Merge branch 'master' into documentOperation 2018-06-07 09:17:58 +02:00
James Agnew 6feb23896f Hopefully fix #983 2018-06-06 15:51:23 -04:00
James Agnew e7804b881c Fix CI issue 2018-06-06 11:39:06 -04:00
jamesagnew 583437d656 Prevent a crash if the application context has been set incorrectly in
embedded deployments
2018-06-06 08:37:25 -04:00
patrick-werner 49bdff1862 current state of $document 2018-06-05 18:32:59 +02:00
patrick-werner 38b7b00f52 Merge branch 'master' into documentOperation 2018-06-04 17:34:39 +02:00
patrick-werner bd0682c2b2 Merge remote-tracking branch 'origin/master' into documentOperation 2018-06-04 13:53:02 +02:00
jamesagnew 987679483a Version bumps 2018-06-03 15:29:10 -04:00
James Agnew e36bc3889c
Merge pull request #974 from Romanow88/master
Fixes #972 Update Spring Data 1.11.6.RELEASE to 2.0.7.RELEASE
2018-06-03 15:28:05 -04:00
James Agnew 30dd3c00b9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-06-02 08:59:48 -04:00
Roman Doboni 8f1effe5e3
Merge branch 'master' into master 2018-06-02 09:37:56 +02:00
James Agnew d52c1ed090 Add a bit more logging for occasional failing test 2018-06-01 17:43:29 -04:00
jamesagnew fedf4a870a License header updates 2018-06-01 07:41:01 -04:00
James Agnew 7f87def432 Fix tests 2018-06-01 07:40:33 -04:00
James Agnew a9cb4dae2f Allow storage of messages 2018-06-01 07:07:24 -04:00
frankjtao 73f12744ae #963 Improved performance for tag loading 2018-05-31 21:30:46 -04:00
jamesagnew abcf7852b1 Tests pasing locally 2018-05-31 09:10:34 -04:00
Romanow a336f33b4b Update Spring Data 1.11.6.RELEASE to 2.0.7.RELEASE 2018-05-31 14:42:15 +02:00
James Agnew 7e0584af2f Merge branch 'java9' of github.com:jamesagnew/hapi-fhir into java9 2018-05-30 21:59:51 -04:00
James Agnew 2f07066c59 Test fixes 2018-05-30 21:59:41 -04:00
James Agnew c2afd9728d More test fixes 2018-05-30 21:57:17 -04:00
jamesagnew 432bc66208 Merge branch 'java9' of github.com:jamesagnew/hapi-fhir into java9 2018-05-30 21:24:01 -04:00
James Agnew bb5d4110a2 Test fixes 2018-05-30 21:23:20 -04:00
jamesagnew 2684e2b030 Build fixes 2018-05-30 16:17:36 -04:00
jamesagnew d127a89047 Some test fixes 2018-05-30 11:01:43 -04:00
jamesagnew 833a46d07e Work on test compilation 2018-05-30 08:27:09 -04:00
jamesagnew 5a96482860 More work o JDK9 tests 2018-05-30 08:04:01 -04:00
James Agnew a52805e504 Work on JDK9 support 2018-05-30 05:45:08 -04:00
James Agnew 7951d883d0 Merge branch 'master' into java9 2018-05-29 08:43:21 -04:00
patrick-werner 83c8718c2a Merge branch 'v3.4.4' into documentOperation 2018-05-29 10:06:30 +02:00
Frank Tao 404d37cedc Fixed #963 : load history table once instead of one by one in the loop
in the SearchBuilder class.
2018-05-28 22:45:45 -04:00
Diederik Muylwyk 0e2c57fa60 Bumping version. 2018-05-28 17:44:38 -04:00
patrick-werner 8872fc94c5 Merge remote-tracking branch 'origin/master' into documentOperation
# Conflicts:
#	hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm
#	hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans.vm
#	hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm
2018-05-28 17:05:50 +02:00
Diederik Muylwyk 2871920734 Preparing release. 2018-05-28 10:45:47 -04:00
James Agnew a7eac969d9 Site enhancements for release 2018-05-28 08:53:36 -04:00
jamesagnew 67f21426cb Disable content header on response for non-create operations 2018-05-25 07:28:01 -04:00
jamesagnew 49aaa01db8 Fix compile issues 2018-05-23 17:42:48 -04:00
James Agnew 850aa99ddb Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-05-23 16:28:35 -04:00
James Agnew ed6609e414 One more test fix 2018-05-23 16:28:13 -04:00
jamesagnew b146a80502 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-05-23 16:09:34 -04:00
jamesagnew 92dc258c6e Update license headers 2018-05-23 16:09:23 -04:00
James Agnew ba8827091a Reindexing fixes 2018-05-23 16:07:48 -04:00
James Agnew a3687e446e Correctly handle missing search params with new indexing infrastructure 2018-05-23 11:42:38 -04:00