Commit Graph

2665 Commits

Author SHA1 Message Date
Tadgh 75c0c25d7b remove references to EMPI 2020-11-18 19:50:00 -05:00
jamesagnew e8f2bca6ef Add 5.3.0 constant 2020-11-18 14:55:45 -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 63b7b379c2
Improve ValueSet filtering (#2162)
* Improve filter search

* Filter improvements

* Tests passing

* Test fixes

* Fix transaction filter

* Add changelog

* Test fix

* Update hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

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

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

* Resolve FIXME

* Test fix

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

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-11-10 11:01:13 -05:00
Frank Tao ce1caee9fa
Feature 2020 10 28 reverse chain (#2160)
* Added test cases for multiple '_has'

* Fixed composite search for the new SearchBuilder

* Added more test cases
2020-11-05 05:27:11 -05:00
jamesagnew 53c23b8d9b Add method to stringutil 2020-10-27 11:29:16 -04:00
James Agnew 72294fc0a0
Suport typeFilter parameter for bulk export (#2147)
* Cleanup

* Fix tests

* Work on bulk export

* Work on export

* Test fixes

* Add changelog

* Address review comments

* Address review comments
2020-10-26 12:28:07 -04:00
James Agnew 8000d2d0cf
SQL Join Rework (#2086)
* switched to adding annotations.  Just did a test with Token, but the sql looks clean.

* switched to adding annotations.  Just did a test with Token, but the sql looks clean.

* added the other six index links

* trying different annotations

* Start testing

* Update resources on package install

* Add changelog

* Join rework

* CLean up SQL builder

* Add docs

* SP rework

* Join work

* Work on params

* Work on refactor

* Work on chains

* Work on joins

* Rework queries

* Work on queries

* Many more tests passing

* Refs test

* Work on sorting

* Work on tests

* More joins work

* Work on tests

* Work on queries

* Tests passing

* More test fixes

* Test fixes

* Work on SQL

* Tests passing

* Add some tests

* Add some tests

* License headers

* Use entity manager to get datasourcd

* One more fix

* Model cleanup

* Ongoing work

* Fixes

* Fixes

* Work on joins

* Ongoing fixes

* Merge conflict

* Cleanup

* clean up unused fields

* Work on join

* COmpile fix

* Rework querying

* Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/HibernateDialectProvider.java

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Address review comments

* Resolve fixmes

* Test fix

* Test fixes

* Test fix

Co-authored-by: Ken Stevens <khstevens@gmail.com>
2020-10-26 05:24:26 -04:00
Ken Stevens 3b91873b7c
delete expunge (#2131)
Added delete _expunge=true
2020-10-20 17:21:50 -04:00
jamesagnew 3738297354 Test fix 2020-10-19 20:13:31 -04:00
jamesagnew a25aa37e6a Update to #1607 2020-10-16 14:52:40 -04:00
jamesagnew 7903b2b577 License headers 2020-10-13 11:43:09 -04: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
Josh Collins 844624b6dd
RDF Support in HAPI FHIR (#2118)
* RDF Support in HAPI FHIR

* Ability to read/write FHIR resources as RDF (turtle serialization)
* Test suite to test roundtrip-ability of RDF parser

* Add null checks to appease LGTM

* Correct null check logic
2020-10-12 17:16:00 -04:00
Oliver Egger 8294b8ddb6
add namespace, prefix for attributes (xml:lang) (#2112) 2020-10-11 15:25:37 -04:00
abrsystematic cad3ba5a66
Fix gettimezone performanceissue (#1607)
* [(release_3_7_SSE)] cache timezone since timezone.gettimezone is static synchronized and performs poorly

* [(fixgettimezoneperformanceissue)] fiximport
2020-10-09 11:51:50 -04:00
James Agnew 2134d40f1c
Account for timezones in lastUpdated search (#2113)
* Add test

* Fix

* Add changelog

* Test fixes

* Test fix

* Test fixes

* Resolve fixme

* Test fixes

* Remove debug logs

* Try to get CI tests passing again
2020-10-09 07:52:46 -04:00
ianmarshall 8e7b4e8437 Changes per code review. 2020-09-29 21:05:28 -04:00
IanMMarshall 26688aac65
Update hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 12:11:56 -04:00
ianmarshall 47244c54dc Merge remote-tracking branch 'origin/feature_2020_09_02_term_multi_version_support' into im_20200728_term_multi_version_support
# Conflicts:
#	hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java
#	hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
#	hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java
2020-09-25 09:10:07 -04:00
ianmarshall 6f9874468a Merge remote-tracking branch 'origin/master' into feature_2020_09_02_term_multi_version_support 2020-09-25 08:54:17 -04:00
ianmarshall ceb5ec6384 Use canonical identifiers for code systems rather than specifying version separately. 2020-09-23 16:42:29 -04:00
ianmarshall 4216cee8c6 Added and enhanced tests plus fixes arising from tests. 2020-09-22 14:44:32 -04:00
ianmarshall f9f8bf6515 Merge remote-tracking branch 'origin/master' into im_20200728_term_multi_version_support 2020-09-20 22:02:08 -04:00
ianmarshall 302bbca8fd Changes to support multi-versioning in ValueSet $expand operation. 2020-09-20 22:01:21 -04:00
Tadgh 74bba9dbcc Rename to ResourceOperationMessage 2020-09-15 18:57:55 -04:00
ianmarshall 3add1320b7 Merge remote-tracking branch 'remotes/origin/im_20200728_term_multi_version_support' into feature_2020_09_02_term_multi_version_support 2020-09-15 16:52:02 -04:00
ianmarshall 539ef63fc0 Merge branch 'im_20200728_term_multi_version_support' into feature_2020_09_02_term_multi_version_support 2020-09-15 16:24:47 -04:00
Tadgh ea64bea1b0 Refactor to use concrete class instead of parent 2020-09-15 15:27:21 -04:00
ianmarshall 7b15f85fa1 Merge remote-tracking branch 'remotes/origin/feature_20200830_term_multi_version_support' into feature_2020_09_02_term_multi_version_support 2020-09-15 12:35:31 -04:00
ianmarshall 087c9e3c3b Merge remote-tracking branch 'remotes/origin/master' into feature_2020_09_02_term_multi_version_support 2020-09-15 12:34:11 -04:00
Tadgh 28a9a53917 Rework to keep several things in subscription 2020-09-10 16:05:56 -04:00
ianmarshall d00db11586 Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-09-09 17:38:24 -04:00
Frank Tao 5410042643 Multi-version supported for ConceptMap $translate operation 2020-09-07 10:43:58 -04:00
Frank Tao 1ecec0abc9 Fixed duplicate ConceptMap URL only 2020-09-06 15:23:26 -04:00
jamesagnew 2d7c808326 Localizer refactor 2020-09-05 15:47:10 -04:00
ianmarshall 5f005120c9 Initial changes to support multi-version ValueSets 2020-09-03 22:36:15 -04:00
ianmarshall 1c55d87b10 Problem found in LOINC loader. 2020-08-30 17:11:48 -04:00
ianmarshall dc786eaff9 Refine model for storing multiple code versions. 2020-08-21 10:16:10 -04:00
ianmarshall 2126c5c556 Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-08-18 11:15:09 -04:00
James Agnew eab828f47a
Add transactionbuilder (#2041)
* Add transactionbuilder

* Add changelog

* Add creates
2020-08-17 07:47:40 -04:00
ianmarshall bd94ff96cc Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-08-16 21:38:41 -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
jamesagnew 90ebaf8549 Add one more test for #2023 2020-08-11 08:54:03 -04:00
James Agnew e61b39fc30
Force a flush of the SearchParameter cache sooner when SPs change (#2030)
* Force a flush of the SearchParameter cache sooner when SPs change

* Add changelog

* Test fixes
2020-08-09 19:30:59 -04:00
ianmarshall d39348d7bd Initial changes to support multiple versions for code system. 2020-08-09 11:49:04 -04:00
James Agnew 0de0b88aa0
Fix TestpageOverlay XSS Vulnerability (#2027)
* Resolve XSS vulnerability

* Add changelog
2020-08-09 07:06:11 -04:00
James Agnew 5d9d4070fb
Fix an issue with binary storage not updating correctly if a retry (#2014)
interceptor is present
2020-08-05 09:14:40 -04:00
jamesagnew a35c97e13d Add utility method to XmlUtil 2020-07-26 17:54:45 -04:00
christian ohr 1c27726055
#1817: fix problem with missing resource references when extensions are used (#1848)
Co-authored-by: Christian Ohr <christian.ohr@icw.de>
2020-07-21 05:36:25 -04:00
James Agnew 5db90d3e6e
Address issues when importing US Core (#1986)
* Work on US Core import

* Work on US Core

* Resolve issues with US Core import

* Test fix
2020-07-17 15:28:16 -04:00
Ken Stevens ebd6ca4b64
Empi 3 ruleset version (#1978)
* add rule version

* add rule version

* Rough in model for Golden Record.

* Test Link Rule Version

* add eid match boolean

* added new fields to EmpiLink to provide more information about how the link was created

* add logging to check an edge case

* all tests pass

* wip with failing tests

* tests pass

* FIXME

* optimize imports

* test score in provider output

* FIXME

* FIXME

* Fix jpa test app context

* fix migration string length

* review feedback param name

* review feedback javadoc

* review feedback javadoc

* bean config reorganization for cdr

* add more tests
2020-07-17 08:31:15 -04:00
jamesagnew f5222f3105 License headeer update 2020-07-17 08:27:10 -04:00
Ibrohim Kholilul Islam 5a79304893
Implement GraphQLQueryBodyParameter and GraphQLQueryBody annotation (#1896)
* implement GraphQLQueryBodyParameter and GraphQLQueryBody annotation

* GraphQLQueryBodyParameter to recognize application/graphql

* fix 500 error on method without @GraphQLQueryBody

* refactor to processGraphQlGetRequest and processGraphQlPostRequest

* add testGraphPostContentTypeJson and testGraphPostContentTypeGraphql to GraphQLR4RawTest

* fix imports
2020-07-16 09:25:26 -04:00
James Agnew 077ee02771
Fix validation for enumerated ValueSets (#1982)
* Allow code validation against enumerated VS

* Work on validation

* Work on this

* Work on tests

* Work on validation

* Work on tests

* Work on validation

* Test fixes

* Add changelog

* For a change

* Test fixes
2020-07-15 13:38:14 -04:00
James Agnew baba4cc240
Avoid version conflicts on current writes (#1971)
* Add auto retry of transactions

* Experiment in Maven build

* Transaction autoretry

* Work on transaction retries

* Work on transaction retry

* Work on transaction retry

* Fix tests

* Avoid version conflicts

* Add changelog

* Resolve LGTM issue

* FIx transaction scope error

* Test fixes

* Test fix

* Test fixes

* Test fix

* Test fixes
2020-07-13 08:51:13 -04:00
Ken Stevens e565b1c948
done (#1976) 2020-07-10 15:08:50 -04:00
Alexander Lukyanchikov df133d10f2
#1892 Add support for :of-type Token Modifier (#1893) 2020-07-06 05:50:44 -04:00
James Agnew f356c7c385
Migrate to JUnit5 (#1952)
* Work on junit

* Work on junit 5

* Work on junit 5

* Bump errorprone vcersion

* Work on tests

* Junit 5 tweaks

* Fixes

* Work on tests

* Work on junit5

* Work on tests

* Test fixes

* Work on junit5

* Test work

* Get junit5 working

* Test fix

* Work on tests

* WOrk on tests

* Work on tests

* fixes

* Compile fix

* One more tweak

* Compile fix

* Add changelog

* Fix compile error

* Compile fix
2020-07-04 18:28:16 -04:00
jamesagnew ef86d26357 License header updates 2020-07-02 12:07:02 -04:00
Ken Stevens 714bd6216e
Empi 70 phonetic indexing (#1941)
* start with failing test

* test passes with fixmes

* javadoc and config

* pre-review cleanup

* generalize encoding

* test passes, but indexing needs to be optimized

* test passes, but indexing needs to be optimized

* step 1 of optimization.  big refactor of all predicates

* step 2 of optimization: determine phonetic encoder at time of RuntimeSearchParam creation

* integrated new phonetic encoders into empi

* phonetic search implemented

* IT passes

* pre-review cleanup

* final pre-review cleanup

* final pre-review cleanup

* Fix compile error

Co-authored-by: James Agnew <jamesagnew@gmail.com>
2020-06-30 17:36:54 -04:00
jamesagnew 349c752860 License headers 2020-06-30 15:13:38 -04:00
jamesagnew 2cdef055aa Missed commit on #1951
Squashed commit of the following:

commit f820135996
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Tue Jun 30 14:29:24 2020 -0400

    Address review comments

commit 11c4f9defb
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Tue Jun 30 09:38:16 2020 -0400

    Fix LGTM warning

commit b650fdb9ea
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Tue Jun 30 09:20:52 2020 -0400

    Test fix

commit 6ebcceeb5c
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Mon Jun 29 18:49:01 2020 -0400

    Add changelog

commit 4a1d7383b0
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Mon Jun 29 18:46:52 2020 -0400

    Bundle transmission

commit 88bd4abf0c
Merge: 7cde945281 25fc747b9f
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Mon Jun 29 17:31:23 2020 -0400

    Merge branch 'master' into ja_20200617_subscription_send_bundles

commit 7cde945281
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Mon Jun 29 17:10:33 2020 -0400

    Work on seed bundles

commit ed2e62752e
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Mon Jun 29 09:39:10 2020 -0400

    Work on subscriptions

commit 52addcff59
Merge: 64a9eaa4de bf8de84801
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Sat Jun 27 18:09:23 2020 -0400

    Merge branch 'master' into ja_20200617_subscription_send_bundles

commit 64a9eaa4de
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Wed Jun 17 18:32:17 2020 -0400

    Start work

commit f74eba5397
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Wed Jun 17 18:28:18 2020 -0400

    Terser should create correct Enumeration on create
2020-06-30 14:31:40 -04:00
James Agnew fa4bbe3685
Allow search criteria as subscription delivery mechanism (#1951)
* Terser should create correct Enumeration on create

* Start work

* Work on subscriptions

* Work on seed bundles

* Bundle transmission

* Add changelog

* Test fix

* Fix LGTM warning
2020-06-30 14:29:09 -04:00
Tadgh bb7a773f41 Merge branch 'master' into spring-batch-integration 2020-06-23 16:02:41 -07:00
James Agnew f88298a1fb
Remote terminology service enhancements (#1934)
* Remote terminology service enhancements

* Add changelog
2020-06-23 11:35:26 -04:00
jamesagnew 4119cbb0c4 Terser should create correct Enumeration on create 2020-06-17 18:32:27 -04:00
Tadgh a9c704c06e Merge branch 'master' into spring-batch-integration 2020-06-10 12:24:19 -07: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
James Agnew 0d3ad622b5
Correct Validation Performance Regression (#1895)
* Validation performance regression

* Optimize validation

* More cleanup

* Add changelog

* Test fixes

* Build fixes
2020-06-10 05:26:21 -04:00
Tadgh 278a1070ae :Merge branch 'master' into spring-batch-integration 2020-06-08 17:16:11 -07:00
Tadgh 44aa688a20 Final config layout of Bulk Export Batch job 2020-06-08 15:59:08 -07:00
Diederik Muylwyk eda806babd Fix typo. 2020-06-08 13:48:44 -04:00
Ken Stevens 60e420aaa3
resolves #1838 (#1839)
* Added %today that works like %now but with date precision instead of dateTime precision.
2020-06-04 09:52:41 -04:00
James Agnew 86ef0ec0e2
Correct transaction processing in multitenant server (#1884)
* Correct transaction processing in multitenant server

* # d codethe npm registry for updates every day (weekdays)
2020-06-03 10:37:47 -04:00
jamesagnew 201c3a6187 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2020-06-02 07:47:06 -04:00
jamesagnew 760d19cf89 Prep for 5.0.2 2020-06-02 07:46:57 -04:00
ianmarshall 6ed724e01b Merge remote-tracking branch 'remotes/origin/master' into im_20200316_lastn_operation_elasticsearch 2020-05-25 17:40:53 -04:00
jamesagnew bf550f9c27 License header updates 2020-05-25 13:20:32 -04:00
ianmarshall 35b75f8ffb Merge remote-tracking branch 'remotes/origin/master' into im_20200316_lastn_operation_elasticsearch 2020-05-23 15:54:23 -04:00
James Agnew e780a8402e
Use R5 snapshot generator (#1862)
* Use R5 snapshot generator

* Snapshot generator reworking
2020-05-23 12:54:19 -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
IanMMarshall a1a3d9de38
Merge branch 'master' into im_20200520_cascade_delete 2020-05-22 16:11:38 -04:00
Tadgh d1b963321a
MVP EMPI implementation (#1857)
EMPI Initial Implementation (still plenty of known gaps)
2020-05-22 15:03:20 -04:00
IanMMarshall 44869856da
Update hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java
Co-authored-by: James Agnew <jamesagnew@gmail.com>
2020-05-22 13:50:24 -04:00
ianmarshall a60e5809b2 Changes to enable adjusting limits on delete conflict handling through configuration. 2020-05-22 10:15:04 -04:00
James Agnew 63ff0ede9c
Make diff operation work securely (#1859)
* Make diff operation work securely

* Build tweak

* FIx tests
2020-05-21 19:20:48 -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
Tue Toft Nørgård 2f48c7d7fe
Make @Interceptor @Inherited so InterceptorService.determineOrder accepts Spring proxies of @Interceptor annotated classes. (#1853)
See https://groups.google.com/forum/#!topic/hapi-fhir/7Z_FKDBTJSE
2020-05-20 10:52:56 -04:00
jamesagnew cc92bd7b07 Revert "Start working on FHIRPatch"
This reverts commit b3f6e7d521.
2020-05-17 11:56:50 -04:00
jamesagnew b3f6e7d521 Start working on FHIRPatch 2020-05-17 11:44:06 -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
ianmarshall eb1d1c2b27 Changes to better support chunking of queries and paging of results for lastn operation and to monitor performance. 2020-05-14 12:08:55 -04:00
jamesagnew 8a360ebd5b Fix version enum 2020-05-12 20:16:21 -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 0c13a65871
Bump to latest Core version (#1841)
* Start working on bumping core

* Work on tests

* Work on tests

* Bump core definitions

* Bump R5 defs

* Tweak changelog

* Test fix
2020-05-11 12:37:16 -04:00
James Agnew 6cc07b6689
Make binary storage work for bulk export (#1836)
* Make binary storage work for bulk export

* Add changelog

* Build fixes

* Test fix

* Test fix

* Test fix
2020-05-07 19:20:22 -04:00
James Agnew b67509d7ff
Transaction write performance fix (#1832)
* Performance fix for transactions

* Test fix

* Fixes

* Add docs

* Test fixes
2020-05-07 10:56:41 -04:00
James Agnew a77aa6a28e
Multitenancy Ticket 2 - #1813 (#1821)
* Work on multitenancy

* Second ticket started

* More multitenancy work

* Work on tenancy security

* Work on multitenancy

* Test fixes

* Add docs

* cs tweak

* Multitenancy fixes

* Add debug log

* Fix build

* Add headers

* Add partition selection interceptor hook

* Update hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Account for review comments

* Resolve FIXMES

* Work on tests

* Test fixes

* A bit more cleanup

* Work on multitenancy

* Update hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ClientExamples.java

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/client/examples.md

Co-authored-by: Ken Stevens <khstevens@gmail.com>

* Address review comments

* Allow disabling text modifier indexing

* Add changelog

* Docs fixes

* Address review comment

* Resolve merge conflicts

* Merge master

* Compile fix

* Test fix

Co-authored-by: Ken Stevens <khstevens@gmail.com>
2020-05-05 15:12:15 -04:00
James Agnew 35c2b7a2c1
Allow disabling text modifier indexing (#1831)
* Allow disabling text modifier indexing

* Add changelog

* Address review comment

* Resolve merge conflicts
2020-05-05 12:16:55 -04:00
Ian 41c715dc2d
Make BaseOrListParam and BaseParam visible outside of the package (#1710) 2020-05-04 05:39:10 -04:00
jamesagnew 8b49142b94 Clean up migrator tasks 2020-05-01 15:03:36 -04:00
Bert Roos c8ad3e80e6
Correction in comment (#1734)
The description for SERVER_INCOMING_REQUEST_PRE_HANDLED referred to itself rather than to SERVER_INCOMING_REQUEST_PRE_PROCESSED. Along with this corrected begin into begun.
2020-05-01 05:36:28 -04:00
jamesagnew 41056092ed License header updates 2020-04-30 18:24:07 -04:00
James Agnew 3d5a8bb3f8
Add UCUM support (#1824)
* Add UCUM support

* Add changelog

* Some cleanup

* Test fix

* Add flywayDB callback

* Add hooks to schema migrator
2020-04-30 15:22:41 -04:00
Tadgh 8f8a8a3dc2 Merge branch 'master' into date-match-bug 2020-04-29 16:17:50 -07:00
James Agnew ededcc18d2
Add Partitioning / Multitenancy (#1807)
* Work on multitenancy

* Work on multitenancy

* Work on multitenancy

* Add columns

* Work on multitenancy

* Work on muiltitenancy

* Work on multitenancy

* Work on uniques

* Work on multitenancy

* Work on multitenancy

* Work on multitenancy

* More work on multitenancy

* Work on multitenancy

* Multitenancy work

* Work on multitenancy

* Work on multitenancy

* Work on multitenancy

* Work on multitenancy

* Work on docs

* Work on multitenancy

* Work on docs

* DOcs work

* Tenancy docs

* Work on docs

* Finish docs

* Add changelog

* Rename config

* Add migration tasks

* Fix typo

* Migration fix

* One more migration fix

* A couple more migration fixes

* Docs cleanup

* Work on docs

* Bump boot version

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Work on review comments

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/partitioning.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/schema.md

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java

Co-Authored-By: Ken Stevens <khstevens@gmail.com>

* Address review comments

* Compile fx

* Test fixes

* One more bugfix

* Update operation name

* Add one more constant

* Roll back a change that was causing test failures

* Test fixes

Co-authored-by: Ken Stevens <khstevens@gmail.com>
2020-04-24 05:45:11 -04:00
James Agnew 5f88d87027
Tweak to #1801 - Normalize double leading zeros in database (#1815) 2020-04-23 09:44:08 -04:00
jamesagnew 8a2b799df0 Test fixes 2020-04-22 08:43:00 -04:00
jamesagnew 6226381595 Merge branch 'master' into ja_20200206_multitenancy 2020-04-21 20:54:56 -04:00
jamesagnew 1f37cdd8cf Address review comments 2020-04-21 20:53:10 -04:00
jamesagnew c7de85339c Work on review comments 2020-04-21 20:18:06 -04:00
Ibrohim Kholilul Islam 3225075f9e
Fix GraphQL Error (#1791)
* add debug log

* add debug log to value iteration

* fix _filter issue on /$graphql, fix dash and underscore issue on /$graphql, and give helpful error message on wrong argument.

* remove debug logging

* implement JpaStorageServicesTest
2020-04-21 15:28:28 -04:00
James Agnew c716216b34
Adjust return type for fluent delete() operation (#1805)
* Add cascading delete to client

* Add changelog

* Client delete should return MethodOutcome

* Rerturn more appropriate type for delete operations

* Refactor cascade detection to be reusable
2020-04-21 15:23:11 -04:00
jamesagnew 4abebf2247 Docs cleanup 2020-04-21 09:28:52 -04:00
jamesagnew bbab016ca6 Rename config 2020-04-20 12:38:04 -04:00
jamesagnew 95b77af570 Merge branch 'master' into ja_20200206_multitenancy 2020-04-20 11:07:10 -04:00
jamesagnew 7248b4e18e Finish docs 2020-04-20 11:02:27 -04:00
jamesagnew cd3e1c5e72 Tenancy docs 2020-04-19 10:15:51 -04:00
jamesagnew 843de42144 Add license header 2020-04-18 11:45:58 -04:00
James Agnew 42c8cd0e38
Add cascading delete to client (#1804)
* Add cascading delete to client

* Add changelog
2020-04-18 11:16:16 -04:00
David Gileadi 37dcf589de Add millis methods to DateClientParam, #1798 2020-04-18 11:15:32 -04:00
jamesagnew 48057b9d8e Merge branch 'master' into ja_20200206_multitenancy 2020-04-17 17:59:48 -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
jamesagnew 25cdbb15c2 Work on multitenancy 2020-04-16 15:33:48 -04:00
jamesagnew d822867a4a Merge branch 'master' into ja_20200206_multitenancy 2020-04-15 22:12:20 -04:00
James Agnew f95f619bdc
Correct two JPA processing bugs (#1801)
* Work on search params on contained

* Add workaround for stored decimals with leading decimal point

* Add changelog

* Cleanup

* Test fix

* Test fix

* One more test fix
2020-04-15 14:22:47 -04:00
jamesagnew c26a5553e9 Multitenancy work 2020-04-12 20:47:32 -04:00
jamesagnew e55ccf88fc Work on multitenancy 2020-04-10 20:01:59 -04:00
jamesagnew 219332e9e3 Work on multitenancy 2020-04-10 11:11:29 -04:00
jamesagnew 432b249225 Add license headers 2020-04-10 11:11:04 -04:00
jamesagnew e0fcbe1df2 Merge branch 'master' into ja_20200206_multitenancy 2020-04-09 11:52:27 -04:00
jamesagnew 879fbb0bf8 Test fixes 2020-04-09 10:34:18 -04:00
jamesagnew 2a43aa3b6c Improve error message reporting for invalid json - Fix #1793 2020-04-09 09:53:13 -04:00
jamesagnew 6baf1995c9 Work on subscription cleanup 2020-04-02 20:30:19 -04:00
Jafer Khan 0021561fb1 Raise an error on including invalid query string parameter(s) in read operations 2020-03-31 20:05:05 -04:00
James Agnew fe48313100
Add response size capturing interceptor (#1776)
* Work on capturing repsonse sizes

* Interceptor complete

* Add changelog

* Test fix
2020-03-30 11:24:10 -04:00
jamesagnew 62d867902f Work on multitenancy 2020-03-29 18:16:04 -04:00
jamesagnew ec6fe70acb Merge branch 'master' into ja_20200206_multitenancy 2020-03-27 05:50:08 -04:00
James Agnew b794618e9d
Avoid a crash encoding contained bundle (#1778)
* Avoid a crash encoding contained bundle

* Add changelog

* Apply same fix to XML

* Fix typo
2020-03-25 21:20:10 -04:00
James Agnew c6d23a8bc6
Add chain on _type parameter (#1772)
* Add chain on _type parameter

* Add changelog

* Test fix

* Address review comments

* Fix azure yaml

* Correct HTTPs in pom

* One more pom tweak

* Test fix

* Try azure again
2020-03-24 09:44:57 -04:00
August Langhout a9b6864988 remove first attempt to fix 2020-03-23 19:09:54 -04:00
August Langhout 2b23a6f2f0 Fix Xml parse issue: do not override the references with global contained resources if they have already been resolved 2020-03-23 19:09:54 -04:00
jamesagnew 0ac434ea5d Add chain on _type parameter 2020-03-23 17:53:30 -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
jamesagnew b3cf323e07 Add docs 2020-03-20 18:30:14 -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
Ken Stevens 6b019492fe
Merge pull request #1758 from jamesagnew/ks-20200312-json-annotation
moved common Json annotations out into an interface
2020-03-13 15:58:21 -04:00
James Agnew 1dc5d89013
Optmize forced ID resolution (#1754)
* Add forced ID caching

* Work on id optimization

* Test fixes

* More optimization work

* Add some docs

* Work on docs

* Test fixes

* Test fixes

* Test fixes

* Address review comments

* Compile fix
2020-03-12 17:12:50 -04:00
Ken Stevens ecf5284c87 moved common Json annotations out into an interface 2020-03-12 13:36:34 -04:00
Tadgh 828ddd5185 Update docs 2020-03-04 12:14:55 -08:00
James Agnew 4a160a2df3 Merge branch 'master' into ja_20200206_multitenancy 2020-03-03 09:25:19 -05:00
James Agnew ac9a371f18 Add test 2020-03-03 08:28:04 -05:00
James Agnew 5bc554949b
Remove deleted resources from cached search results (#1732)
* Remove deleted resources from cached search results

* Add changelog

* Add tests
2020-02-28 10:57:26 -05:00
Gary Graham b1d7072c42 Add precision checker for ordinal date returning on DateRangeParam 2020-02-26 22:22:42 -05:00
Gary Graham 165f5fd808 fix bugs in calculating ordinal date 2020-02-26 09:32:20 -05:00
Gary Graham 97c98254d0 Extract Common functionality out of CalculateHashesTask, build CalculateOrdinalDatesTask based on it 2020-02-25 16:09:08 -05:00
Gary Graham 3ec772b527 rework ResourceIndexedSearchParamDate constructor to support incoming string values 2020-02-25 14:06:36 -05:00
Gary Graham 34d5925393 Move common work to DateUtils. Rename function for clarity. 2020-02-25 09:37:57 -05:00
Gary Graham 7f5b3394e0 Hacky first-pass of adding ordinal date field to ResourceIndexedSearchParamDate and using it for search 2020-02-24 19:34:16 -05: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 ebf395bee9 Merge branch 'master' into ja_20200206_multitenancy 2020-02-09 08:40:29 -05:00
jamesagnew f7ec41ffc5 Work on multitenancy 2020-02-09 08:40: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 b2d2346228 Work on multitenancy 2020-02-07 15:18:06 -05:00
Ken Stevens 2545fc6e3d Merge remote-tracking branch 'remotes/origin/master' into ks-20200120-near-search
# Conflicts:
#	hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/4_2_0/changes.yaml
2020-01-29 17:06:02 -05:00
dionmcm 00fdc978cc narrative gen removed old code and enhanced error message
I ran into an issue trying to use the old .class style property. The validation message was useful, but I spotted some unreachable code investigating which I've removed. I also enhanced the configuration exception to indicate what was wrong with a supplied key and expected extension types.
2020-01-29 05:58:22 -05:00
Ken Stevens f2e8037c90 Merge remote-tracking branch 'remotes/origin/master' into ks-20200120-near-search 2020-01-22 15:06:52 -05:00
James Agnew 39ff698dd2
Parser performance tweaks (#1660)
* Parser improvements

* Parser tweaks

* Fix test

* Add changelog

* Bump spring mvc version

* Bump spring version

* Test fix?
2020-01-22 14:44:12 -05:00
Ken Stevens 9413e8f198 r4 works. But distance calculation still needs to be fixed. 2020-01-22 11:59:03 -05:00
James Agnew c0e929dacb
Copy identifiers to placeholder resources (#1675)
* Copy identifiers to placeholder resources

* Add tests

* Maven cleanup

* Still messing around with azure

* Adding to logging

* More azure work

* One more attempt

* More messing around with azure

* Test fix

* Another caching attempt

* More work on azure pipeline

* Fix pipeline file

* Keep working on pipeline

* More work on azure

* More azure

* More azure work

* More azure
2020-01-21 06:09:06 +09:00
jamesagnew 634458c447 License header update 2020-01-17 00:16:56 -05:00
James Agnew 0385c25aa3 Fix FHIR version defaults 2020-01-15 14:03:59 +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
Petro Mykhaylyshyn 8ed3dcc9ac [(fixjsongenerationtomaster)] Remove unused import. 2020-01-13 13:37:54 +08:00
Petro Mykhaylyshyn fdab81361c [(fixjsongenerationtomaster)] When max cardinality in profile is changed to 1 output JSON contain an array. 2020-01-13 13:37:54 +08:00
Petro Mykhaylyshyn a234b1f8a9 [(fixjsongeneration)] When max cardinality in profile is changed to 1 output JSON should still contain an array. 2020-01-13 13:37:54 +08:00
jamesagnew 3ac4172bc4 License header versions 2020-01-11 23:23:02 -05:00
Diederik Muylwyk 8615d10730 Fix typo. 2019-12-31 09:27:26 -05:00
Diederik Muylwyk 48f7ee5afb Rolling back previous unnecessary changes. 2019-12-31 09:25:56 -05:00
Diederik Muylwyk 170b607992 Added some FIXMEs. 2019-12-30 18:43:15 -05:00
Diederik Muylwyk 856993edf8 Moved changelog entry, and added clarifying comments to DateRangeParam. 2019-12-30 15:29:35 -05:00
Diederik Muylwyk 4eaeb7ef9e Implemented isDateWithinRange() and supporting methods. 2019-12-30 14:35:51 -05:00
Diederik Muylwyk d8133487b2 Initial commits. 2019-12-23 17:14:47 -05:00
James Agnew e1f2d044ed Add errorprone back into build 2019-12-15 09:42:51 -05:00
jamesagnew ba8f50f0c8 Docs updates 2019-12-14 18:19:09 -05:00
James Agnew d277d3fed5 Docs updates 2019-12-10 16:10:09 -05:00
James Agnew f58fba6f04
Some test cleanup (#1616)
* Some test cleanup

* Add test

* More test logging

* More docs cleanup

* Add test logging
2019-12-02 11:00:18 -05:00
James Agnew 86bd9a28fe
Fix to valueset expansion logic (#1613)
* Fox to valueset expansion logic

* Work on docs

* Docs tweaks

* Docs tweaks

* Fix test

* Remove unused class

* Add changelog
2019-12-01 21:21:19 -05:00
James Agnew ca620d652f
Add tests (#1606)
* Support chained HAS

* Add some tests

* Add some cleanup

* Work on intermittent tests
2019-11-24 10:11:49 +01: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 74159dcb26
Work on refactoring how PIDs work (#1580)
* Start work on refactoring how PIDs work

* Some test fixes

* Test fixes

* Test fixes

* Restore accidentally deleted line

* One more tweak

* Rework resource link extraction

* Test fix

* Split out transaction processor

* Updates

* Test fix

* Test fixes

* Test fixes

* Clean up LGTM warning

* Fix compile failure

* One more test fix

* Fix LGTM issue

* Add spot for metadata

* Add test logging

* Remove testing code

* More test logging

* Add some test logging

* Attempty to fix intermittent test failure

* Improve exception tracking

* Work on simplifying search param registry

* Fix compile

* Fix compile errors

* Fix two test bugs
2019-11-17 14:35:19 -05: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
jamesagnew 7c8342dcc1 Add some test logging 2019-11-08 05:53:59 -05:00
James Agnew ebc52e6b48 Correctly handle below expansion with missing system 2019-11-07 09:28:24 -05:00
James Agnew 0b9f921c3e Fix NPE in xml parser 2019-11-04 09:49:49 -05:00
jamesagnew 9c93d5d7f7 Test fixes 2019-11-04 07:04:26 -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
James Agnew 48930de31c Attempt to resolve #1356 2019-11-02 16:15:37 -04:00
Ken Stevens 1fd3948b12
Merge pull request #1572 from jamesagnew/ks-source-subscriptions
fixed in-memory search by _source for Dstu3
2019-10-30 16:20:14 -04:00
James Agnew e96500d54f Add a test 2019-10-30 15:51:46 -04:00
Ken Stevens 97f4de553a fix test. this is better 2019-10-30 15:24:43 -04:00
Ken Stevens 3ceb4085cb fix test (not super happy about this fix, but I think it's the right thing to do) 2019-10-30 15:21:21 -04:00
Ken Stevens 21c591eaf2 ready for review 2019-10-30 13:49:10 -04:00
James Agnew b90f285218 Merge branch 'master' into ja_20190928_rationalize_search_param_extractor 2019-10-30 08:41:14 -04:00
James Agnew 007cfaf00e
Don't error out on missing CS (#1570)
* Don't error out on mi9ssing CS

* Add tests

* Add a bit of test coverage

* One more test
2019-10-30 08:38:39 -04:00
jamesagnew 8b227a59fc Add some tests 2019-10-28 06:02:19 -04: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 d18550b96f Merge branch 'master' into ja_20190928_rationalize_search_param_extractor 2019-10-27 18:00:31 -04:00
James Agnew a82da8de1c Override enum factory interfaces 2019-10-27 17:51:57 -04:00
James Agnew 817f9ae36e Merge branch 'master' into ja_20190928_rationalize_search_param_extractor 2019-10-27 17:25:20 -04:00
James Agnew 6580c98ed7 Work on extractor 2019-10-26 16:56:12 -04:00
James Agnew 2b3c775b77 Some cleanup and fix a test 2019-10-26 12:45:57 -04:00
jamesagnew 5a300d2d8e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-10-26 10:32:16 -04:00
James Agnew 9cc945b5bd Merge branch 'osgi-server-work' of https://github.com/bdenton/hapi-fhir into bdenton-osgi-server-work 2019-10-25 17:05:09 -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
jamesagnew 935ec9ebc2 License headers 2019-10-25 05:44:51 -04:00
Ken Stevens f19100cbb3 final cleanup 2019-10-24 20:29:45 -04:00
Ken Stevens 4a2ed62357 review feedback 2019-10-24 20:25:16 -04:00
Ken Stevens 08472c1e3f ready to merge 2019-10-24 17:56:15 -04:00
Ken Stevens 5379ab8c2c implement in-memory match 2019-10-24 17:53:02 -04:00
Ken Stevens b7aa327118 pre-review cleanup 2019-10-24 16:47:43 -04:00
Ken Stevens 4fa849a3e5 pre-review cleanup 2019-10-24 16:43:47 -04:00
Ken Stevens 43f17534bb commiting with FIXMEs so James can review 2019-10-24 16:40:53 -04:00
James Agnew 74c03b5bb7 Add a test 2019-10-24 08:32:52 -04:00
James Agnew 91ec0a6922 Test fix 2019-10-24 08:32:52 -04:00
James Agnew 385a885abf Add ability for resource source to be specified by header 2019-10-24 08:32:52 -04:00
James Agnew 19247ffb46
Allow updating externalized binary (#1556)
* Add non working test

* Add a test

* FIx test

* Allow updating existing externalized binary data

* Add test

* Remove unneeded test

* Fix test
2019-10-22 18:10:03 -04:00
jelmer.terwal c337fdde14 Override breakes stuff here for Kotlin 2019-10-22 13:58:52 -04:00
jelmer.terwal 5002a087bb Some work on jamesagnew/hapi-fhir/#1297 2019-10-22 13:58:52 -04:00
James Agnew 73961072a6
Handle invalid chains on custom search params (#1553)
* Handle invalid chains on custom search params

* Add some more tests

* One more test fix
2019-10-21 21:21:33 -04:00
James Agnew 0af79b84d9
Use webjars instead of including JS deps (#1551)
* Use webjars instead of including JS deps

* Add changelog
2019-10-21 07:22:55 -04:00
James Agnew bfbc73caaf
Auto externalize binary contents (#1550)
* Auto externaliZe binary attachments

* Work on externalization

* Auto externalize binary content

* Work on tests

* Fix alert
2019-10-19 09:01:00 -04:00
James Agnew b51a93a2b5 Intermittent test fix 2019-10-18 15:46:02 -04:00
James Agnew a71d969ba1 Add line numbers to validation failures 2019-10-18 14:10:47 -04:00
James Agnew 9fff043892 Fix #1481 - Remove Jetty reference 2019-10-17 11:41:57 -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 9c23959b38 Licene header updates 2019-10-15 15:08:13 -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
bdenton f81aaa7f00 refactor "split" packages; create osgi bundle for server framework 2019-10-12 14:08:41 -07: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
jamesagnew 150c865f68 License header updates 2019-10-03 21:20:08 -04:00
James Agnew 069db501ee
Fix _has parameter (#1525)
* Fix _has parameter

* Bug fixes

* Add a comment

* Test fixes
2019-10-03 21:19:31 -04:00
Ken Stevens 53f47fbb1e Merge remote-tracking branch 'remotes/origin/master' into ks-narrow-search-pointcut 2019-10-03 12:20:20 -04:00
Ken Stevens d1deedf247 pre-review cleanup 2019-10-03 12:14:11 -04:00
Ken Stevens 566443d0fe move BundleUtil back 2019-10-03 12:05:26 -04:00
Ken Stevens 98c76a4d49 Test passes 2019-10-03 12:03:38 -04:00
Ken Stevens 29e7cdc476 Added ability to modify URLs in BundleUtil 2019-10-03 09:46:32 -04:00
James Agnew db668d96b9 Add a few tests and remove some dead code 2019-10-03 09:00:14 -04:00
James Agnew 2193a30b45
CodeSystem Delta Uploader (#1520)
* Terminology Delta Uploading

* Add delta operations

* Fix up tests

* Improve test coverage a bit

* Improve test coverage reporting

* fix yaml

* A couple of test enhancements

* FIx intermittent test failure
2019-10-03 07:19:00 -04:00
James Agnew a1bf50685d Work on cleanup 2019-09-30 21:40:41 -04: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 c8ce07c40e Deprecate redundant IVersionSpecificBundleProvider method 2019-09-30 09:45:31 -04:00
James Agnew 557a8ccc66
Add top level support for ElasticSearch (#1514)
* ElasticSearch work

* Add ElasticSearch properties builder

* Clean up POM

* Remove redundant project

* Try to troubleshoot embedded elasticsearch

* Another test attempt

* Add credentials to elasticsearch config

* Work on lastn

* Address review comments

* A couple of test fixes
2019-09-30 09:30:39 -04:00
James Agnew 3870c14a6c Remove unused contructors 2019-09-26 16:42:39 -04:00
James Agnew cc0df9850c Make sure the validator can get at codes defined in notpresent
codesystems
2019-09-26 14:44:09 -04:00
James Agnew 8657afb01e
Fix intermittent test failures regarding search (#1509)
* Add some logging

* Add more test logging

* Work on some test logging

* Fix compile error

* Work on codecov

* Work on codecov

* Remove test debug messages
2019-09-25 20:15:21 -04:00
jamesagnew 473fa3456e Work on adding codecov 2019-09-25 14:12:42 -04:00
James Agnew dfe07e7a2b Avoid concurrency issue introduced by #1489 2019-09-25 13:45:02 -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
jamesagnew 936587df6e Work on migrating docs 2019-09-22 15:52:49 -04:00
James Agnew 0a5eca0821 Work on docs 2019-09-22 13:25:50 -04:00
James Agnew a989a746b0 Fix #1494 - Upgrade to new :recurse syntax for R4 include/revinclude
statements
2019-09-20 09:38:29 -04:00
David Maplesden c2c07c95fc We can't short circuit traversal after all. 2019-09-19 20:38:30 -04:00
David Maplesden c8c8ab6881 Add modifier extensions to tha actual modifier extensions collection 2019-09-19 20:38:30 -04:00
David Maplesden 946f3a1732 Cut short traversal when finding top-level base references 2019-09-19 20:38:30 -04:00
David Maplesden 4021fccf3b We only need to extract the existing contained resources once 2019-09-19 20:38:30 -04:00
David Maplesden 1f253856cf Optimise for encoding String primitive data types
We typically have many more string primitives than anything else
2019-09-19 20:38:30 -04:00
David Maplesden 8b84b8ffea Cache the composite children that need encoding to improve performance 2019-09-19 20:38:30 -04:00
David Maplesden 5120fe795e Dramatically improve the performance of containResourcesForEncoding
We do this by avoiding the double processing of contained resources when
looking for resources to contain
2019-09-19 20:38:30 -04:00
jamesagnew 6475146bc9 Add license headers 2019-09-19 18:08:21 -04:00
James Agnew eddb98084d Move PreferReturnEnum back to original location to avoid regressions 2019-09-19 15:48:58 -04:00
James Agnew 2be63a1650 Test fixes 2019-09-19 09:45:07 -04:00
James Agnew 30dfde645b Upgrade to Fontawesdome 5 and prevent uploading resources with binary
storage extensions
2019-09-19 05:28:05 -04:00
James Agnew 6b21e8cd90 Add some testing to the bulk export service 2019-09-18 14:43:00 -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 08835c1615 FIx a failure in FhirTerser when visiting custom types 2019-09-13 09:11:47 -04:00
Ken Stevens abef4455eb done 2019-09-09 17:22:07 -04:00
Ken Stevens 7cfbf710fe Merge remote-tracking branch 'remotes/origin/master' into ks-in-memory-date-compare
# Conflicts:
#	src/changes/changes.xml
2019-09-09 14:46:25 -04:00
Ken Stevens 9e83f1d40a changelog 2019-09-09 14:22:42 -04:00
James Agnew 722c7a8211 Work on GraphQL updates 2019-09-06 14:56:17 -04:00
jamesagnew 1ef70a0fca Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-09-03 07:02:09 -04:00
jamesagnew 8b09b3f3eb Rename config enum for consistency 2019-09-03 07:01:36 -04:00
Diederik Muylwyk 9f7cf3923b
Merge pull request #1458 from jamesagnew/1457-valueset-pre-expansion-need-to-account-for-existing-valuesets-and-user-assigned-ids
Resolve "ValueSet pre-expansion - need to account for existing ValueSets and user-assigned IDs."
2019-08-30 10:48:39 -04:00
Diederik Muylwyk 8ef9c61b83 Address review comments; improve logging. 2019-08-30 10:47:21 -04:00
Diederik Muylwyk e03d6a5d47 Fixed handling of pre-expansion in light of pre-existing, non-pre-expanded ValueSets. 2019-08-29 18:09:30 -04:00
James Agnew c5a88444b6 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-08-29 14:00:37 -04:00
James Agnew 956bb39327 Resolve an inefficient regex expression 2019-08-29 13:59:31 -04:00
Diederik Muylwyk b41926307c Completed work on large ValueSet expansion support; ready for review. 2019-08-23 17:40:45 -04:00
Diederik Muylwyk 890555a77d Incremental work on large ValueSet expansion support; transaction boundaries need to be broken up. 2019-08-23 11:46:32 -04:00
Diederik Muylwyk 97a235ddfc Merging master into working branch.
# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/DaoConfig.java
2019-08-22 14:02:56 -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
James Agnew ce44115152
Handle cascading deletes correctly with circular references (#1435)
* Handle cascading deletes correctly with circular references

* A bit of cleanup

* Address review comments

* FIx some javadocs

* Fix an incorrect message
2019-08-20 10:08:34 -04:00
Diederik Muylwyk 8590e0ca4d Merging master into working branch.
# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/DaoConfig.java
2019-08-19 02:28:30 -04:00
Diederik Muylwyk dfd098c374 Incremental work on large ValueSet expansion support; added use of terminology tables when expanding. 2019-08-19 02:26:12 -04:00
James Agnew 57c6064d89 Another test fix 2019-08-17 12:21:08 -04:00
James Agnew 74c83f6148 Test fixes 2019-08-17 12:01:04 -04:00
James Agnew 1e07fcd2b3
Fix an unintended regression in #1357 (#1429)
* Start working on a tweak to #1357 - Not yet complete

* Tweaks to avoid an unintended regression from #1357
2019-08-15 08:35:50 -04:00
Ken Stevens f29c37a654 added IBaseReference constructor to TokenParam 2019-08-14 15:33:50 -04:00
jamesagnew 2d35db877e Add version constant 2019-08-14 15:03:05 -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 b127867ef7 Fix responsehighlighterinterceptor to work with graphql 2019-08-13 18:00:30 -04:00
James Agnew 01a6aa8f5b Test fix 2019-08-13 14:54:35 -04:00
James Agnew b4fece0ae9 Add interceptor hook for graphql calls 2019-08-13 14:46:50 -04:00
James Agnew ef7182228f One more fix for #1399 2019-08-12 18:07:09 -04:00
James Agnew c04f1d15d8 Fix #1399 - Issue with DiagnosticReport R4 narrative generation template 2019-08-12 17:17:45 -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 bfaf617142 Add some more chars to the sanitizer function 2019-08-12 08:16:38 -04:00
James Agnew 4f5a2b3c0c Add fhirType() to IBase to bring it in line with what the core structures do 2019-08-09 09:44:20 -04:00
jamesagnew 4e1bbe681a Bump supported PGSQL driver 2019-08-08 15:12:29 -04:00
James Agnew dd0cb10dbb
validate operation ignores parameter profile (#1417)
* This should be working now - need to check tests

* Add a changelog and some docs

* One more test fix

* Tests should be passing

* Fix compile

* Test fixes

* Ignore outdated DSTU2 validation test
2019-08-07 15:31:59 -04:00
Ken Stevens 1b17097f62 a couple more int -> long 2019-08-07 13:35:27 -04:00
James Agnew 6aa7916ba7
Merge pull request #1415 from jamesagnew/ks-inmemory-id-match
in-memory id match
2019-08-07 08:31:38 -04:00
James Agnew b0eb19cf2f A few fixes resulting from the R5 merge 2019-08-06 17:55:51 -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
Ken Stevens c11d719957 Fix bug when in-memory matcher compares long id to string id 2019-08-06 15:17:09 -04:00
Ken Stevens 48c8497086 Changed migration test from derby to h2
Added a new test from 340 to latest version.
2019-08-02 16:00:43 -04:00
jamesagnew 46c8c61932 Restore build - May need to roll back the RDF changes 2019-08-01 10:14:56 -04:00
James Agnew 0f4738c1b5
Merge branch 'master' into rdf_parser 2019-08-01 09:25:40 -04:00
Ken Stevens f1d3fc2307 Changed Stopwatch getThroughput param from int to long
Added FhirVersion accessor to AnyListResource
2019-08-01 06:32:09 -04:00
James Agnew 04ce9cfc1a Add support for uploading custom terminology using the
$upload-external-code-system operation
2019-07-30 17:30:18 -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
jamesagnew 8158292665 Allow operations to better work across multiple versions of FHIR 2019-07-26 05:46:37 -04:00
Ken Stevens 84f5c7d467 Merge remote-tracking branch 'remotes/origin/master' into expunge-resource-hook 2019-07-24 21:54:05 -04:00
Ken Stevens e05387da02 Recover from failed merge again. This time with feeling! 2019-07-24 13:46:20 -04:00
James Agnew ddb8e385bf Test fix 2019-07-24 13:24:48 -04:00
James Agnew e8cf2738f0 Handle oversized payload request 2019-07-24 13:18:30 -04:00
Ken Stevens 64e83fa3df Revert "Recovering Pointcut from a failed merge"
This reverts commit 19c0b4fd
2019-07-24 13:00:49 -04:00
Ken Stevens 19c0b4fdd2 Recovering Pointcut from a failed merge 2019-07-24 11:30:36 -04:00
Ken Stevens 0efe69f891 Merge remote-tracking branch 'remotes/origin/master' into expunge-resource-hook
# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceExpungeService.java
2019-07-24 10:41:37 -04:00
Ken Stevens 8d86e34bcf Merge remote-tracking branch 'remotes/origin/master' into expunge-resource-hook
# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceExpungeService.java
2019-07-23 09:12:08 -04:00
jamesagnew 60ea922e8d Add license headers 2019-07-23 05:38:10 -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
Ken Stevens 7ba3ceec90 Merge remote-tracking branch 'remotes/origin/master' into expunge-resource-hook 2019-07-19 10:54:56 -04:00
jamesagnew 13dae527d1 Fix #1390 - DiagnosticReport template correction 2019-07-19 05:44:08 -04:00
Ken Stevens e634aa6d10 Merge remote-tracking branch 'remotes/origin/master' into expunge-resource-hook 2019-07-18 22:06:10 -04:00
James Agnew 5bf4fa22e7 Allow patching in tranactions 2019-07-18 16:41:07 -04:00
Ken Stevens 72aa4932d6 Merge remote-tracking branch 'remotes/origin/master' into expunge-resource-hook 2019-07-18 10:12:15 -04:00
jamesagnew 7488047686 Add license headers 2019-07-17 18:53:23 -04:00
James Agnew 55c0d5b604
Add binary storage for Attachments (#1386)
* Have this working now

* Add utility method

* Build fixes

* Add changelog
2019-07-17 18:31:17 -04:00
Ken Stevens fe21dba4a6 Added Pointcut.STORAGE_PRESTORAGE_EXPUNGE_RESOURCE.
Also added a couple of tests.
2019-07-17 13:26:50 -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 ba4bb005bc
Switch JPA unit tests to use H2 (#1381)
* Start working on this

* Ongoing fixes to H2 branch

* Work on fixing tests

* Updated fixes

* Some test fixes

* More work on H2 migration

* Fixes to try and get the H2 migration building

* Test seem to be passing!

* Tweaks to locale randomization

* Add changelog
2019-07-13 17:22:43 -04:00
Ken Stevens 26ab115ff5 changes.xml 2019-07-12 13:34:32 -04:00
Ken Stevens 8d817b364c Merge remote-tracking branch 'remotes/origin/master' into expunge-hooks
# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeEverythingService.java
2019-07-12 13:27:11 -04:00
James Agnew a352137938 Test fixes 2019-07-11 21:10:30 -04:00
James Agnew 1db019b6df Test fix and try to get Travis building again 2019-07-11 20:20:27 -04:00
James Agnew dca55d054b Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-07-11 18:17:09 -04:00
Diederik Muylwyk 0729e38e6e
Resolve "experimental implementation for storing expanded ValueSets in terminology tables" (#1369)
* Added experimental implementation for storing expanded ValueSets in terminology tables.

* Minor tweak to log message for consistency.

* Another minor tweak to log message for consistency.

* Renamed test.

* Addressing review comments.

* Added migration tasks.
2019-07-11 16:52:19 -04:00
James Agnew 32a8e1aead Omit extensions when encoding in summary mode (except for
CapabilityStatement)
2019-07-11 16:28:50 -04:00
Ken Stevens b445df3e05 Merge remote-tracking branch 'remotes/origin/master' into expunge-hooks 2019-07-10 10:09:55 -04:00
Ken Stevens 7aaa75c255 fixed pointcut 2019-07-10 10:09:43 -04:00
James Agnew 0fb8db11a2 Add new pointcut: PROCESSING_COMPLETED 2019-07-09 14:32:11 -04:00
Ken Stevens 5e05703c1a Add expunge-everything hook. Also add RequestDetails to all expunge operations 2019-07-09 10:58:57 -04:00
James Agnew cc20893018 Add hardcoded keys to localizer 2019-07-08 08:58:06 -04:00
jamesagnew dff2fdd3cf GET RID OF TRAILING LICENSE HEADER SPACES ONCE AND FOR ALL
YESSSSSSSSSSSSS
2019-07-05 11:19:51 -04:00
jamesagnew aff88d3ebb License header updates 2019-07-05 07:27:18 -04:00
James Agnew f1848fb1ad Include version ID in response for deleted resource 2019-07-03 14:44:12 -04:00
James Agnew 56aaef641c Add request ID 2019-07-02 21:32:28 -04:00
James Agnew 1faf7785c4 Dont filter constraints from the event broadcast - this was not needed
after all
2019-07-02 09:21:15 -04:00
jamesagnew 742389642d Add tests for delete conflicts and authorizationinterceptor 2019-07-01 10:49:38 -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
jamesagnew 5910131319 License header updates 2019-06-27 18:23:45 -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 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 989e26fdb4 Fix #1355 - Failed to call access method: java.lang.NullPointerException in case of bundle entry without resource 2019-06-22 15:51:56 -04:00
James Agnew 36ff58a320 Add docs 2019-06-17 17:46:28 -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
admin 3b35e6add4 Test Classes 2019-06-14 05:24:11 -05:00
Ken Stevens 2bf680509b
DeleteConflict hook, SearchableHashMapResourceProvider, and in-memory searching (#1341)
* Make IBundle list interface more flexible

* Make matchResourceLinks visible

* Make matchResourceLinks visible

* Pull in-memory matching functionality out of subscription module into dedicated classes in searchparam module

* Added more accessors to version independent resource classes

* improved forcedid matching (needs to be verified by James)
filter out nulls from HashMapProvider.searchAll() (hopefully no tests depend on this)

* add AnyComposition

* cleanup of Any classes

* create searchparam config so people can use that module without using subscriptions

* create searchparam config so people can use that module without using subscriptions

* fix broken test

* added derivedFrom

* renamed daoRegistry.getResourceDaoIfExists to getResourceDaoOrNull
also added method to add a new dao to the registry and retrieve registered types

* TokenParam.equals

* add error check to searchable hashmap resource provider

* added support for R4

* add successor to measure

* delete conflict hook
start with failing test

* test passes.
hook is called.

* added delete conflict hook
all delete conflict tests pass

* added javadoc

* Performance test

* test bad interceptor case

* typo

* rename criteria matcher

* added support for multiple topics

* fix method name

* add effective period

* Temporarily excluding StressTest from build to try to get Travis under time limit

* change log

* review feedback

* review feedback

* review feedback
2019-06-13 13:59:51 -04:00
admin e58224e63b Adding multiformat 2019-06-06 12:22:32 -05:00
James Agnew f2be9f47a0 Add 4.0.0 version enum 2019-05-30 20:59:23 -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 7863393c2c
Merge pull request #1303 from jasmdk/BaseParserFix
Removing not needed "super." when calling preProcessValues()
2019-05-29 21:46:33 -04:00
James Agnew c7a224c99d
Merge branch 'master' into upgrade-25-to-33 2019-05-29 21:33:02 -04:00
Christian Ohr cd8b2feb2f Allow to set additional Http headers directly on the IClientExecutable 2019-05-29 21:17:52 -04:00
admin 69089b81b3 Typo in pom.xml 2019-05-28 10:40:21 -05:00
admin fc27325dbc RDF XML Parser 2019-05-28 10:37:01 -05:00
admin a15c90be6d RDF Parser 0.1 2019-05-24 05:00:29 -05:00
James Agnew b4eecdef38 Test fix 2019-05-22 17:27:49 -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 9353ea5b06 Enable websockets on public HAPI server 2019-05-04 10:06:10 -04:00
jamesagnew 150a84d52f CLeanup 2019-04-29 21:54:34 -04:00
James Agnew 828df1528f Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-04-26 11:24:00 -04:00
James Agnew 685adf7754 Revert Jetty upgrade, and improve patch error messages 2019-04-26 11:23:22 -04:00
patrick-werner 7f45660a15 changed toListOfResources to send IBaseResource as Type instead of null 2019-04-26 12:55:18 +02:00
patrick-werner a5e7ea16ae added all fetchValueSet Implementations 2019-04-26 10:47:58 +02:00
Jacob Stampe Mikkelsen 1e640718c0 Merge branch 'master' of https://github.com/jasmdk/hapi-fhir into BaseParserFix 2019-04-26 08:33:40 +02:00
jamesagnew abd53c0cbe License header updates 2019-04-24 21:20:11 -04:00
James Agnew 738c2c1797
Interceptor framework refactoring (#1287)
Interceptor framework overhaul
2019-04-24 14:32:30 -04:00
jamesagnew a9cfce3615 Header updates 2019-04-15 12:31:11 -04:00
James Agnew cff79e6aef PortUtil fixes from my working branch to avoid test failures 2019-04-15 10:34:27 -04:00
James Agnew c8f2e4bbc9 Return HTTP 400 for missing body on POST and PUT 2019-04-14 12:32:09 -04:00
ahn 3f15100a45 Removing irrelevant super call to preProcessValues 2019-04-10 12:03:32 +02:00
jamesagnew 8b5143f436 License header updates 2019-04-02 10:44:41 -04:00
jamesagnew 835b89f449 Build fixes 2019-04-01 18:55:55 -04:00
James Agnew 81de6cca32 Add a bit of documentation 2019-04-01 10:28:26 -04:00
James Agnew 3eeca4a8fd Merge branch 'master' into ja_interceptor_jpa_queries 2019-04-01 09:59:03 -04:00
James Agnew 3c18275b3d Make port delays configurable 2019-03-29 17:19:22 -04:00
jamesagnew 8791ed5793 Test tweaks 2019-03-29 17:13:41 -04: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 3e98c3a87d Fix a param issue 2019-03-22 01:18:16 +01:00
James Agnew c701de2861 Create a performance interceptor framework for HAPI FHIR 2019-03-22 01:06:03 +01:00
James Agnew d1667487c2 Clean up unique composite search params 2019-03-21 21:57:38 +01:00
James Agnew 715b451d94 Add some javadocs to PortUtil 2019-03-18 15:27:04 +01:00
James Agnew c81c5c2497 One more tweak to the port test 2019-03-17 17:54:48 -04:00
James Agnew 50a8d2fbc8 More updates to port tests 2019-03-17 17:51:54 -04:00
jamesagnew 8818a2479c Try to prevent build failure 2019-03-17 16:14:19 -04:00
jamesagnew 7cbd7a0d50 License header update 2019-03-17 14:22:29 -04:00
jamesagnew 3e57fdb491 Improvements to PortUtil to avoid reusing ports 2019-03-17 14:09:21 -04:00
jamesagnew c482d22cff Improvements to PortUtil 2019-03-17 13:23:48 -04:00
James Agnew e15afbc4f0 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-03-14 13:32:03 -04:00
James Agnew a8c76450e5 Re-enable contains searches on the public HAPI FHIR server and improve
message formatting in HapiLocalizer
2019-03-14 13:19:26 -04:00
jamesagnew 7b1950aeed License headers 2019-03-12 17:45:51 -04: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 71a07c0239 Refactor the way that contexts are used in narrative generator 2019-03-11 16:05:25 -04:00
James Agnew f934f76c96
Several JPA search fixes (#1231)
* Search fixes

* Add some tests

* CHangelog

* Some cleanup of the query tracker

* FIx XML issue in changelog

* Test fixes

* SOme test fixes

* Address review comments

* Fix test breakage
2019-03-11 15:49:34 -04:00
Ken Stevens dcfacfea49
Has param no in (#1232) 2019-03-10 20:50:24 -04:00
jamesagnew 64facdab0a Disabling test logging 2019-03-06 16:14:32 -05:00
James Agnew 9bc0f6784d
Search paging timeout with 1500 < n < 2000 results (#1221)
* Avoid paging links when offset is artificially set very high

* Ongoing fixes

* Adding logging and clean up transaction processing

* Add changelog

* More work on queries

* Keep working on getting tests passing

* More test fixes

* More work on tests

* More test works

* One more test attempt

* Ongoing fixes

* One more change

* FIxes to search algorithm

* Add changelog

* Clean up for review

* Fixed NPE in token matcher when system is not null and value is null

* test opposite (null system not null value)

* added null protection to all matchers

* Address review comments

* Address broken test

* Trying to resolve DB ordering issues
2019-03-06 05:45:05 -05:00
James Agnew 4138832071 Add a test 2019-03-01 14:03:14 -05:00
James Agnew 3972e17e62 Add "is trusted" property to server exceptions 2019-03-01 13:58:13 -05:00
jamesagnew 6e41f90bf9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-02-27 16:49:20 -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
jamesagnew aef5989477 Header updates 2019-02-25 20:47:30 -05:00
James Agnew 87ed00a002 Add ability to generate named parametrrs in a version independent way 2019-02-15 16:27:16 -05:00
James Agnew 485335e975 Allow terminology service to work without having Lucene enabled for
simple ValueSet expansions
2019-02-14 20:47:28 -05:00
James Agnew 10c348d44f Tweak to elements parametr support 2019-02-14 19:30:10 -05:00
James Agnew 00636276d3 Add missing version constant 2019-02-07 17:02:42 -05:00
James Agnew 810f1ad969 Improvements to elements parameter as well as adding attributes to
RequestDetails
2019-02-07 16:45:59 -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
jamesagnew c7d857df98 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-02-04 16:34:55 -05:00
jamesagnew d4af1ee2a3 Add tests and license headers 2019-02-04 16:34:39 -05:00
James Agnew edb79b8c6a Updates to parser dont encode elements functionality 2019-02-04 16:34:05 -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
jamesagnew 5f29e4fbf3 Fix #1174 - Prevent serialization exception 2019-01-30 05:49:45 -05:00
Ken Stevens 10c59fceeb
Subscription strategy tag (#1178)
tests pass
2019-01-25 13:01:04 -05:00
jamesagnew cd1e0e881c Add headers 2019-01-19 18:31:17 -05:00
jamesagnew b0cbd52ae9 Interceptor cleanup 2019-01-19 18:01:00 -05:00
James Agnew 3e84173180 Merge branch 'master' into ja-subscription-interceptors 2019-01-18 17:52:23 -05:00
James Agnew 5ce9d444e9 Work on interceptors 2019-01-18 09:04:45 -05:00
James Agnew 4367e340ae Log the version number and commit on startup 2019-01-17 16:05:54 -05: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 ee52d6fb31 Add SearchNarrowingInterceptor 2019-01-09 20:20:46 -06:00
James Agnew 8beccab9ab Merge branch 'master' into test-openjdk-11 2019-01-09 10:48:57 -05:00
jpoth 1bd63f4454 Add JKD11 support for Karaf 2019-01-09 11:18:42 +01:00
jamesagnew 3d94761bcb Improve response for transactions 2019-01-06 18:08:32 -05:00
jamesagnew 98d93df12a License header updates 2019-01-04 16:22:15 -05:00
James Agnew a1275874f8 Correct subscription delivery metadata 2019-01-04 10:56:21 -05:00
James Agnew 1bfa29bbcc Site updates 2018-12-28 11:42:21 -05:00
jamesagnew 4599a10180 Merge branch 'master' into test-openjdk-11 2018-12-23 14:19:59 -05:00
James Agnew a0cb7edd08 Version bump a few dependencies 2018-12-22 20:13:03 -05:00
James Agnew 11b8304cb4 Fix case sensitivity issue 2018-12-13 08:31:35 -05:00
Graham, Gary a01d6cf302 Add init330() to migrate from 2.5 -> 3.3 2018-12-12 21:00:41 -05:00
James Agnew b442982310 Add media interceptor 2018-12-08 18:49:58 -05:00
jamesagnew 3109a269b3 Attempting to get ErrorProne working on JDK11 2018-12-08 18:22:17 -05:00
jamesagnew 3a3b81a6a8 Preparing things for OpenJDK 11 2018-12-08 17:52:48 -05:00
James Agnew c484c69664 Better error message for unqualified search parameter types 2018-12-03 13:14:10 -05:00
Ken Stevens 6baee4dc3f
Standalone subscription (#1125) 2018-11-30 17:19:16 -05:00
Ken Stevens 03ebcafdf5
In-memory matcher (#1116)
* Initial refactoring to move database matcher out into its own class

* MAJOR REFACTOR: Pulled indexing code out of BaseHapiFhirDao into a new class ResourceIndexedSearchParams

* Moved calculateHashes

* Replaced @Bean definitions in BaseConfig.java with @ComponentScan

Annotated bean classes with either @Service (if it's stateless) or @Component (if it's stateful).  It doesn't really matter which annotation is used, but it's helpful to see at a glance whether a bean is stateful or stateless.

* Move services out of BaseHapiFhirDao

Moved services required by ResourceIndexedSearchParams out of BaseHapiFhirDao and into new classes called LogicalReferenceHelper, IdHelperService, MatchUrlService, and DaoProvider.

Converted SearchBuilder into Prototype Bean

Mark Spring components that depend on daos and entitymanagers with @Lazy so they aren't picked up by hapi-fhir-spring-boot-autoconfigure.

* Added SubscriptionMatcherInMemory

Moved static data out of BaseHapiFhirDao into ResourceMetaParams

Moved translateMatchUrl methods out of BaseHapiFhirDao into MatchUrlService bean

Simplified SubscriptionMatcherInMemory to not depend on entity or dao

Turned all subscribers into prototype beans

* Moved searchParam method out to mySearchParamProvider

Also removed dao and contest parameters from of myMatchUrlService methods

Moved code out of SearchBuilder into SearchParameterMap.clean() so it can be used by inMemoryMatcher

Introduced a new composite subscription matcher that tries to match in memory and if it finds a parameter in the criteria it doesn't support, it falls back to the database matcher.

* Added support for references

Also fixed a small bug in SearchParameterMap that was missing the ";" after "_has" when creating a normalized query from search params.

* Finished implementing all tests from FhirResourceDaoR4SearchNoFtTest

* Make in-memory matcher configurable, disabled by default

* Validate Subscription criteria when they're submitted

Send HTTP 422 UnprocessableEntityException if the criteria fail validation.

* fixed Sonar "Blocker" issues.

*  Don't reload the resource before sending it out

Since we can always force a reload using restHookDetails.isDeliverLatestVersion

* Added tests to cover Custom Search param.

* Split ResourceIndexedSearchParam into separate state and service classes

* Cleaned up SearchBuilder.

Removed uses of myCallingDao as an injection mechanism.
Left // FIXME KHS cookie crumbs to clean up

* Reduced dependencies on BaseHapiFhirDao

Removed methods from IDao interface that were used for injection

* Updated change log
2018-11-19 16:19:52 -05:00
jamesagnew bf8f26bc5f Work on bugfixes 2018-11-19 05:49:05 -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 6a6451f694 Reduce number of queries on some DB operations 2018-11-16 12:41:50 +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 023877e09f
Merge pull request #1047 from hdconradi/null-pointer-in-date-range-param
Fix NullPointerExceptions in DateRangeRaram
2018-11-11 17:02:27 -05:00
jamesagnew 3942f1bb29 License header updates 2018-11-09 14:41:57 -05:00
James Agnew f61df5c3fe Use FHIRPath expression parser for custom SP validation 2018-11-09 14:41:20 -05:00
James Agnew b32e232eb2 A bit of client tweaking 2018-11-08 17:10:39 -05:00