honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,818 Commits 684 Branches 130 Tags 1.2 GiB
Commit Graph

4818 Commits

Author SHA1 Message Date
Ken Stevens 6b601708dd Merge branch 'master' into windows-fixes-2 2019-01-30 18:01:17 -05:00
Ken Stevens adb037e805 copying over updates to helper classes 2019-01-30 17:56:47 -05:00
bdenton ca3b17f3b9 Merge remote-tracking branch 'upstream/master' 2019-01-30 12:09:25 -08:00
jamesagnew 5f29e4fbf3 Fix #1174 - Prevent serialization exception 2019-01-30 05:49:45 -05:00
Eeva Turkka e6df4a21e4 Merge branch 'enablewhen_fix' of https://github.com/eevaturkka/hapi-fhir into enablewhen_fix 2019-01-28 10:31:44 +02:00
jamesagnew 5d540d9208 Query optimization in JPA 2019-01-27 20:03:48 -05:00
Ken Stevens 16c44d264b reducing visibility of internal class 2019-01-27 12:50:09 -05:00
jamesagnew 503d1d8aff Subscription NPE fix 2019-01-26 18:42:01 -05:00
Ken Stevens 10c59fceeb
Subscription strategy tag (#1178) 
tests pass
 2019-01-25 13:01:04 -05:00
James Agnew f55be0b6d0 Test fix 2019-01-25 10:56:17 -05:00
Graham, Gary f2fa65c5ed Remove erroneous test 2019-01-24 17:20:29 -08:00
Graham, Gary 237a508d83 Allow specimen to be converted from STU3 -> STU2 2019-01-24 16:06:08 -08:00
James Agnew 38d03ea99a
Invalid ids in subscription queue (#1175) 
* Start work on this

* Work on interceptors

* Attempt fix

* Avoid environment dependency

* Test fixes

* One more test fix

* One more build tweak

* Lots of cleanup

* A bit more cleanup

* Still more cleanup

* Some test fixes

* Add legacy methods temporarily

* Don't auto-scan interceptor beans

* One more test fix

* rsolve merge conflicts

* Address review comments
 2019-01-23 21:17:47 -05:00
James Agnew e5723f209c
Merge pull request #1177 from jamesagnew/windows-fixes 
Windows fixes
 2019-01-23 19:16:10 -05:00
Ken Stevens 0eb70b81fe Oops. This was supposed to be automatically backed out. But SQUASH MERGE prevented that from happening. Hmmmmm...... 2019-01-23 18:13:29 -05:00
Ken Stevens cdd75bbe3a Merge branch 'master' into windows-fixes 
# Conflicts:
#	hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/SubscriptionDeliveringRestHookSubscriber.java
 2019-01-23 17:16:08 -05:00
Ken Stevens 67eaeb8af1 Merge remote-tracking branch 'origin/windows-fixes' into windows-fixes 2019-01-23 17:14:51 -05:00
James Agnew e819b83a94 Make busywait more clear 2019-01-23 16:21:13 -05:00
Ken Stevens cfd67d88c7 Merge remote-tracking branch 'origin/windows-fixes' into windows-fixes 2019-01-23 16:17:48 -05:00
Ken Stevens 5c7907dfea magic number 2019-01-23 16:17:41 -05:00
James Agnew 7d1d5a102c Attempt to fix a weird lucene indexing issue 2019-01-23 16:14:53 -05:00
Ken Stevens 5a08593abd
_id support (#1176) 
* added support for _id in in-memory matcher
 2019-01-23 14:37:34 -05:00
Ken Stevens 707bf07099 optimistic the windows tests will now finally pass! 2019-01-23 11:57:59 -05:00
jamesagnew f53130c9ae Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-01-23 09:39:02 -05:00
jamesagnew afaa1b065f Hivernate back to 5.4.0 2019-01-23 09:38:49 -05:00
James Agnew 68fae08f20 Fix casing in base64Binary type 2019-01-23 08:34:09 -05:00
jamesagnew eee4c75300 Version bump hibernate 2019-01-23 05:57:20 -05:00
Ken Stevens 2c7eb39b29 final batch of windows fixes (to deal with jumpy windows clock) 
also added semaphore to PointcutLatch
 2019-01-22 18:53:54 -05:00
Ken Stevens 6b22977d7c fixing more tests for Windows 2019-01-21 22:28:48 -05:00
Ken Stevens c92cbdd3e2 Merge remote-tracking branch 'remotes/origin/submit-retry-extension' into windows-fixes 2019-01-21 20:35:04 -05:00
Ken Stevens 00320da9dc Merge branch 'master' into windows-fixes 2019-01-21 20:34:01 -05:00
Ken Stevens a6d1cc56c7 added maxRetriex extension to canonical subscription 2019-01-21 16:58:14 -05:00
James Agnew 9cf64f78d0 Deprecate a bad setter on RetfulServer, fix a paging issue, and add a 
disabled unit test to the subscription matcher
 2019-01-21 14:46:17 -05:00
Ken Stevens 29f483d7b4 Merge branch 'master' into windows-fixes 2019-01-21 11:06:42 -05:00
Ken Stevens b4350bbdae Working through failed tests. Consolidating sleep calls 2019-01-21 11:05:53 -05:00
James Agnew 17f03ac843 Allow null return type for interceptors 2019-01-20 19:44:18 -05:00
jamesagnew 690af1c7ff Add interceptor example 2019-01-20 19:43:08 -05:00
Ken Stevens 10aa6c9f07 Merge branch 'master' into windows-fixes 
# Conflicts:
#	hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/interceptor/api/Pointcut.java
#	hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionRegistry.java
 2019-01-20 17:04:16 -05:00
James Agnew af9153d64e Interceptor API tweak 2019-01-20 14:37:16 -05:00
James Agnew c22aeaa2e5 Tweaks to interceptor registry 2019-01-20 12:09:19 -05:00
James Agnew c3c7d156e9 Interceptor cleanup 2019-01-20 10:16:18 -05:00
Ken Stevens b3bdbea19c Merge branch 'master' into windows-fixes 
quickly update tests to new interceptor
 2019-01-20 09:39:34 -05:00
Ken Stevens f7e05f6e58 Merge branch 'master' into windows-fixes 
quickly update tests to new interceptor
 2019-01-20 09:39:14 -05:00
jamesagnew b878925884 Try to avoid intermittent test failure 2019-01-19 18:44:09 -05:00
jamesagnew cd1e0e881c Add headers 2019-01-19 18:31:17 -05:00
jamesagnew b0cbd52ae9 Interceptor cleanup 2019-01-19 18:01:00 -05:00
James Agnew 29c3cee287
Merge pull request #1172 from jamesagnew/ja-subscription-interceptors 
Ja subscription interceptors
 2019-01-19 07:13:14 -06:00
James Agnew 3e84173180 Merge branch 'master' into ja-subscription-interceptors 2019-01-18 17:52:23 -05:00
Ken Stevens 3d07fc1c22
fixed null subscription id (#1170) 
* fixed null subscription id
 2019-01-18 10:39:35 -05:00
James Agnew 5ce9d444e9 Work on interceptors 2019-01-18 09:04:45 -05:00