Commit Graph

866 Commits

Author SHA1 Message Date
Tadgh d1b963321a
MVP EMPI implementation (#1857)
EMPI Initial Implementation (still plenty of known gaps)
2020-05-22 15:03:20 -04:00
James Agnew ce5ade53d9
Fix #1855 - StructureDefinition search not working (#1858) 2020-05-21 09:35:37 -04:00
James Agnew 5b2181a563
Implement FHIR Patch (#1850)
* Start working on FHIRPatch

* More work on fhirpatch

* Work on FHIR Patch

* Add patch

* Test fixes

* Test fixes

* Get tests fixed

* Chnage to trigger a build

* Compile fix

* Dependency version fixes

* Test fix

* COmpile fix

* Try to fix build

* Test fix attempt

* Another build attempt

* Another build tweak

* Cleanup
2020-05-20 19:43:55 -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
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
jamesagnew e0b419354f Bump up hamcrest version and force the use of the latest version 2020-04-17 13:59:22 -04:00
James Agnew 497757501b
Improve search method binding priority (#1802)
* Work on search method binding priority

* Work on method priority

* Work on binding priority

* Test fixes

* Add changelog

* Test fixes

* compile fix

* One more comple fix

* Test cleanup

* Test fix
2020-04-17 09:28:33 -04:00
James Agnew 1a3a40b3c9
Merge pull request #1796 from jamesagnew/ja_20200409_report_json_error_attr_name
Improve error message reporting for invalid json - Fix #1793
2020-04-09 15:11:57 -04:00
jamesagnew dce4205adb Test fix 2020-04-09 11:38:49 -04:00
jamesagnew 879fbb0bf8 Test fixes 2020-04-09 10:34:18 -04:00
Ruslan_Zinovyev cce62ec3dc @Test annotation was missed 2020-04-06 11:49:12 -04:00
Ruslan_Zinovyev 328f74ead1 add two additional test to check the JSON and XML parsers 2020-04-06 11:30:41 -04:00
Jafer Khan ce012ff7cf Add test case for invalid query parameters in read operation 2020-03-31 20:05:05 -04:00
jamesagnew 14316147c5 Resolve some docs issues 2020-03-23 10:34:12 -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 bde7c356fe
Implement Jackson parser/serializer (#1733)
* [dev] Integration of a Jackson serializer and deserializer - first stage

* [fix] Fixed some serializing issues
[improve] Improved the processing, removed the loggers

* [clean] Removed the JacksonSerializer class, replaced all the Gson classes with Jackson classes

* [clean] Small cleanup

* [improve] Throw a ConfigurationException if the JsonGenerator cannot be created

* [improve] Use the ObjectMapper's `readTree` instead of `readValue`

* [dev] Latest fixes and improvements

* [dev] Use the Jackson serializer

* [clean] Removed the ObjectMapper configuration, for now

* [fix] Use the GsonStructure also for the parsing of a FHIR resource

* [clean] Removed the LinkedList usage

* Work on preparing for merge of #1673

* Resolve build errors

* Work on parser integration

* Tests passing

* Resolve fixme

* CLeanup

* Fix dependency

Co-authored-by: Bogdan Solga <bogdan.solga@gmail.com>
2020-03-17 17:27:26 -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
James Agnew 34d42a17da Add tests 2020-03-09 12:41:46 -04:00
James Agnew 60f16dd91d
Update to 4.3.x core JAR (#1715)
* Added optionality for adding resource fetcher

* Added coverage that proves invocations

* Bumped version of fhir.core to latest version. Added wrapping of AssumeValidRestReferences

* Added optionality for adding resource fetcher

* Added coverage that proves invocations

* Bumped version of fhir.core to latest version. Added wrapping of AssumeValidRestReferences

* Start working on converter

* Account for compile errors

* Test fix

* Work no validator

* Work on getting core working

* Add some test coverage

* Many test fixes

Co-authored-by: Jens Kristian Villadsen <46567685+jvitrifork@users.noreply.github.com>
2020-02-17 14:28:29 -05: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 c5c1e3196b Resolve FIXMEs (#1705)
* Resolve FIXMEs

* Test fixes

* Test fixes

* Clean up unused code

* Add some test coverage

* Test fix

* Test fix

* Avoid intermittent
2020-02-09 08:39:46 -05:00
James Agnew aad5a30a3d
Support count=0 (#1670)
* Support count=0

* Fix LGTM issue
2020-01-15 14:52:32 +08: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 51b608188b
Some CI surefire improvements (#1602)
* Some CI surefire improvements

* Build tweak

* More tweak

* Update azure-pipelines.yml for Azure Pipelines

* Update azure-pipelines.yml for Azure Pipelines

* One more CI attempt

* Update azure-pipelines.yml for Azure Pipelines

* Tweak command line

* Another build test fixc

* More build cleanup
2019-11-23 19:51:02 +01:00
James Agnew a2f77b23d2
Fix #1583 - Index local refs in canonical types (#1593)
* Fix #1583 - Index local refs in canonical types

* Add fix to pre-expansion

* Test fix

* Rework ID handling

* Test fixes

* Fix test
2019-11-23 16:32:37 +01: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
James Agnew 1a348abaf5 Try to fix 2 intermittent test failures 2019-11-08 08:45:08 -05:00
James Agnew 0b9f921c3e Fix NPE in xml parser 2019-11-04 09:49:49 -05:00
James Agnew 3b6709e1d1
Merge pull request #1566 from jamesagnew/ja_20190928_rationalize_search_param_extractor
Rationalize search param extractors across FHIR versions
2019-11-02 16:18:23 -04:00
Stig Rohde Døssing 80bfb9af37 Issue-1077: Make CapabilityStatementProvider use the closest common superclass of provided resources when generating rest.resource.profile, instead of always using the base definition. 2019-11-01 10:20:16 -04:00
Ken Stevens 21c591eaf2 ready for review 2019-10-30 13:49:10 -04:00
jamesagnew 8b227a59fc Add some tests 2019-10-28 06:02:19 -04:00
James Agnew 12a74e6cbc
Fix term uploads and validate against valueset recalculation (#1540)
* Start refactoring terminology delta operations

* Work on delta operations

* Work on concept saving

* Split term services into smaller services

* Work on term delta operations

* Work on term svcs

* Work on term operations

* More work on delta uploader

* Add a test

* Wrk on term service

* Fix compile error

* Some refactoring

* Test fix

* Test fix

* Test fixes

* Test fix

* Test fixes

* Test fixes

* Work on delta

* Work on tests#

* Test fixes

* Improve resequencing logic

* Build test

* More testing

* More build testing

* More work on tests

* CHange test logging

* Fix term service PID issue

* Update src/changes/changes.xml

Co-Authored-By: Diederik Muylwyk <diederik.muylwyk@gmail.com>

* Address review comment

* Some cleanup

* Test fix

* Fix some tests

* Work on upload command

* Test fixes

* Work on validation fixes

* Work on validation against pre-expansion

* Work on direct validation

* A bit of cleanup

* Add some javadoc

* Force another build

* Test fixes

* Fix tests

* Fix tests
2019-10-15 21:31:29 -04:00
James Agnew 9a050461a8 Make cache timeout configurable 2019-10-15 09:34:48 -04:00
James Agnew ff4fba15c9 Add a test 2019-10-15 07:34:44 -04:00
James Agnew 2725797610
Implement Terminology Delta Operations (#1536)
* Start refactoring terminology delta operations

* Work on delta operations

* Work on concept saving

* Split term services into smaller services

* Work on term delta operations

* Work on term svcs

* Work on term operations

* More work on delta uploader

* Add a test

* Wrk on term service

* Fix compile error

* Some refactoring

* Test fix

* Test fix

* Test fixes

* Test fix

* Test fixes

* Test fixes

* Work on delta

* Work on tests#

* Test fixes

* Improve resequencing logic

* Build test

* More testing

* More build testing

* More work on tests

* CHange test logging

* Fix term service PID issue

* Update src/changes/changes.xml

Co-Authored-By: Diederik Muylwyk <diederik.muylwyk@gmail.com>

* Address review comment

* Some cleanup

* Test fix

* Fix some tests

* Test fixes
2019-10-14 19:14:41 -04:00
James Agnew 861ed36f00
Allow patches to be authorized for DSTU3 transactions (#1529)
* Allow patches to be authorized for DSTU3 transactions

* Add changelog
2019-10-08 14:29:27 -05:00
James Agnew 1f1b94a566
Resolve XXE issue in validator (#1530)
* Resolve XXE issue in validator

* Ensure that we're blocking XXE events into validator XML parser

* A bit of cleanup

* Add an LGTM config

* Add one more fix
2019-10-08 13:06:03 -05:00
James Agnew eaaf2768c3 Fix #402 - Don't overwrite narrative sections 2019-09-30 20:14:36 -04:00
James Agnew 066c9a7fb7 Improvements to AutohrizationInterceptor create handling 2019-09-30 15:07:23 -04:00
James Agnew 0bee7a7b53 Test fix 2019-09-30 10:12:49 -04:00
James Agnew c8ce07c40e Deprecate redundant IVersionSpecificBundleProvider method 2019-09-30 09:45:31 -04:00
James Agnew 7b363c2c5c Some test fixes 2019-09-24 15:28:14 -04:00
James Agnew 9b2826f3c6
Handle searches with chained slash value (#1503)
* Work on test case for bug with searches

* Work on tests

* Fix issue with slashes in reference chain parameter for JPA server
2019-09-24 14:31:05 -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 58b7e3a923 Start splitting docs into separate project 2019-09-22 08:58:17 -04:00
James Agnew eddb98084d Move PreferReturnEnum back to original location to avoid regressions 2019-09-19 15:48:58 -04:00
James Agnew 5e74a6f3e8 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-09-17 16:01:53 -04:00
James Agnew 4a751cbfc5
Integrate Bulk Export (#1487)
* Start working on subscription processor

* Work on new scheduler

* Test fixes

* Scheduler refactoring

* Fix test failure

* One more test fix

* Updates to scheduler

* More scheduler work

* Tests now all passing

* Ongoing work on export

* Ongoing scheduler work

* Ongoing testing

* Work on export task

* Sync master

* Ongoing work

* Bump xml patch version

* Work on provider

* Work on bulk

* Work on export scheduler

* More test fies

* More test fixes

* Compile fix

* Reduce logging

* Improve logging

* Reuse bulk export jobs

* Export provider

* Improve logging in bulk export

* Work on bulk export service

* One more bugfix

* Ongoing work on Bulk Data

* Add changelog
2019-09-17 16:01:35 -04:00
James Agnew d3c8962ae6 Add some tests 2019-09-17 14:04:35 -04:00
James Agnew 722c7a8211 Work on GraphQL updates 2019-09-06 14:56:17 -04:00
James Agnew 9428430822
Add support for Resource.meta.source (#1438)
* Work on indexing source

* Work on tests

* Refactor query count tests

* Unit test fixes

* Add some tests

* DAO fix

* Fix compile error

* Unit test fix

* Cleanup

* Test fix

* Fix compile error

* One more test fix
2019-08-21 11:17:43 -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 0c41f35583 Add test for #1399 2019-08-07 10:44:42 -04:00
James Agnew a4ca5374ec
Add terminology delta operations (#1401)
* Start work on delta operations

* Add changelog

* Some build fixes

* Move upload terminology command to CodeSystem resource

* Updates

* Some test fixes

* Add changelog

* Some test fixes

* More test fixes

* Test fix

* Add additional tests

* Transaction boundary fixes
2019-07-29 17:46:42 -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 a352137938 Test fixes 2019-07-11 21:10:30 -04:00
James Agnew 32a8e1aead Omit extensions when encoding in summary mode (except for
CapabilityStatement)
2019-07-11 16:28:50 -04:00
James Agnew 73daec633f Test fix 2019-07-07 13:07:27 -04:00
James Agnew 34f7d4ddbd Refactor ServerConformanceProvider so that it no longer keeps any state 2019-07-07 12:57:31 -04:00
James Agnew 1fd99dac63
Enable optional cascading deletes on JPA server (#1363)
* Start working on cascading deleets

* WOrk on cascading deletes

* Work on cascading deletes

* Enable cascading deletes

* Cascade deletes almost working

* FIx test

* Test fix
2019-06-28 17:32:39 -04:00
James Agnew 53b47ed580 Ensure that parsed reesource is available to interceptors 2019-06-27 18:23:10 -04:00
James Agnew 10d969c514
Add Consent Service (#1359)
* Initial consent svc

* Ongoing consent svc work

* Add docs

* Ongoing consent service work

* Work on consent service

* More work on consent svc

* License header updates

* Ongoing consent svc work

* Some test fixes

* Some test fixes

* More work on consent svc

* Tests working

* Test fix

* Propagate RequestDetails to everything in JPA server

* More interceptor tweaks

* Fix compile error

* One more tweak to captured SQL

* Ongoing interceptor tweaks

* Ongoing interceptor tweaks

* More interceptor tweaks

* Interceptor tweaks

* Tweaks to tests

* Fix tests

* Test fix

* Raise warnings when encoding extensions with missing values

* Consent service work

* More interceptor tweaks

* Consent interceptor tweaks

* Add logging to test
2019-06-27 16:35:29 -04:00
jamesagnew 8bb010bb18 Test fixes 2019-06-22 17:42:02 -04:00
jamesagnew 0fbde2a4e5 Fix #1352 - Don't fail to create observation with a value type of
SampledData
2019-06-22 16:43:25 -04:00
jamesagnew 3274693576 FIx a test 2019-06-22 16:31:55 -04:00
jamesagnew 95876ec3cb Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-06-22 16:24:07 -04:00
jamesagnew 638cb976fd Fix #1250 - Don't include Bundle.entry.response on search results 2019-06-22 16:23:32 -04:00
James Agnew 4ad1808da3
Propagate RequestDetails to everything in JPA server (#1358) 2019-06-22 15:18:06 -05:00
jamesagnew c7798fee48 Test fix 2019-06-18 05:40:00 -04:00
James Agnew b2e99cf035
Add support for conditional patch (#1348)
* Add support for conditional patch

* Add changelog

* Test fix
2019-06-17 16:12:05 -04:00
Stig Rohde Døssing b56f59542a Move JettyUtil to new module 2019-06-14 18:34:45 -04:00
Stig Rohde Døssing aab7bb6b64 Issue-1325: Let OS assign random ports to servers during testing, and let tests get the port of the running server once the OS has assigned a port. Delete PortUtil and similar utilities. 2019-06-14 18:34:45 -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
basecade 3bb3c3a383 Preserve contained resource meta when encoding to dao (#1311)
* Preserve contained resource meta when encoding with: parser.setDontEncodeElements(ResourceMetaParams.EXCLUDE_ELEMENTS_IN_ENCODED)

* - Correct so security, lastUpdated and versionId is not encoded
- Added test
2019-05-22 17:11:03 -04:00
James Agnew d4d3178621 A couple of test fixes 2019-05-11 15:04:44 -04:00
James Agnew 6b37525f2d
Clean up redundant dependencies (#1306)
* Remove a bunch of unneedd deps

* Test fix

* Disable useless test
2019-05-09 12:51:13 -04:00
James Agnew 738c2c1797
Interceptor framework refactoring (#1287)
Interceptor framework overhaul
2019-04-24 14:32:30 -04:00
James Agnew 311246e5f0
Merge pull request #1255 from jamesagnew/addFetchValueSet
added fetchValueSet to IValidationSupport and made it public
2019-04-15 17:03:56 -04:00
James Agnew c8f2e4bbc9 Return HTTP 400 for missing body on POST and PUT 2019-04-14 12:32:09 -04:00
patrick-werner 15fda25771 added fetchValueSet to IValidationSupport and made it public to enable overwriting it in subclasses 2019-03-27 17:35:01 +01:00
James Agnew e85bec2858
Ja inline references (#1252)
* Use a single IN clause for OR reference searches

* Add changelog

* One more attempt at getting the free port util to actually work... sigh

* One more tweak to free ports

* Bundle fix
2019-03-26 10:42:42 +01:00
James Agnew e3ecf21fa9 One more test fix 2019-03-12 13:24:18 -04:00
James Agnew 00a8f8c759 Fix broken build 2019-03-12 13:13:13 -04:00
James Agnew 3433ecfd14 Test fixes 2019-03-11 16:14:34 -04:00
James Agnew 71a07c0239 Refactor the way that contexts are used in narrative generator 2019-03-11 16:05:25 -04:00
Ken Stevens dcfacfea49
Has param no in (#1232) 2019-03-10 20:50:24 -04:00
James Agnew f8b8f2d1b0 Move process-message to the correct level 2019-03-06 16:12:43 -05:00
James Agnew 48c10bddc5
Narrative Generator refactoring (#1219)
* Starting work on this

* Working on narrative templates

* Work on new narrative system

* Account for some failing tests due to refactoring of narrative mode

* Another test fix

* More test fixes

* One more test fix

* Work on searches

* Address review comments
2019-02-27 14:59:57 -05: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
James Agnew e401ec86e4
Enhanced elements (#1192)
Squashed merge: Add elements exclude mode

* Start working on elements enhancement

* Work on elements projection

* Work on elements filter

* Feature is now working

* Just some cleanup

* Address compile issues
2019-02-03 16:41:33 -05:00
bdenton 737ee9e97c add JSON-like tests for DSTU3 and R4 2019-01-30 17:32:06 -08:00
James Agnew 68fae08f20 Fix casing in base64Binary type 2019-01-23 08:34:09 -05:00
James Agnew b8755615b2 Allow AuthorizationInterceptor to read patients if the user has read
access to the individual instance
2019-01-14 13:53:08 -06:00
James Agnew 93bf2788ec Add subscription narrowing interceptor and refactor RuleBuilder to be a
bit cleaner
2019-01-12 14:23:26 -06:00
James Agnew 3c260e5ef2 Ignore unfinished test 2019-01-10 07:36:37 -07:00
James Agnew b8f200f897 Correctly expose chains in DSTU2 server conformance statmeent 2019-01-10 06:15:31 -07:00
Stig Rohde Døssing f8b232bb67 Issue 430: Generate OperationDefinitions for named queries, fix minor errors in generation of OperationDefinition for operations. Closes #430. 2019-01-09 05:41:08 -05:00
James Agnew 62ae71c1c6 Allow authorizing delete operations via a transaction in
AuthorizationInterceptor
2019-01-07 15:43:36 -05:00
jamesagnew a8a97ae6b2 Two test fixes 2019-01-07 09:18:11 -05:00
James Agnew bb6e392e2d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-01-07 09:17:37 -05:00
James Agnew c104923855 Add an additional test for transaction processing 2019-01-07 09:17:19 -05:00
jamesagnew 3d94761bcb Improve response for transactions 2019-01-06 18:08:32 -05:00
jamesagnew b2c7a2003e Prevent a nullpointerexception in AuthorizationInterceptor 2019-01-06 16:42:29 -05: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
James Agnew a0cb7edd08 Version bump a few dependencies 2018-12-22 20:13:03 -05:00
Corina Dalaban d46878be86 unit tests for head operation
-reverting the removal of the unit test but with the correct status code
-added unit test for a valid patient
2018-12-21 05:40:35 -05:00
Corina Dalaban 65a54bfe29 the test for head operation is not needed anymore in the
unsupportedhttpmethods
2018-12-21 05:40:35 -05:00
James Agnew b442982310 Add media interceptor 2018-12-08 18:49:58 -05:00
James Agnew b41c222880 Require explicit declaration of authorizationinterceptor operation rules
on whether the response is authorized or not
2018-11-23 14:25:46 -05:00
James Agnew 58388bb614 Allow client to return methodoutcome instead of resdource for operation
call
2018-11-19 11:11:49 +01:00
James Agnew e4f6b3e9a2 Add a warning if an invalid class is scanned 2018-11-16 10:42:21 +01:00
James Agnew 4b099cf057 Fix #944 - NPE when using a custom resource class that has a @Block
child
2018-11-15 16:11:55 +01:00
James Agnew 75210d614b Bump to 3.7.0-SNAPSHOT 2018-11-12 22:37:52 -05:00
James Agnew 63af04a7b4 Prepare for 3.6.0 release 2018-11-12 05:40:55 -05:00
James Agnew 80b0f14c4b
Merge pull request #1103 from RuthAlk/own_message_resolver_3.6.6
Allow slotting in own IMessageResolver
2018-11-08 13:22:48 -05:00
James Agnew 76cd3f6b47 Allow client assigned IDs to be purely numeric in JPA server if
configured to do so
2018-11-07 18:25:50 -05:00
James Agnew 2656d008d6 FIx broken test 2018-11-07 11:26:23 +01:00
James Agnew 4b790eddb6 Add additional authorization test 2018-11-07 11:01:29 +01:00
James Agnew 4315900ac0 Merge branch 'philips-3.6.0' 2018-11-01 09:15:27 -04:00
James Agnew 3bfdc61866 Fix a couple of test failures 2018-11-01 09:15:03 -04:00
Ruth Alkema 729bbe04d0 Allow slotting in own IMessageResolver
This is useful in case we want to define our own way of translating
the codes in the thymeleaf templates.
2018-10-26 12:13:58 +02:00
Diederik Muylwyk 21a0390e6e Even more additional work on FhirTerser.getValues(...) enhancements. Almost ready for review. 2018-10-24 11:43:19 -04:00
Diederik Muylwyk 4e414a16fb More additional work on FhirTerser.getValues(...) enhancements. Ready for review. 2018-10-22 18:37:34 -04:00
Diederik Muylwyk 688e159493 Additional work on FhirTerser.getValues(...) enhancements. 2018-10-22 18:22:03 -04:00
Diederik Muylwyk 225007d681 Completed work on FhirTerser.getValues(...) enhancements. 2018-10-19 18:24:26 -04:00
Diederik Muylwyk cd6d4302c3 Incremental work on FhirTerser.getValues(...) enhancements. 2018-10-19 15:13:51 -04:00
James Agnew 4e252063b8 Allow transactions and batches with transaction permission in
AuthorizationInterceptor
2018-10-16 19:54:55 -04:00
Patrick Werner 90a3ead24f
Merge pull request #1089 from srdo/issue-545
Issue-545: Base resource profile links should point to http://hl7.org
2018-10-09 12:05:47 +02:00
James Agnew c64567be68 More redundant test cleanup 2018-10-04 09:15:12 -04:00
James Agnew 597c8dbafe Remove redundant tests 2018-10-04 08:57:37 -04:00
James Agnew b265c0281b Expand search range when searching by date 2018-10-03 21:31:01 -04:00
Stig Rohde Døssing 2050355e1e Issue-545: Base resource profile links should point to http://hl7.org/fhir/StructureDefinition (invariant sdf-7 in spec) 2018-10-03 13:36:34 +02: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 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
James Agnew 54c07263b6 Increase code lengths 2018-08-26 12:32:35 -04:00
jamesagnew df651c830e Remove dynamic mode 2018-08-19 17:35:08 -04:00
jamesagnew 76c981664a Test fix 2018-08-12 19:03:24 -04:00
James Agnew ea1f17762e Don't apply last updated to includes 2018-08-11 12:20:07 -04: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
jamesagnew e5cb609f4d Performance improvements 2018-06-24 20:02:27 -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 ed0b5f54a5 More authorizationinterceptor tweaks for better security 2018-06-12 21:52:01 +08:00
James Agnew e7804b881c Fix CI issue 2018-06-06 11:39:06 -04:00
jamesagnew 3583dfd503 Correctly include project description in capabilitystatement 2018-06-03 16:19:33 -04:00
jamesagnew 987679483a Version bumps 2018-06-03 15:29:10 -04:00
jamesagnew 9db3be8536 Include implementation URL in generated capabilitystatement 2018-06-03 14:22:15 -04:00
James Agnew 35d5d3adb5 Disable useless test 2018-05-31 11:30:27 -04:00
James Agnew be1e0df9e2 Fix test flagged by errorprone 2018-05-30 10:48:53 -04:00
James Agnew d819d685ee Test fix 2018-05-30 09:57:41 -04:00
James Agnew a52805e504 Work on JDK9 support 2018-05-30 05:45:08 -04:00
Diederik Muylwyk 0e2c57fa60 Bumping version. 2018-05-28 17:44:38 -04:00
Diederik Muylwyk 2871920734 Preparing release. 2018-05-28 10:45:47 -04:00
jamesagnew 67f21426cb Disable content header on response for non-create operations 2018-05-25 07:28:01 -04:00
jamesagnew 98d997c620 Add changelog and credit for #867 2018-05-23 06:21:00 -04:00
James Agnew 6da4ec1156
Merge pull request #867 from jasonaowen/master
Fix methods that check for names in lists
2018-05-23 06:08:55 -04:00
jamesagnew 4d62120a18 Fix issues reported by errorprone 2018-05-15 08:44:15 -04:00
James Agnew a3ff08d9ec
Replace phloc with ph for #775 (#930)
* Replace phloc with ph

* Enable schematron tests

* Make HAPI-FHIR ph-schematron on OSGI

* Work on getting tests passing

* Another test fix

* Fix up transaction handling for DSTU2

* Add changelog

* Avoid double transaction

* Dont use readonly

* One more test fix

* Update to snapshow build

* Resolve a circular dependency

* Try to fix tests

* Solve recurring NPE in DSTU2 tests

* Fix one more test

* Test fix

* More test threading fixes

* One more attempt to get tests passing

* Refactoring for tests

* Refactoring for tests
2018-05-14 17:38:40 -04:00
jamesagnew 3d762b984b Sync to R4 definitions 2018-05-12 19:35:42 -04:00
James Agnew 593a705365 Performance enhancements on the CapabilityStatement generator for JPA
server
2018-04-28 11:06:42 -04:00
James Agnew 07e7af746f Work on expunge operation 2018-04-22 22:03:23 -04:00
jamesagnew 180336e076 Sync to master 2018-03-29 06:54:24 -04:00
jamesagnew 53c2d8a38d Merge branch 'master' into loinc_loader_update 2018-03-29 06:21:55 -04:00
jamesagnew 418e82032f Prep for 3.3.0 2018-03-29 05:48:13 -04:00
James Agnew b56d65ef5b
Merge pull request #871 from johnpoth/hapi-fhir-osgi
Implement #826 - add OSGI support and Apache Karaf features with inte…
2018-03-27 06:06:34 -04:00
James Agnew 29c09e40f0
Merge pull request #858 from patrick-werner/master
added Test for #11 to Dstu3 and R4, fixed #853
2018-03-24 06:31:24 -04:00
James Agnew 308ac63a77 Merge branch 'master' into loinc_loader_update 2018-03-20 07:53:41 -04:00
James Agnew 6359f7f8a1 More work on loinc 2018-03-19 08:51:02 -04:00
patrick-werner ff04ab3358 ${argLine} -> [at]{argLine}
see:
http://maven.apache.org/surefire/maven-surefire-plugin/faq.html#late-property-evaluation
2018-03-19 10:45:33 +01:00
jamesagnew dd7deae1c1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-03-12 06:43:42 -04:00
jamesagnew 49192e5e48 Credit for #776 2018-03-12 06:42:22 -04:00
James Agnew 60354a4cc8
Merge branch 'master' into master 2018-03-12 07:41:22 -03:00
James Agnew cb2f5a0bba
Merge pull request #786 from CarthageKing/bugfix-chaining-urlvalue
ensure to use resourceType properly when it is explicitly provided in a chained reference param
2018-03-12 07:32:27 -03:00
patrick-werner 0cee57392a Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java
2018-03-07 11:45:31 -03:00
jamesagnew 8bdca012d6 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2018-03-04 11:04:07 -05:00
jamesagnew 07290ae8a0 Sync to latest R4 code 2018-03-04 11:02:47 -05:00
jamesagnew b2ceb87a70 Work on #873 2018-03-03 17:50:29 -05:00
Gaetano Gallo 3009ec7f74 - added guava-testlib as test dependency to modules hapi-fhir-structures-dstu2 and hapi-fhir-structures-dstu3
- added DateRangeParam.equals(Object) and DateRangeParam.hashCode()
- fixed broken DateParamTest
2018-03-02 13:03:30 +01:00
jpoth 66ebfa0ed3 Implement #826 - add OSGI support and Apache Karaf features with integration tests 2018-02-28 11:32:53 +01:00
Jason Owen 2f139640e5 Add unit tests for HumanName has(String) methods
Prefixes, given names, and suffixes can all have multiple entries, and
so are kept in a list. The `hasPrefix(String)` and its sibling methods
are conveniences for checking that these lists contain the given
element. Add tests around those three methods to ensure that the list
checking code is correct.

Issue #865 HumanName#hasGiven(String) can never return true
2018-02-26 18:22:38 -05:00
patrick-werner a8f3c2efb6 added Test for #11 to Dstu3 and R4 2018-02-21 16:03:31 +01:00
James Agnew 0e2d55081f Fix a crash when no count parameter supplied 2018-02-02 12:31:59 -05:00
James Agnew b61887e841 Improve performance of base64 validation 2018-01-30 17:37:12 -06:00
James Agnew 8d468de551 Use R4 validator for DSTU3 validation 2018-01-30 11:16:04 -06:00
James Agnew f976b7bf7e Add new interceptor method which enabled interceptors to modify response 2018-01-28 14:01:20 -06:00
Simon Janic 97a1ccac3d Merge remote-tracking branch 'upstream/master' 2018-01-28 16:43:32 +01: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
James Agnew 4e2db2b58b More work on multitenancy 2018-01-11 11:23:14 -05:00
James Agnew 377bae8c16 Allow interceptors to modify request contents 2018-01-06 14:27:32 -05:00
James Agnew a8e5413d1f Fix two issues found by ErrorProne 2017-12-22 13:47:40 -05:00
James Agnew 8c10d96416 Add tests 2017-12-22 13:33:35 -05:00
James Agnew 19863de012 Update javadocs on IdType 2017-12-19 15:57:22 -05:00
James Agnew 6c85cd1375 Improve documentation and mark redundant methods as deprecated in
IServerInterceptor
2017-12-12 21:45:54 -05:00
James Agnew d00c7dbea8 Giant breakthrough in fixing sporadic test failures! 2017-12-05 12:08:56 -05:00
Simon Janic 8427fc4547 Merge remote-tracking branch 'upstream/master' 2017-11-26 14:23:33 +01:00
James Agnew 3e296f9d1b Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-11-25 17:53:01 -05:00
James Agnew 6afe6804db Fix #796 - Correctly escape spaces in generated URLs 2017-11-25 17:52:12 -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
Simon Marco Janic 46fcceb9c6 [(master)] Merge remote-tracking branch 'upstream/master' 2017-11-21 11:15:50 +01:00
James Agnew 60b6c3745b Add test for #794 2017-11-20 12:03:45 -05:00
michael.i.calderero 874390df61 treat reference param values as opaque and not an url when the param is
chained
2017-11-15 15:03:53 -06:00
michael.i.calderero b277693106 ensure to use resourceType properly when it is explicitly provided in a
chained reference parameter
2017-11-14 19:00:28 -06:00
James Agnew 99320c3b96 More memory for compiler 2017-11-13 16:17:20 -05:00
James Agnew 59f4177a59 Fix #750 - Elements are not preserved in page requests 2017-11-06 19:49:50 -05:00
Simon Marco Janic 78744ac9e4 [(master)] Merge remote-tracking branch 'origin/master'
# Conflicts:
#	hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/codesystems/DeviceStatusEnumFactory.java
2017-11-06 12:59:44 +01:00
Simon Marco Janic edb1479af9 [(master)] Renamed files in wrong casing. 2017-11-06 12:57:25 +01:00
Simon Marco Janic 6040eef7ee [(master)] Renamed files in wrong casing. 2017-11-06 11:55:49 +01:00
Simon Marco Janic 09a419e354 [(master)] Renamed files in wrong casing. 2017-11-06 11:55:08 +01:00
Simon Marco Janic 5e9f88df2d [(master)] Renamed files in wrong casing. 2017-11-06 11:54:14 +01:00
James Agnew 2b4a492870 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-11-05 19:22:13 -05:00
James Agnew 932bb2ed8e Fix test 2017-11-05 19:21:23 -05:00
James bde05c8b4d Fix broken DeviceStatus enums 2017-11-05 19:20:49 -05:00
James Agnew 37c8e6c645 Add test for #751 2017-11-05 18:52:28 -05:00
James Agnew 75bfb6af1b Add support for Binary X-Security-Context header in server 2017-11-02 11:38:43 -04:00
James Agnew 256d541dda
Merge pull request #736 from malcolmm83/master
Fix for Binary.securityContext is not being encoded #734
2017-11-01 15:37:43 -04:00
Simon Marco Janic 11dc917540 [(master)] Reverted unintentional changes 2017-11-01 12:52:17 +01:00
Simon Marco Janic 53674db357 [(master)] Added support for extensions in Meta resource 2017-11-01 11:37:51 +01:00
James Agnew c5b7fea01d
Merge pull request #725 from InfiniteLoop90/issue-724-copy-domain-resource-id
Fixes #724 - Resource IDs are now copied when copying instances of subclasses of DomainResource for DSTU2 and DSTU2.1.
2017-10-31 17:41:33 -04:00
James Agnew 0fec0485e8 Merge pull request #717 from aehrc/feature/ifModifiedSince_bugfix_master
fix bugs with inverted test for If-Modified-Since (impl and tests)
2017-10-26 18:31:19 -04:00
James Agnew 0875318842 Merge pull request #711 from InfiniteLoop90/master
Added R4 to the client's server version check. Also tweaked the ClientServerValidation* tests to be a little more predictable
2017-10-26 17:56:48 -04:00
James 15ba0dff03 Clean up email subscription type 2017-10-26 06:02:12 -04:00
James Agnew 10d6f7db1b Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-10-21 13:48:04 -04:00
James Agnew 16e19a9fed Fix #720 - Failure to parse custom type 2017-10-21 13:47:03 -04:00
James b79dd75fce Update to Spring 5 2017-10-19 07:40:43 -04:00
James 73382d85ca Fix #761 - Restore codesystem package from DSTU3 and add unit tests to
verify existence
2017-10-17 15:18:36 -04:00
James a782bd7630 Fix a number of problems reported by ErrorProne 2017-10-16 10:00:27 -04:00
James Agnew 9ca85b4cf3 Re-enable errorprone on standard hapi fhir build. woohoo! 2017-10-15 11:27:30 -04:00
James Agnew 0a2525e1e0 Remove some duplicate classes 2017-10-14 15:42:55 -04:00
James 31fb1236a1 Reuse bundle ID when returning query cache results 2017-10-11 06:05:14 -04:00
James Agnew 87383ad802 Version bump to 3.1.0-SNAPSHOT 2017-09-27 21:23:34 -04:00
Malcolm McRoberts 511f4939c8 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
Changes to encoding for Binary and unit test.
2017-09-25 00:02:10 -04:00
Malcolm McRoberts a57003808d Added unit test for encoding Binary with securityContext, and fixed encoding in JasonParser 2017-09-24 23:55:27 -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 5f89f6ed16 Improve test logging 2017-09-21 06:13:30 -04:00
James Agnew fc7144ee03 Work on JPA optimization 2017-09-17 20:05:28 -04:00
James Agnew 2bb01451ea Cleanup of validator 2017-09-09 20:55:00 -07:00
James Agnew 836d4d051b Work on IG Pack uploading 2017-09-07 20:33:19 -07:00
Clayton Bodendein 8f06cf7322 Related to issue #724 - Added more unit tests 2017-09-05 14:45:32 -05:00
Clayton Bodendein 5650238421 Related to issue #724 - Also ensures that the ID is copied for HL7 DSTU2 and DSTU2.1 subclasses of BackboneElement when the #copy() method is called. Also added unit tests for these and reverted the line endings of the HL7 DSTU2 and DSTU2.1 versions of the DomainResource class back to CRLF 2017-09-04 22:58:15 -05:00
Clayton Bodendein 8fb528c1c9 Related to issue #724 - forgot a right curly brace in Javadoc comment 2017-09-04 10:48:37 -05:00
Clayton Bodendein 7b46bca1bf Also fixes #724 - Added unit tests to ensure that the IDs of instances of DomainResource subclasses get copied as expected 2017-09-04 10:46:09 -05:00
Michael Lawley a4365f9b83 fix bugs with inverted test for If-Modified-Since (impl and tests) 2017-08-24 13:54:59 +10:00
James b9494c179a Squashed commit of the following:
commit fa508e27b2
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Aug 14 20:38:12 2017 -0400

    Fix android tests

commit dea567e960
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Aug 14 20:25:28 2017 -0400

    Still trying to get tests passing

commit 6bbfec381f
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Aug 14 20:00:59 2017 -0400

    Work on getting tests passing

commit 5e0a7672b7
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Aug 14 18:12:58 2017 -0400

    Work on GraphQL integration

commit 1c88fd154d
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Aug 14 15:19:41 2017 -0400

    Upgrade subscriptions to use interceptors across the board

commit de5c01c00d
Author: James <jamesagnew@gmail.com>
Date:   Mon Aug 14 09:09:32 2017 -0400

    Work on subscription

commit 387d504098
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Aug 14 06:19:25 2017 -0400

    Work on subscriptions

commit 95a607d155
Merge: d851de7ffd b9dbd64101
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Aug 13 22:42:22 2017 -0400

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

commit d851de7ffd
Merge: 5413b276af 209752cd63
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Aug 13 22:42:00 2017 -0400

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

commit b9dbd64101
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 22:40:35 2017 -0400

    Work on subscriptions

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 5413b276af
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Aug 10 11:36:25 2017 -0400

    Work on graph QL support

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-14 21:35:56 -04:00
Clayton Bodendein 9a6f4f89a3 Added R4 to the client's server version check. Also tweaked the ClientServerValidation* tests to be a little more predictable 2017-08-13 17:33:47 -05: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 Agnew dedd3d635b Merge pull request #695 from SRiviere/#622
#622 Extension lost on ID datatype or extension of type primiti…
2017-08-13 10:03:58 -04:00
James Agnew 6efafe62f1 Merge pull request #688 from CarthageKing/bugfix-issue659
Correctly serialize baseurl/FooResource references
2017-08-12 14:51:46 -04:00
James 264be8f683 Fix test 2017-08-12 14:39:07 -04:00
James 1e659c65f2 Fix broken test 2017-08-12 06:32:46 -04:00
James Agnew 9901b802c4 Merge pull request #686 from SRiviere/Stu3_validation
Fix STU3 validation
2017-07-31 17:08:50 -04:00
James Agnew 274e218494 Fix #696: Corresctly handle negative numbers 2017-07-26 16:59:35 -04:00
James Agnew 6aa58cf887 Move tests in anticipation of HAPI 3 2017-07-26 16:59:35 -04:00
James Agnew 09e23d857f Move tests to DSTU3 module 2017-07-26 16:59:35 -04:00
Sebastien Riviere 0fd5a44b5e Fixed #622 Extension lost on ID datatype or extension of type primitive during parsing 2017-07-24 13:43:55 +02:00
Sebastien Riviere ecac0ffb5f Add junit test 2017-07-14 12:51:19 +02:00
James f7d4296046 Tweak to #683 2017-07-14 06:16:41 -04:00
James Agnew ef3f7202dc Merge pull request #683 from CarthageKing/bugfix-issue634
Correctly serialize STU3 ConceptMap and ActivityDefinition element order
2017-07-14 06:14:05 -04:00
James Agnew 1a6b3ea867 Work on #682 - Allow fewtching structure definitions by relative URL 2017-07-12 17:05:43 -04:00
James Agnew 0dacf8d82a Add test for #682 2017-07-12 15:39:33 -04:00
James Agnew 65cc41e376 Allow patch to proceed with AuthorizationInterceptor 2017-07-12 11:14:14 -04:00
michael.i.calderero 11aa1c5a9e fix for #659 2017-07-10 18:10:31 -05:00
michael.i.calderero 9aaa49dd94 add test to show issue #659 2017-07-10 14:35:06 -05:00
Sebastien Riviere a8e248036e Fix STU3 validation: find correct extension profile, use custom datatype profile, allow to disable terminology checks 2017-07-10 12:38:33 +02:00
michael.i.calderero d26fba161e remove '[x]' from paths in @ChildOrder annotation because they mess up
'forcedOrder' resolution in
BaseRuntimeElementCompositeDefinition.scanCompositeElementForChildren()
method
2017-07-03 16:06:52 -05:00
James Agnew c9fcef0372 Clean up handling of searches nested in batch and transaction 2017-06-30 16:20:32 -04:00
James Agnew 5789cd2a46 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-06-19 06:18:58 -04:00
James Agnew e6cb973f5f Add test 2017-06-17 08:29:30 -04:00
James b474a1f2ef Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-06-16 10:00:27 -04:00
James 507cac3127 Respect prefer header on transaction processing 2017-06-16 09:52:12 -04:00
James Agnew 7588a2ecff Modify patch for #655 so that it fixes #604 without causing us to allow
invalid values
2017-06-09 16:30:20 -04:00
christian ohr 872d72629c #604:allow MINUTE precision for datetimes 2017-06-09 15:21:53 -04:00
James Agnew c2e5fa3f18 Fix #667 - When using the AuthorizationInterceptor with the JPA server, when a client is updating a resource from A to B, the user now needs to have write permission for both A and B 2017-06-09 11:48:17 -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 c04146a76a Revert "Allow MINUTE precision for datetimes. Closes #604" 2017-06-07 21:42:52 -04:00
James Agnew 1b557b05f0 Merge pull request #655 from ohr/master
Allow MINUTE precision for datetimes. Closes #604
2017-06-07 21:30:33 -04:00
James Agnew 7c6bb01a8b Don't allow JPA server to save duplicate or empty tags, and fix #664 by
preventing multiple threads from loading structure definitions for
validation at the same time
2017-06-06 16:44:13 -04:00
James Agnew 6168f4ab32 FIx JDK7 dep 2017-05-26 21:35:40 -04:00
James Agnew 7d659c88e5 Validator incorrectly rejected references where only an identifier was
populated
2017-05-26 21:32:12 -04:00
christian ohr aafde2eceb #604:allow MINUTE precision for datetimes 2017-05-26 15:27:58 +02:00
James Agnew 6cf3d865f0 Fix test 2017-05-25 16:06:44 -04:00