Commit Graph

610 Commits

Author SHA1 Message Date
James Agnew f228b4a167
Fix an error parsing extensions with a value type of UUID (#2258) 2020-12-18 10:57:31 -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
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
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
dependabot[bot] 7947316fb7
Bump ant from 1.7.0 to 1.10.8 (#2080)
Bumps ant from 1.7.0 to 1.10.8.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-15 05:24:43 -04:00
James Agnew d8542899e5
Don't lazy load DAOs (#2061)
* Don't lazy load DAOs

* More tweaks
2020-09-01 09:54:50 -04:00
jamesagnew 92718c7ef2 Version bump to 5.2.0-SNAPSHOT 2020-08-12 10:23:46 -04:00
jamesagnew 5fb7bd5156 Version bump to 5.1.0 2020-08-11 17:43:24 -04:00
James Agnew b8da4f0140
Add package support (#1911)
* Begin rework of package management

* Work on NPM

* Work on package management

* Work on NPM

* NPM rework

* Work on NPM

* NPM package rework

* Updates

* Updates

* Add license

* Work on package server

* Work on package importing

* Work on package management

* Package rework

* Work on packages

* Work on package manager

* Work on pkgs

* NPM work

* NPM rework

* Work on package cache

* Work on NPM

* Work on NPM

* Package fixes

* Add tests

* Tweaks

* Test fixes

* Add changelog

* Avoid snapshot dep
2020-06-10 05:30:20 -04:00
ianmarshall 4d378ee0ed Merge remote-tracking branch 'remotes/origin/master' into im_20200316_lastn_operation_elasticsearch
# Conflicts:
#	hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java
#	hapi-fhir-jpaserver-base/pom.xml
#	hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java
#	hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamExtractor.java
2020-05-22 17:04:01 -04:00
Tadgh d1b963321a
MVP EMPI implementation (#1857)
EMPI Initial Implementation (still plenty of known gaps)
2020-05-22 15:03:20 -04:00
jamesagnew 52c8e3551c Version bump to 5.1.0-SNAPSHOT 2020-05-15 14:43:32 -04:00
jamesagnew fe0e07a313 Bump to 5.0.1 2020-05-15 05:47:01 -04:00
ianmarshall 529e1e1f5e Merge remote-tracking branch 'remotes/origin/master' into im_20200316_lastn_operation_elasticsearch 2020-05-14 12:09:24 -04:00
jamesagnew 1d13e29ac0 Version bump to 5.1.0-SNAPSHOT 2020-05-12 20:04:20 -04:00
jamesagnew d631ecff4a Prepare for 5.0.0 2020-05-12 11:49:18 -04:00
James Agnew 9d8bd0d51e
Bump R4 definitions to 4.0.1 (#1837)
* Bump R4 definitions to 4.0.1

* Add changelog

* Test fixes
2020-05-08 19:34:13 -04:00
ianmarshall 0e45db0ba9 More cleanup and test fixes. 2020-04-24 16:23:59 -04:00
ianmarshall 925bbbbcdc Merge remote-tracking branch 'remotes/origin/master' into im_20200316_lastn_operation_elasticsearch
# Conflicts:
#	hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java
#	hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/BaseR4Config.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/BaseR5Config.java
#	pom.xml
2020-04-13 18:35:15 -04:00
jamesagnew 2205d2306c Move resource provider factory 2020-04-07 10:56:05 -04:00
jamesagnew 6baf1995c9 Work on subscription cleanup 2020-04-02 20:30:19 -04:00
ianmarshall f819c91530 Initial implementation of lastn operation. 2020-03-31 21:55:57 -04:00
James Agnew f89661526c Missed noe rename in #1769 2020-03-22 13:27:04 -04:00
James Agnew c2ae5a8326
Add FHIRPath evaluation interceptor (#1769)
* Add FHIRPath evaluation interceptor

* Add changelog
2020-03-22 12:57:24 -04:00
James Agnew 22413911bf
Validation api changes (#1719)
* Validation enhancements

* Work on validation api reworking

* Keep working on validation API

* Keep working on new term API

* Work on validation api

* Ongoing work on validation

* Work on integrating validation

* Work on validation API

* Add to validation API

* Work on validation

* Work on API

* Work on validation

* Work on validation API

* Work on validation API

* Work on validation api

* Work on validation API

* Work on validation api

* Validation API changes

* Work on API

* More work on validationo API

* Work on validation API

* FIxes

* WOrk on validation api

* Work on validation API

* Tests passing!

* More cleanup

* More validation API changes

* Fix intermittent test failure

* Package reorg

* Validation API work

* Work on doocumentation

* Work on API

* More work on new validation API

* Fix errorprone-reported error

* Test fixes

* Documentation updates

* Documentation tweaks

* Work on API

* Bean name adjustments

* Build fixes

* Some test fixes
2020-03-17 13:28:59 -04:00
jamesagnew ddc7b601ee Version bump to 4.3.0-SNAPSHOT 2020-02-16 19:23:22 -05:00
jamesagnew 4fd80cfca7 Bump to 4.2.0 2020-02-16 19:00:15 -05:00
James Agnew 1390ea3c06
Update FHIR R5 structures to 4.2.0 version (#1665)
* Work on upgrading core

* Work on R5 updates

* Work on core updates

* Test fix

* Update model version properties file for R5

* Bump core version

* Test fixes

* Add 4.2.0-SNAPSHOT version to versions page in docs
2020-01-14 10:27:01 +08:00
James Agnew 497a96ae68 Version bump for next round of development 2019-11-12 22:09:21 -05:00
jamesagnew f99ad981b5 Version bump to 4.1.0 2019-11-12 16:08:20 -05:00
James Agnew aa0301084b
Don't succeed validation on unknown codesystem (#1575)
* Don't succeed validation on unknown codesystem

* Test fixes

* Work on error messages

* Work on code validation API

* work on tests

* Work on validation

* Test fix

* Update DSTU3 validation reources

* Upgrade structures

* Test fixes
2019-11-12 14:35:49 -05:00
jamesagnew ac4d108126 Merge branch 'ja_20190928_rationalize_search_param_extractor' of github.com:jamesagnew/hapi-fhir into ja_20190928_rationalize_search_param_extractor 2019-10-27 18:17:29 -04:00
James Agnew 817f9ae36e Merge branch 'master' into ja_20190928_rationalize_search_param_extractor 2019-10-27 17:25:20 -04:00
jamesagnew fd73a593ea Work on merge 2019-10-25 08:50:34 -04:00
jamesagnew cd84af30b1 Merge branch 'master' into ja_20190928_rationalize_search_param_extractor 2019-10-25 05:56:39 -04:00
James Agnew 0d3f7d4a03 Correctly handle searching by source in JPA server 2019-10-23 06:58:16 -04:00
James Agnew 50af4bfb19 Merge latest changes 2019-10-18 13:36:26 -04:00
James Agnew 5dcbed0438 Fix foreign key handling when dropping tables 2019-10-17 15:52:35 -04:00
James Agnew 895c9a1f2c Fix #1546 - Remove redundant entries in includes 2019-10-17 11:33:40 -04:00
James Agnew e656863a73
Correct bugs reported by LGTM (#1533)
* Correct bugs reported by LGTM

* Add some tests

* A few more updates

* YAML update

* Test fixes

* One more test fix

* Test fix
2019-10-09 19:26:57 -05:00
James Agnew db668d96b9 Add a few tests and remove some dead code 2019-10-03 09:00:14 -04:00
Clayton Bodendein 08825a81d9 Add missing @Override annotations
Added missing @Override annotations so that if/when methods in superclasses change
there will be a compile-time error if subclasses haven't been changed accordingly.

This was done using IntelliJ IDEA's "Missing @Override annotation" inspection.
2019-10-02 05:45:59 -04:00
James Agnew 066c9a7fb7 Improvements to AutohrizationInterceptor create handling 2019-09-30 15:07:23 -04:00
James Agnew c8ce07c40e Deprecate redundant IVersionSpecificBundleProvider method 2019-09-30 09:45:31 -04:00
James Agnew 6f44d7c360
Fix issue deleting CodeSystem resources (#1316)
* Fix deleting CodeSystem resources

* Test fixes

* Address review comments
2019-09-23 15:58:57 -04:00
James Agnew 4115a4bb6d Compile fixes 2019-09-19 10:10:47 -04:00
jamesagnew e1b43d811f Version bump to 4.1.0-SNAPSHOT 2019-08-14 14:06:06 -04:00
jamesagnew 3f22456b0f Bump version to 4.0.0 2019-08-14 11:06:26 -04:00
James Agnew 301a8f8432
Merge #1146 - Filter implementation (#1220)
* Initial commit of _filter keyword implementation.

* - Completed all search parameter types for _filter.
- Implemented handling for _has, _id, _security, language, _profile, _security, and _tag.

* - Changes to support "ne" matching on resource ID for _filter

* Implemented language

* Commit/push before creation of pull request

* Ongoing merge work

* Ongoing merge work

* Merge master in

* Test fix
2019-08-12 11:59:33 -04:00
James Agnew 60eab3ad70
Add support for R5 resources (#1416)
* Work so far on R5 support

* Add support for R5

* Docs changes
2019-08-06 17:30:31 -04:00
James Agnew 7e3d062d15
Switch default client to JSON (#1392)
* Start work on changing over

* Update tests

* More test fixes

* Work on generalizing binary access provider a bit

* Add expunge capability to binary storage, and also support actual binary
resources

* Work on binary provider

* Get the DB bound binary storage service working

* Test fixes

* Compile fix

* Fix compile error

* Test fix

* Test tweak

* Trying to figure out an intermittent failure

* Work on tests

* More work on tests

* Another test fix
2019-07-22 21:27:10 -04:00
James Agnew 7831e8a0ed Add support for $snapshot generation and validation based on snapshots 2019-07-14 16:15:56 -04:00
James Agnew 120b93f204
Use HL7 FHIR Core Structures (#1382)
* Ongoing work on core structures suport

* Ongoing work on this merge

* Ongoing work to clean up structures

* Credit for #1179

* Address compile issues

* Latest changes

* Work on parallel execution

* Work on getting tests passing

* Add H2 to migrator

* Test fix
2019-07-14 10:16:40 -04:00
James Agnew 50a8c66bf5 Version bump to 4.0.0-SNAPSHOT 2019-05-30 17:13:03 -04:00
jamesagnew 73aa53be8f Release 3.8.0 2019-05-30 16:50:04 -04:00
James Agnew 738c2c1797
Interceptor framework refactoring (#1287)
Interceptor framework overhaul
2019-04-24 14:32:30 -04:00
jamesagnew 884b80c1d7 Improve ability to select active resources 2019-04-07 07:52:21 -04:00
James Agnew 0f8c8d18e2 Bump version to 3.8.0-SNAPSHOT 2019-02-06 20:02:28 -05:00
jamesagnew 207015c3af Version bump to 3.7.0 2019-02-05 21:36:38 -05:00
bdenton 04d618324f Merge remote-tracking branch 'upstream/master' 2019-01-09 15:55:11 -08:00
James Agnew 14a132a937 Squashed commit of the following:
commit 9659655830
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Dec 27 17:54:25 2018 -0500

    Finish sync

commit 70da25b76f
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Dec 27 10:32:51 2018 -0500

    Work on RI4 sync
2018-12-27 17:58:47 -05:00
Ken Stevens 84a34eb3c9
Subscription module support (#1147)
* Reorganizing packages and dependencies to support standalone subscription running within a CDR container where all hapi modules are on the classpath.

Moved Subscription registry out of interceptor and introduced SubscriptionLoader

* Created ActiveSubscription and moved cache bits into it

* Moved ExecutorQueue stuff out into its own class

* Add test and supporting code to validate SubscriptionConstants.EXT_SUBSCRIPTION_RESTHOOK_DELIVER_LATEST_VERSION behaviour

* Added SubscriptionCheckingSubscriber

* Moved a few beans to @ComponentScan

* Replaced use of beanFactory with concrete factory classes

* Switched test to use subscribablechannel

* Added SubscriptionLoaderFhirClientTest

* Confirm that our SubscriptionProviderFhirClient works with a live fhir client

* Register interceptors with DaoConfig instead of RestServer.
Also, Rename @VisibleForTesting methods with ForUnitTest

* Fix triggering service so it uses new subscriptionmatcherinterceptor

* Renamed "Database" classes to "Dao"

* processing -> matching naming change
2018-12-18 13:09:06 -05:00
Łukasz Dywicki 1afe36e60a Sources and resource generator mojo which doesn't use value sets. (#852)
* Resource and sources generator mojo which doesn't use value sets.

* Avoid unecessary reference to javassist.
2018-12-13 05:28:16 -05:00
Ken Stevens 6baee4dc3f
Standalone subscription (#1125) 2018-11-30 17:19:16 -05:00
bdenton 689340368e Merge remote-tracking branch 'upstream/master' and fix tinder-test
conflict
2018-11-29 09:45:00 -08:00
bdenton 655f474352 Merge and update for 3.6.0 release 2018-11-13 14:26:06 -08:00
jamesagnew cc57bacab8 Version bump to 3.7.0-SNAPSHOT 2018-11-12 10:07:28 -05:00
James Agnew 63af04a7b4 Prepare for 3.6.0 release 2018-11-12 05:40:55 -05:00
bdenton c7a7a079b2 only support 'generateResources' when resourceSource=model 2018-11-09 13:39:13 -08:00
bdenton 1ac2ccf363 enhance generic Ant and Mojo tasks to support R4 and generate from
resource model structures as well as spreadsheets
2018-11-07 16:55:23 -08:00
James Agnew 99cd4ce5f7 Allow for _total parameter 2018-10-17 09:47:35 -04:00
James Agnew 62d6771814 Use a select count query for summary count searches in JPA server 2018-09-29 21:58:14 -04:00
James Agnew 3e445faf47 Squashed commit of the following:
commit df641506885e09e63f80efc6c658d01a1a3a8142
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sat Sep 29 13:47:22 2018 -0400

    Shrink validation resources

commit 4c1550eafa26f4235b4b8804741aecc03276b5c6
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Sep 28 22:45:28 2018 -0400

    Updates to get R4 working

commit 8332f15291006691ed9b07ead3e3524b0fc85510
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Fri Sep 28 09:02:13 2018 -0400

    Ongoing work on gettign R4 working

commit f7146cab7aed937bb625a8aec95744d76db00041
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Sep 28 05:21:01 2018 -0400

    More work on sync

commit f48de4a10b1bab2584fee813017d9b27b237bfa9
Merge: 9e4f3cc722 aacb78b779
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:11:29 2018 -0400

    Merge branch 'sync_r4' of github.com:jamesagnew/hapi-fhir into sync_r4

commit 9e4f3cc722668aae31a77b19bf9b032af3ae01b0
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:11:19 2018 -0400

    Fix compile error

commit 7ec29e0ceda8f9013cbabb95767cbe15b4b81303
Merge: 23f7517325 002c4b3ff7
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:04:23 2018 -0400

    Merge branch 'master' into sync_r4

commit aacb78b7793ab2c71e0a2a774240ee2b5d3f9e7f
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:01:42 2018 -0400

    Keep working on getting R4 building

commit 4950de46d99897e74d41dfdb10d3d8a3435cb0c9
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Tue Sep 25 13:11:27 2018 -0400

    Ongoing work to get R4 working

commit 819d69c20e112dd3c72569ec50114ddb8263c300
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Sep 20 08:15:36 2018 -0400

    Work on getting build working

commit 2c61b6cd1205ced5d7b822cf10942c69272ea078
Merge: 16b5bb06c8 dfb4de86f1
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Sep 20 05:16:53 2018 -0400

    Merge branch 'master' into sync_r4

commit 16b5bb06c8cdaf8d67c3b80f5aa9be9fccd99aef
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Mon Sep 17 05:30:39 2018 -0400

    Work on R4 sync

commit 23f7517325a14dd2ca1eb5641296ead2776634ae
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Sep 16 10:19:00 2018 -0400

    Work on sync

commit 6cc413c1f1dea538295aa4c16c21a5677494ac4c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Sep 14 17:28:28 2018 -0400

    Work on R$ sync

commit df6f6ad2ce783b07ccc383134705d874bc5d2cf1
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Fri Sep 14 08:33:07 2018 -0400

    Work on R4
2018-09-29 13:48:35 -04:00
James Agnew 706e004b9d Bump to 3.6.0-SNAPSHOT 2018-09-19 10:24:48 -04:00
James Agnew daef975734 Version bump to 3.5.0 2018-09-08 07:22:21 +08:00
James Agnew 8f2d3998f6
Merge branch 'master' into documentOperation 2018-07-19 17:44:46 -04:00
jamesagnew 43ac912033 Clean up terminology uploading 2018-07-15 15:22:52 -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 bd0682c2b2 Merge remote-tracking branch 'origin/master' into documentOperation 2018-06-04 13:53:02 +02:00
patrick-werner 83c8718c2a Merge branch 'v3.4.4' into documentOperation 2018-05-29 10:06:30 +02:00
Diederik Muylwyk 0e2c57fa60 Bumping version. 2018-05-28 17:44:38 -04:00
patrick-werner 5c2a5df9c2 merged with master branch, fix in tinder spring beans template 2018-05-28 17:10:56 +02: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
jamesagnew 7e83fc78cf Disable user resource and weaken validation on the public server 2018-05-21 19:04:37 -04:00
jamesagnew e8139192e0 FIx test issues 2018-05-21 13:07:11 -04:00
jamesagnew 3d762b984b Sync to R4 definitions 2018-05-12 19:35:42 -04:00
Diederik Muylwyk d97fb8f5cf
709 the conceptmap operation called translate needs to be implemented (#923)
The ConceptMap operation $translate has been implemented.
2018-05-10 10:52:56 -04:00
patrick-werner 26e9211db8 Merge tag 'v3.3.0' into documentOperation 2018-04-11 15:56:57 +02:00
jamesagnew 180336e076 Sync to master 2018-03-29 06:54:24 -04:00
jamesagnew 418e82032f Prep for 3.3.0 2018-03-29 05:48:13 -04:00
patrick-werner b97d303481 modified tinder plugin generation templates for Composition 2018-03-22 08:24:22 +01:00
jamesagnew 07290ae8a0 Sync to latest R4 code 2018-03-04 11:02:47 -05:00
James Agnew 4af52c160f Try to get HAPI building on JDK9 2018-01-31 06:41:24 -06:00
James Agnew 16038ece26 Version bump to 3.3.0-SNAPSHOT 2018-01-23 10:31:01 -05:00
James Agnew 6468ca474a Verion bump to 3.2.0 2018-01-13 02:14:33 -05:00
James Agnew 01186ec8cb Squashed commit of the following:
commit ab876ef864005b6758d3e00a1bb1ef2dad5d2161
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Jan 12 18:59:15 2018 -0500

    Tests all passing

commit 4f8a5d98307da1bb5ca7602e34b1d3b791f73d25
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Fri Jan 12 08:21:58 2018 -0500

    Almost compiling
2018-01-12 18:59:43 -05:00
jamesagnew 5b909b4746 Version bump to 3.2.0-SNAPSHOT 2017-11-24 13:32:47 -05:00
jamesagnew 42dd34252d Version bump to 3.1.0 2017-11-23 13:27:21 -05:00
James Agnew 5f5475fb17 Missed a file in previous commit 2017-10-18 17:33:52 -04:00
James 2a18ce1b7b Remove accidental debug code that broke tests 2017-10-14 07:05:49 -04:00
James 31fb1236a1 Reuse bundle ID when returning query cache results 2017-10-11 06:05:14 -04:00
James 8e760858a8 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-09-28 06:36:58 -04:00
James 4ef7e03417 Give tests a bit more memory 2017-09-28 06:36:37 -04:00
James Agnew 87383ad802 Version bump to 3.1.0-SNAPSHOT 2017-09-27 21:23:34 -04:00
James e19c13fa6f Prepare 3.0.0 release 2017-09-24 17:55:16 -04:00
James 49bdaa1a45 Version bump to 3.0.0 2017-09-23 17:31:39 -04:00
James be07ebc4ef Subscription refactoring 2017-09-21 08:33:20 -04:00
James e3a28e2ff5 Split out delivery and processing channel for subscriptions 2017-08-19 12:15:19 -04:00
James be5c5ebecd Merge in HAPI 3.0.0 working branch!
Squashed commit of the following:

commit 12f89a423a
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 14:38:51 2017 -0400

    Minimize validation resources

commit f6868cce5c
Merge: 3b80779fd3 1e158311d8
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 14:05:34 2017 -0400

    Forward port fix for #710

    Merge branch 'master' into hapi3_refactor

commit 3b80779fd3
Merge: 1f534985e8 356d9acaf7
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 12:31:09 2017 -0400

    Forward port #705, #708, and #710

    Merge branch 'master' into hapi3_refactor

commit 1f534985e8
Merge: 7c39a47852 dedd3d635b
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 10:52:59 2017 -0400

    Forward port #695

    Merge branch 'master' into hapi3_refactor

commit 7c39a47852
Merge: e0ffb84d21 6efafe62f1
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 09:53:17 2017 -0400

    Forward port #688

    Merge branch 'master' into hapi3_refactor

commit e0ffb84d21
Merge: 52388c11c1 d19b00ff09
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 12 14:59:46 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 52388c11c1
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 12 06:21:46 2017 -0400

    Cleanup

commit 209752cd63
Author: James <jamesagnew@gmail.com>
Date:   Thu Aug 10 11:18:19 2017 -0400

    Fix tests

commit 4543408dc8
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 5 06:55:50 2017 -0400

    Fix a potential deadlock

commit ee360f5376
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 5 06:22:06 2017 -0400

    Add R4 code to CLI

commit 1a95ba3b65
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Aug 3 06:14:01 2017 -0400

    More cleanup

commit f0d8802681
Author: James <jamesagnew@gmail.com>
Date:   Wed Aug 2 11:27:43 2017 -0400

    Tests are working!

commit a4cbda357e
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed Aug 2 10:42:04 2017 -0400

    Connection handling cleanup for new tests

commit 0e2cecfbd0
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed Aug 2 10:16:28 2017 -0400

    Clean up R4 JPA tests

commit 40317a650d
Author: James <jamesagnew@gmail.com>
Date:   Wed Aug 2 09:12:38 2017 -0400

    Work on R4 for JPA server

commit e7f8f8c30d
Author: James <jamesagnew@gmail.com>
Date:   Tue Aug 1 20:43:47 2017 -0400

    More work on porting tests

commit 43c9003258
Author: James <jamesagnew@gmail.com>
Date:   Tue Aug 1 07:09:29 2017 -0400

    Work on porting DSTU1 tests

commit 602857f1e2
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 31 22:34:08 2017 -0400

    More work on bring unit tests up to date

commit e326a7b0cd
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 31 17:36:38 2017 -0400

    Credit for #686 and forward port the fix to R4 validator

commit 96543c3992
Merge: 3fb75aa61a 9901b802c4
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 31 17:12:33 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 3fb75aa61a
Author: James <jamesagnew@gmail.com>
Date:   Mon Jul 31 15:21:30 2017 -0400

    More work on cleanup

commit b02fbb6804
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 22:11:07 2017 -0400

    Work on porting STU1 tests

commit 1ae37b0db3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 20:56:10 2017 -0400

    Try to get coverage report working

commit 72b88849b3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 20:27:02 2017 -0400

    Fix android tests

commit e5f6c35aea
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 30 19:31:18 2017 -0400

    More work on getting legacy code cleaned up

commit 0b513b0845
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 30 18:41:13 2017 -0400

    Continue work on removing deprecated API

commit defea69aa3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 17:10:01 2017 -0400

    More cleanup of legacy code

commit 9ae7295705
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 30 07:11:45 2017 -0400

    More cleanup of legacy code

commit ebd3eeb5ee
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 06:43:25 2017 -0400

    More work on removing legacy code

commit 92224c2532
Author: James <jamesagnew@gmail.com>
Date:   Sat Jul 29 18:44:06 2017 -0400

    Remove DSTU1 Bundle

commit c52cacf71b
Author: James <jamesagnew@gmail.com>
Date:   Sat Jul 29 14:27:42 2017 -0400

    Now compiling

commit b405e51773
Merge: c3ddf04e25 cb2cea54d7
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Jul 28 06:21:02 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit c3ddf04e25
Author: James <jamesagnew@gmail.com>
Date:   Thu Jul 27 11:06:06 2017 -0400

    Sync R4 releases in

commit b13333c3c0
Author: James <jamesagnew@gmail.com>
Date:   Fri Jul 14 05:52:33 2017 -0400

    JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions.

commit 2e60ff7521
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 13 20:02:46 2017 -0400

    Fix imports

commit a92ace2e0d
Merge: 3196db96d1 1a6b3ea867
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 13 12:02:27 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 3196db96d1
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 13 11:48:10 2017 -0400

    Don't add false paging link to request

commit bd4e1d3388
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 9 21:32:16 2017 -0400

    Finally building correctly!

commit 6464ce9304
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 9 16:38:28 2017 -0400

    Work on refactor

commit 0059f2e48e
Author: James <jamesagnew@gmail.com>
Date:   Sat Jul 8 07:16:20 2017 -0400

    Keep working on refactor

commit 6c2e87e8cc
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 22:35:13 2017 -0400

    Lots of work on refactor

commit 11cab97504
Merge: 34ec6b8807 6c47bd4c51
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 21:43:57 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 34ec6b8807
Merge: f8e647511b c520e60ac1
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 21:43:49 2017 -0400

    Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor

commit f8e647511b
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 18:46:55 2017 -0400

    Work on hapi3 changes

commit c520e60ac1
Author: James <jamesagnew@gmail.com>
Date:   Wed Jul 5 08:08:40 2017 -0400

    Keep working on refactor

commit f1d2ee9092
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 3 22:10:59 2017 -0400

    Continue refactor for HAPI 3

commit 9281ccafc3
Merge: ea1264cd8e 294d080bd3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 3 20:34:16 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit ea1264cd8e
Author: James <jamesagnew@gmail.com>
Date:   Wed Jun 28 10:26:01 2017 -0400

    Continue work on refactor

commit fbe2f98a02
Merge: b2bef47100 0a4dcc32ec
Author: James <jamesagnew@gmail.com>
Date:   Wed Jun 28 06:21:22 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit b2bef47100
Author: James <jamesagnew@gmail.com>
Date:   Tue Jun 27 21:13:23 2017 -0400

    Work on refactor

commit 8f76e4e463
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jun 25 21:55:35 2017 -0400

    Lots of work on refactoring
2017-08-13 14:39:47 -04:00
James 14edc79ac1 Version bump to 2.6-SNAPSHOT 2017-06-09 07:28:29 -04:00
James 8b5209ff67 Version bump to 2.5 2017-06-08 06:34:44 -04:00
James Agnew 30b18c9a72 Merge pull request #652 from joelsch/upload-definitions-bugfix
revise ValueSet/request-intent URL, to resolve CLI upload-definitions problem
2017-06-07 21:23:09 -04:00
James Agnew b96932a5c5 Fix dependency on new version of commons-codec 2017-05-25 15:24:47 -04:00
Joel Schneider (NMDP) dbdebdbcda revise ValueSet/request-intent URL, to resolve CLI upload-definitions problem 2017-05-22 23:39:12 -05:00
James 716fa56b8f Merge branch 'jpa_perf_enhancements' 2017-04-21 06:30:22 -04:00
James cbc652d226 Version bump to 2.5-SNAPSHOT 2017-04-20 16:13:15 -04:00
James 9d3d15ce6f Version bump to 2.4 2017-04-19 21:38:36 -04:00
James 077676fd03 Bring DSTU3 structs up to FHIR R3
Squashed commit of the following:

commit 65b70d30c9
Author: James <jamesagnew@gmail.com>
Date:   Tue Apr 18 07:44:08 2017 -0400

    More work on bringing structs up to date

commit 1df2de0667
Author: James <jamesagnew@gmail.com>
Date:   Tue Apr 18 07:12:45 2017 -0400

    Working

commit 9a51323e03
Author: James <jamesagnew@gmail.com>
Date:   Mon Apr 17 22:18:24 2017 -0400

    Updates to STU3

commit 40aebba0a7
Author: James <jamesagnew@gmail.com>
Date:   Mon Apr 17 18:30:26 2017 -0400

    Fix regression caused by #610
2017-04-18 07:48:38 -04:00
James Agnew 9b1366734a Merge branch 'master' into jpa_perf_enhancements 2017-04-03 15:20:55 -04:00
James Agnew 357872bfdf Merge branch 'master' into jpa_perf_enhancements 2017-04-01 09:03:54 -04:00
James 594f6a0d3b Clean up dep versions 2017-03-31 16:42:24 -04:00
James Agnew 90b18e5497 Dependency version bumps 2017-03-31 14:33:07 -04:00
James Agnew ce73e89715 For bit of work on JPA perf enhancements 2017-03-30 06:28:34 +08:00
James Agnew 91ff109300 Fix #608 - Don't include SupportingDocumentation resource in DSTU2 2017-03-26 09:56:33 +08:00
James 40848b1beb Version bump to 2.4-SNAPSHOT 2017-03-18 12:24:39 -04:00
James e18ab206d7 Version bump to 2.3 2017-03-17 21:21:59 -04:00
James 8758b6f3da Updating to 1.9.0 structures
Squashed commit of the following:

commit 81edf46fe02a88851693f958e60855edfe69c04c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Mar 17 21:05:22 2017 -0400

    Work on converter

commit 3342d987008892dd3a75dddd251fe599c31c5a6c
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 08:40:37 2017 -0400

    Site updates

commit 7dcb63904ece1fcb59a09dc268e8382ac0b75535
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 08:36:39 2017 -0400

    STU3 structs working!

commit c5aec809e3f19f3fedf0aaaeab8cdd7924c144a2
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 07:05:54 2017 -0400

    Format test

commit 5033090010e8c93644505bccaa5e41ccbd756485
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 07:03:39 2017 -0400

    Merge tests for STU3

commit de40a516bfa4d2ab7f5e28e2d95815fde68bd10a
Merge: d5a5a60 899ed25
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 06:59:20 2017 -0400

    Merge branch 'master' into dstu3_latest_structs

commit d5a5a601b53d8be6712f0bfe37ba7e6eb4d3ce58
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 14 12:04:37 2017 -0400

    Latest fixes

commit ae46ad53d2075e66e3c58c1e626652b4e144f20c
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 14 06:51:59 2017 -0400

    STU3 structs passing

commit ec3b62d31131d303001f8574c58fb7a8b8194f68
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 22:20:05 2017 -0400

    Fix some tests

commit 933f9b08c32dd8671638f406a0966c5ee07d86a1
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 21:18:03 2017 -0400

    Fix test

commit 2a3ad0b422f58cfffea966a7005c6a3d86d189da
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 21:07:33 2017 -0400

    Resolve compile issues in STU3

commit fe04eba312a42c74b10a3971e4d61d58ba003bf9
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:51:35 2017 -0400

    FIx compilation error

commit 6c63a558c97cf176105967a84a0b32472c6c0fcb
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:48:13 2017 -0400

    Another STU3 struct fix

commit 6acd25458aad89aaff94768c824d4d1fcdac97ba
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:41:16 2017 -0400

    Work on STU3 structs

commit 90a476dba2665a129572ad5cbbd8dd29afd9d4c8
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:28:32 2017 -0400

    Resolve JDK8 dependencies

commit 783bc1519971e977fe7139aa1d3a2e7f37940a63
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:20:57 2017 -0400

    Fix some tests

commit 60c379175b689495e65278bb6a237af3de379aa8
Author: James <jamesagnew@gmail.com>
Date:   Sun Mar 12 19:56:29 2017 -0400

    Work on STU3 structs

commit e98c2eed6601f7009e199aca3b82399a3377077c
Author: James <jamesagnew@gmail.com>
Date:   Sun Mar 12 19:41:48 2017 -0400

    Work on DSTU3 structures

commit 3ce909212bf0f11561b8342d406cffcf957afeb3
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 7 21:03:14 2017 -0500

    Work up upgrading structs
2017-03-17 21:06:12 -04:00
James 7149d2e053 Merge branch 'custom_jpa_search_params' 2017-02-04 16:34:05 -05:00
James Agnew 3f8a8cd8aa Merge pull request #548 from sekaijin/cleanup
Cleanup
2017-02-04 16:02:50 -05:00
James 97ff79d730 Work on custom params 2017-02-02 20:37:58 -05:00
James Agnew 3191c907a3 Work on JPA 2017-02-02 06:23:28 -05:00
James ce80007f8d Bump spring version and refactor examples 2017-01-29 22:55:22 -05:00
sekaijin a150a96089 dependencies convergence
correct dependencies convergence
correct version use ${project.version}
2017-01-29 19:22:28 +01:00
sekaijin 23784c1619 remove .settings .project .classpath file of eclipse 2017-01-28 17:13:47 +01:00
James Agnew fa1ad5ba85 Fix #519 - Issues with JPA capabilitystatement related to the _id param 2017-01-13 21:19:19 -06:00
James Agnew 118c2c4238 Dependency changes 2016-12-25 12:49:07 -05:00
James b448e13edd Version bump to 2.3 2016-12-20 19:01:31 -05:00
James 0ec61533a8 Publish 2.2 2016-12-20 19:00:37 -05:00
James 9cb014724b Add validator for DSTU2.1 2016-12-11 17:39:05 -05:00
James 901a85880c Update STU3 definitions and being in STU2.1 defs too 2016-12-10 19:51:25 -05:00
Bill Denton 49cfa0110a push missing part of update 2016-12-09 17:09:39 -08:00
Bill Denton 67aee59f0f allow templates access to resource-block referenced by a block-copy 2016-12-09 17:04:01 -08:00
Bill Denton 28ed425d6b put back deleted line 2016-12-08 17:50:09 -08:00
Bill Denton 5ab36de2e1 allow generic tinder tasks to override Velocity properties 2016-12-07 18:35:42 -08:00
Bill Denton 6b446d9bd1 fix typo and enhance tests 2016-12-06 19:06:49 -08:00
Bill Denton 1452a29a09 fix/enhance tinder-tests for new functions 2016-12-06 11:26:24 -08:00
Bill Denton fd1ec07cde full resource/composite generation using generic templates and Ant 2016-12-02 17:06:27 -08:00
James 6314f5efb3 Fix structuredefinition regression 2016-11-14 12:04:56 -05:00
James 2d7592f7a8 Version bump to 2.2-SNAPSHOT 2016-11-11 22:39:45 -05:00
James 2dd26b6367 Version bump to 2.1 2016-11-11 15:16:53 -05:00
James a5d5d3e031 Bump FHR version 2016-11-06 17:34:13 -05:00
James 2a5c26b08b Dependency bump 2016-10-05 05:17:07 -04:00
James Agnew 906bcfb803 Version bump to 2.1 2016-08-30 10:55:55 -04:00
James Agnew d27aad487e Bump to 2.0 release 2016-08-30 10:50:04 -04:00
James ddc0abe4ed Update to final STU3 ballot definitions 2016-08-26 07:55:10 -04:00
James Agnew 3e7cd153fd Update DSTU3 definitions to latest 2016-08-05 12:36:41 -04:00
James Agnew c3e9f618eb Version bump to 2.0-SNAPSHOT 2016-07-12 11:12:07 -04:00
jamesagnew acaf2135c5 Finalize 1.6 release 2016-07-06 07:29:20 -04:00
jamesagnew 32bdd14639 Work on term service 2016-07-02 17:14:36 -04:00
jamesagnew 4a49e5b7f9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-01 14:31:25 -04:00
James Agnew 4a7328231e Fix #365 - Don't label methods as unable to return null when they can 2016-06-08 14:48:55 -07:00
James Agnew 364094d540 Fix build 2016-06-08 14:34:58 -07:00
James Agnew 0a2b4290ed Fix #370 - Validation failure when validating certain STU3 resources 2016-06-08 14:21:18 -07:00
James Agnew 7e57aed5d6 Significant performance enhancements for context startup 2016-06-06 11:15:11 -07:00
James Agnew 9fe9cc1e4c Sync RI and fix tests 2016-05-29 17:52:26 -04:00
James Agnew eb3b656a5f Syn RI - Build still failing :( 2016-05-28 12:53:59 -04:00
James Agnew 3e77d3e37e Add _has support (this is an experimental parameter being tested) 2016-05-10 11:47:30 -04:00
James Agnew 848ad158e2 Remove Remittance resource from DSTU2 2016-05-06 19:52:10 -04:00
jamesagnew dcd32b6127 Correctly handle search parameter target types in JPA 2016-05-03 07:03:44 -04:00
James Agnew c90795ccef Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-05-02 09:03:48 -04:00
jamesagnew 5086145132 Add targets to search parameters 2016-05-02 08:10:43 -04:00
James Agnew 2d81612cd8 Fix #350 - Correct serialization for custom types which have fields
replacing other fields
2016-04-28 13:25:20 -04:00
jamesagnew 38e80531bb Bump version to 1.6-SNAPSHOT 2016-04-22 07:05:05 -04:00
jamesagnew 14c9fdfd97 Finish removing Documentation resource, which shouldn't exist 2016-04-20 08:11:44 -04:00
jamesagnew 59c44a3b0b More test fixes 2016-04-17 20:57:27 -04:00
jamesagnew 64f84849d7 Fix a bunch of tests - Still trying to get memory down so Cobertura passes 2016-04-17 19:41:28 -04:00
jamesagnew 846e216c04 Fix tests 2016-04-17 12:58:36 -04:00
jamesagnew 2f37015d57 Clean up parsers so that elements are always encoded according to their order in the structures that contain them 2016-04-11 08:36:12 -04:00
jamesagnew 18b3d0df65 Update to DSTU3 Montreal definitions 2016-04-03 18:14:31 -04:00
James Agnew 20081a419d Fix #320 - Don't generate binding enums for example binding fields on
resources
2016-03-25 20:15:01 +01:00
bdenton 7131ef1c7c create tinder Ant task 2016-03-24 13:16:52 -07:00
bdenton 42a9bac809 generate resource related files using external templates 2016-03-24 10:34:54 -07:00
James Agnew 1adfc4b4d9 Fix #315 - Allow declaring of custom types for specific profiles 2016-03-22 11:46:08 +01:00
James Agnew 00ced6a652 Improve performance of _lastUpdated queries in JPA server 2016-03-14 06:31:45 -04:00
James Agnew 8de41ca8b4 Attempting to reduce memory usage during tests 2016-03-06 14:38:18 -05:00
jamesagnew 3fd9f9518a Handle unexpected extensions when parsing using IParserErrorHandler 2016-03-02 06:52:46 -05:00
jamesagnew 1da5855c9c Add Eclipse files to git 2016-02-28 14:02:29 -05:00
James Agnew 7fdbee6f21 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-02-26 18:20:32 -05:00
James Agnew 39f6420066 Start working on compartment support 2016-02-26 18:16:35 -05:00
jamesagnew 4975d212fa Add userdata map to interceptors which can be passed around 2016-02-17 08:05:55 -05:00
jamesagnew 9b304748ad Work on terminology service 2016-02-16 21:29:00 -05:00
jamesagnew c1141eb18f Reorganize how search param prefixes are handled and modelled based on new DSTU2 style prefixes 2016-02-15 10:05:39 -05:00
jamesagnew 23f9292b50 Add support for comments in XML and JSON parsing/encoding 2016-02-08 22:05:17 -05:00
James Agnew f21851099c Version bump 2016-02-08 13:59:09 -05:00
James Agnew e0e52f96c6 Version bump to 1.4 (finally!) 2016-02-03 15:25:32 -05:00
jamesagnew 32daeb6f58 Switch DSTU2.1 to DSTU3 per FMB's decision 2016-02-01 08:55:58 -05:00
jamesagnew 54d17374b9 Update model and definitions to latest definitions 2016-01-30 11:08:16 -05:00
jamesagnew b7aa4e15b9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-01-05 08:31:24 -05:00