Commit Graph

687 Commits

Author SHA1 Message Date
James Agnew ca2088f3ad
Add framework for Bulk Import (#2538)
* Start work on bul;k import

* Work on bulk import

* Have batch working

* Working

* Working

* More work

* More work on bulk export

* Address fixmes

* License header updates

* Test fixes

* License header updates

* Test fix

* Test fix

* Version bumps

* Work on config

* Test cleanup

* One more version bump

* Version bump

* CLeanup

* A few additions

* Test fixes

* Test fix

* Test fix

* Migration fix

* Test fix

* Test fix
2021-04-14 17:41:32 -04:00
James Agnew edfe1ae8e6
Add lastupdated to capabilitystatement (#2530)
* Add lastupdated to capabilitystatement

* Test fix

* Test fix
2021-04-08 13:23:21 -04:00
James Agnew a6cbf7eebd
Add support for hierarchycal valueset expansion (#2525)
* Add support for hierarchycal valueset expansion

* Add changelog

* Add tests

* Cleanup

* Test fix

* Test fixes
2021-04-06 17:36:54 -04:00
James Agnew fcffb04c7b
Allow unknown code systems during validation (#2523)
* Allow unknown code systems during validation

* Add changelog

* Test fix
2021-04-05 20:59:59 -04:00
James Agnew b617c7690d
Search Parameter Infrastructure Cleanup (#2522)
* Search param service cleanup

* Work on collapsing search param

* Search param cleanup

* Work on build

* Test fix

* Test fixes

* Ongoing work

* Test fix

* Compile fix

* Test fixes

* Test fix

* Test fix

* License header updates

* Remove fixme

* Cleanup

* Cleanup
2021-04-05 17:40:10 -04:00
James Agnew 0bf746f23b
Add support for revincludes to CapabilityStatement generator (#2521)
* Add support for revincludes to CapabilotyStatement generator

* Add changelog

* Fixes

* Test fix

* Test fixes

* Test fix

* Test fix

* More fixes to CS cache

* Test fix

* Test fix

* Test fix
2021-04-05 08:29:04 -04:00
James Agnew 049097e5b4
Improve CapabilityStatement Generation (#2511)
* Start work

* Work on testing

* Version bump

* Test fix

* Compile fix

* Test Fixes

* Test fix

* Test fix

* Compile fix

* Tst fix

* Test fix

* Test fix

* Test fix
2021-03-30 05:48:03 -04:00
Diederik Muylwyk b720c32c1d Version bump 2021-03-29 18:23:16 -04:00
James Agnew dc41d5ad61
Add terminology mapping and display population interceptors (#2488)
* Start work on code mapping interceptors

* Work on generation

* Add terminology mapping and display population interceptors

* Add changelog

* License header updates

* Test fixes

* Fix typo

* Interceptor fixes

* License header update

* Test fixes

* Mapping fixes

* Version bump

* License header updates

* Add null tests

* Add null guard

* Intermittent fix
2021-03-21 12:03:57 -04:00
James Agnew 3eda19c65a
Version bump (#2400)
* Version bump

* Docs changes

* Docs tweaks

* Docs tweak

* Spelling fixes

* Docs tweaks
2021-02-18 11:07:49 -05:00
jamesagnew 919c1dbddc Version bump to 5.3.0 2021-02-17 07:10:13 -05:00
Kevin Dougan SmileCDR 2308d8f44b
Merge CQL Initial Implementation Into master (#2330)
* CQL initial implementation
2021-01-29 16:35:38 -05:00
jamesagnew 5961fde2dd Docs tweak 2021-01-29 16:12:06 -05:00
Marcel P d11515599a
Added FHIRPathResource Generator for R4 including Test. (#2310)
Signed-off-by: Marcel Parciak <marcel.parciak@gmail.com>
2021-01-29 11:05:05 -05:00
dependabot[bot] feff734736
Bump jaxb-runtime from 2.3.1 to 3.0.0 (#2289)
* Bump jaxb-runtime from 2.3.1 to 3.0.0

Bumps jaxb-runtime from 2.3.1 to 3.0.0.

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

* Bump jaxb-runtime from 2.3.1 to 3.0.0

Bumps jaxb-runtime from 2.3.1 to 3.0.0.

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

* Add jakarta bindings

* Dependency cleanup

* More depndency cleanup

* Work on deps

* Replace transaction annotation

* Cleanup

* Another fix

* Build fix

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-22 11:24:23 -05:00
James Agnew 14b0688f69
Bump core version to 5.2.16 (#2308)
* Bump core library version

* Test fix

* Build fixes

* Some test fixes

* One more bit of docs

* Build fix

* Test fix

* Test fix

* Docs fix
2021-01-21 05:30:23 -05:00
vedion 99b646eed7
Mapping noExtensibleWarnings and noBindingMsgSuppressed between FhirInstanceValidator and InstanceValidator (#2054)
Co-authored-by: ahn <anders.havn@systematic.com>
2021-01-17 09:21:08 -05:00
James Agnew 8f8c5c31f1
Add validation rules interceptor (#2264)
* Start work on validation rules interceptor

* Work on interceptor

* Add tests

* Work on validation interceptor

* Work on interceptor

* Test fix

* Documentation tweaks
2021-01-01 14:29:10 -05:00
Bill Denton 84d9854e24
OSGi manifest maintenance (#2217)
* manifest cleanup and delete Fragment-Host

* make hapi-fhir-server-empi into an OSGi bundle
2020-12-18 16:48:44 -05:00
James Agnew 1e5def260c
Bump woodstox version (#2199) 2020-11-27 19:49:06 -05:00
jamesagnew 0c31741eec Version bump to 5.3.0-SNAPSHOT 2020-11-18 14:52:43 -05:00
jamesagnew 4d441ad7f2 Version bump to 5.2.0 2020-11-18 06:30:20 -05:00
James Agnew 228e75b501
Bump core to latest versions (#2154)
* Bump core to latest versions

* Compile fix

* Bump to non snapshot core library
2020-11-03 15:43:37 -05:00
ianmarshall 7899837fe0 Replaced references to SystemIdentifier with SystemUrlAndVersion. 2020-09-30 22:04:08 -04:00
ianmarshall 90f1981817 Updated tests for missed dstu2 code coverage. 2020-09-30 18:10:57 -04:00
ianmarshall dc3443665c Changes per code review. 2020-09-29 21:12:27 -04:00
ianmarshall 8e7b4e8437 Changes per code review. 2020-09-29 21:05:28 -04:00
ianmarshall 732624bfaf Fix broken JUnit test. 2020-09-25 22:55:01 -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 5fe46be41c Validate code changes and new tests. 2020-09-24 18:51:47 -04:00
ianmarshall ceb5ec6384 Use canonical identifiers for code systems rather than specifying version separately. 2020-09-23 16:42:29 -04:00
Frank Tao e6a669444d Added invalid test cases for DSTU3 2020-09-22 20:51:20 -04:00
ianmarshall b32c4f01a8 Fixed lookupCode implementation in InMemoryTerminologyServerValidationSupport. 2020-09-22 18:46:16 -04:00
Frank Tao 64f2bae2e7 Impl CodeSystem $validate-code for R4 with basic test cases 2020-09-18 22:30:59 -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 d00db11586 Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-09-09 17:38:24 -04:00
jamesagnew f3a5433c06 Set reference validation policy on hapi.fhir.org 2020-09-08 05:51:10 -04:00
ianmarshall ff7aab2924 Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-08-30 15:30:47 -04:00
jamesagnew b2853567f3 Per #2058 - Making R5 structures non optionsl 2020-08-30 10:17:15 -04:00
ianmarshall 29b293f179 Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-08-21 10:16:49 -04:00
James Agnew 03cde8c53f
Don't use remote termsvc on implied system validation (#2045)
* Don't use remote termsvc on implied system validation

* Add changelog
2020-08-18 13:56:37 -04:00
ianmarshall 4db00fa604 Fix broken test and cleanup. 2020-08-17 18:14:37 -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 f0ed640e24 Upgrade core library dependency version 2020-08-10 09:05:04 -04:00
ianmarshall d39348d7bd Initial changes to support multiple versions for code system. 2020-08-09 11:49:04 -04:00
James Agnew 6a8e09addf
Ensure that parent structuredefinitions are snapshotted before (#2005)
* Ensure that parent structuredefinitions are snapshotted before
snapshotting child

* Add changelog
2020-07-28 11:46:58 -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 29bf6b8171
Fix a bug validating ValueSets (#1981)
* Fix a buig validating ValueSets

* Test fix
2020-07-15 09:25:34 -04:00
James Agnew c949349a41
Correctly validate ISO 3166 codes (#1967 update) (#1973)
* Add tests

* Test fixes

* Fix tests

* Test fix

* One more test fix
2020-07-09 18:34:26 -04:00
James Agnew 4b1546f002
Add support for ISO 3166 to validator (#1967)
* Add ISO 3166 support

* Add support for ISO-3166

* Add changelog

* Test fixes
2020-07-06 05:29:48 -04:00
James Agnew 6fb6675b1e
Resolve validation errors to ValueSet with UCUM (#1948)
* Add tests for validation errors

* Work on validation errors

* Bump core version

* Fix validation errors

* Test fixes

* Add changelog

* Test fix

* Test fix

* Test fix
2020-07-05 19:59:21 -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
James Agnew f88298a1fb
Remote terminology service enhancements (#1934)
* Remote terminology service enhancements

* Add changelog
2020-06-23 11:35:26 -04:00
James Agnew 67d363f9e1
Add setting to allow validation of reference targets (#1932)
* Add setting to allow validation of reference targets

* Add changelog

* Add changelog

* License headers

* Plugin version bump

* Experiment with Maven build
2020-06-23 11:35:10 -04:00
Diederik Muylwyk 314df43091 BaseValidationSupportWrapper.expandValueSet(...) and ValidationSupportChain.expandValueSet(...) were incorrectly replacing expansion options (i.e. offset and count) with null. 2020-06-22 16:52:52 -04:00
James Agnew b6540064ea
Improve TX scoping for validation (#1925)
* Improve TX scoping for validation

* Test fix

* Test fix

* Some cleanup

* Test fixes

* Test fix
2020-06-17 14:04:12 -04:00
jamesagnew 0c100f1aca Test fixes 2020-06-10 08:09:10 -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
jamesagnew d2f018919c Add test 2020-06-03 15:16:38 -04:00
James Agnew 6899604ae4
Correct validation of fragment codesystems (#1865)
* Update validation for fragment codesystem

* Test fixes

* Add changelog

* Test fix
2020-05-25 20:44:09 -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
Tadgh d1b963321a
MVP EMPI implementation (#1857)
EMPI Initial Implementation (still plenty of known gaps)
2020-05-22 15:03:20 -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
jamesagnew b044d05332 Add a disabled test 2020-05-20 17:26:24 -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
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 9d8bd0d51e
Bump R4 definitions to 4.0.1 (#1837)
* Bump R4 definitions to 4.0.1

* Add changelog

* Test fixes
2020-05-08 19:34:13 -04:00
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 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
jamesagnew 371cda280a Test fix 2020-04-23 08:50:22 -04:00
jamesagnew 4978a5de21 Add test 2020-04-23 05:30:08 -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 ac29073b72 Test fixes 2020-04-09 14:22:04 -04:00
James Agnew fdf6633145
Add validation for currencies to validator (#1797)
* Add validation for currencies to validator

* Add changelog
2020-04-09 11:39:30 -04:00
jamesagnew 300c4e66ba Fix broken test 2020-03-23 19:09:03 -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 3c2c1dab2e
Error on missing profile validation (#1742)
* Error on missing profile validation

* Add changelog

* Test fixes
2020-03-03 08:28:26 -05:00
jamesagnew 13fbdf418f Add ignored test for #1740 2020-03-03 05:22: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 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 0718f6b52a
Allow schemalocation in XML validation (#1677)
* Allow schemaLocation declaration in XML when validating

* Add fix for #1676
2020-01-21 07:14:16 +09: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 d050b7b3c2 Add changelog 2019-12-19 15:03:30 -05:00
James Agnew 28fba9734b Test fix 2019-12-19 14:58:32 -05:00
James Agnew 0e1f03b999 Work on validation 2019-12-19 14:41:35 -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 3984ea24b0 Add validaton test 2019-11-26 09:37:52 -03: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 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 b90f285218 Merge branch 'master' into ja_20190928_rationalize_search_param_extractor 2019-10-30 08:41:14 -04:00
James Agnew 84803a02ef
Preserve line numbers in XML validation (#1567)
* Preserve line numbers in XML validation

* Test fixes
2019-10-29 15:54:49 -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 df4376606d
Validation cleanup (#1561)
* Validation cleanup

* Test fix

* Fix build

* Test tweaks
2019-10-24 13:09:18 -05:00
John Poth 969174136e Rename org.hl7.fhir.convertors package as it's already used 2019-10-24 12:23:38 -05:00
James Agnew a71d969ba1 Add line numbers to validation failures 2019-10-18 14:10:47 -04:00
James Agnew 50af4bfb19 Merge latest changes 2019-10-18 13:36:26 -04:00
James Agnew b2f68fd6ff Add test for #848 2019-10-17 19:42:29 -04:00
James Agnew 0971998f57 Fix #848 - Pass raw JSON to the validator 2019-10-17 11:28:48 -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 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 eb0a657b62 Fix intermittent test failure 2019-10-08 20:45:12 -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
Clayton Bodendein 08825a81d9 Add missing @Override annotations
Added missing @Override annotations so that if/when methods in superclasses change
there will be a compile-time error if subclasses haven't been changed accordingly.

This was done using IntelliJ IDEA's "Missing @Override annotation" inspection.
2019-10-02 05:45:59 -04:00
James Agnew 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
James Agnew 004f42cdcc Clean up docs 2019-09-23 15:56:02 -04:00
James Agnew 2cfa08f179 Add test case 2019-09-17 11:13:57 -04:00
James Agnew 38cf830384 Accurately reflect codesystem URL 2019-09-16 15:55:32 -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
James Agnew 722c7a8211 Work on GraphQL updates 2019-09-06 14:56:17 -04:00
jamesagnew e1b43d811f Version bump to 4.1.0-SNAPSHOT 2019-08-14 14:06:06 -04:00
jamesagnew 3f22456b0f Bump version to 4.0.0 2019-08-14 11:06:26 -04:00
James Agnew 301a8f8432
Merge #1146 - Filter implementation (#1220)
* Initial commit of _filter keyword implementation.

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

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

* Implemented language

* Commit/push before creation of pull request

* Ongoing merge work

* Ongoing merge work

* Merge master in

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

* Add support for R5

* Docs changes
2019-08-06 17:30:31 -04:00
James Agnew 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
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 6e20b53979 Fix a crash in R4 validation 2019-07-04 16:27:04 -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
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
James Agnew c2d4891434 Test fix 2019-05-29 21:13:52 -04:00
James Agnew 772d31dc6c
Merge pull request #1228 from eevaturkka/enablewhen_master
QuestionnaireResponses should be able to have Items without Answers in disabled Questions
2019-05-29 20:47:31 -04:00
Matti Uusitalo 225916a4b6 Changes requested in Pull Request review 2019-05-23 16:48:49 +03:00
James Agnew d4d3178621 A couple of test fixes 2019-05-11 15:04:44 -04:00
James Agnew 444730373b Fix an NPE in validation 2019-05-10 12:49:34 -04:00
James Agnew 92bd2c7173 Fix regression in validator when validating codesystems explicitly
defined in the JPA database
2019-05-10 12:08:40 -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 61902da527 Tweak to validator 2019-05-06 10:18:55 -04:00
James Agnew 7753ba2e5c Several test fixes 2019-05-04 14:38:37 -04:00
James Agnew 5132f1f4ed COnfirm validation support comntains codesystem 2019-05-02 07:50:59 -04:00
James Agnew 37b9e1a42c Improve validation of enableWhen questionnaires 2019-04-29 14:43:42 -04:00
Matti Uusitalo b95b4cf110 Merge with master 2019-04-25 10:44:07 +03:00
James Agnew 738c2c1797
Interceptor framework refactoring (#1287)
Interceptor framework overhaul
2019-04-24 14:32:30 -04:00
James Agnew 210d99d121 Correct validation of questionnaire enableWhen 2019-04-17 16:50:37 -04:00
patrick-werner 41a032ae9f added more missing methods 2019-03-30 15:36:06 +01:00
patrick-werner 2f3ac9d734 added missing method 2019-03-30 15:21:01 +01:00
Matti Uusitalo 5e0996d8ff Better method comment 2019-03-05 12:00:56 +02:00
Matti Uusitalo 9549a1615c Merge with origin/master 2019-03-05 11:44:30 +02: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 9a8e3245b8 Build fixes 2019-02-05 15:00:36 -05:00
James Agnew 47123196a0 Merge branch 'master' of https://github.com/eevaturkka/hapi-fhir into eevaturkka-master 2019-02-05 14:26:41 -05:00
Eeva Turkka be746854e5 version number for release 2019-01-31 15:42:37 +02:00
Eeva Turkka 1c9f7f7ca9 Version number changed for build 2019-01-31 13:26:13 +02:00
Eeva Turkka 7e7d4d8879 Allowing items without answers even if item is disabled. 2019-01-31 13:00:41 +02:00
Eeva Turkka e6df4a21e4 Merge branch 'enablewhen_fix' of https://github.com/eevaturkka/hapi-fhir into enablewhen_fix 2019-01-28 10:31:44 +02:00
James Agnew 4f16fea580 Fix compile error 2018-12-28 12:11:19 -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
Ken Stevens 84a34eb3c9
Subscription module support (#1147)
* Reorganizing packages and dependencies to support standalone subscription running within a CDR container where all hapi modules are on the classpath.

Moved Subscription registry out of interceptor and introduced SubscriptionLoader

* Created ActiveSubscription and moved cache bits into it

* Moved ExecutorQueue stuff out into its own class

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

* Added SubscriptionCheckingSubscriber

* Moved a few beans to @ComponentScan

* Replaced use of beanFactory with concrete factory classes

* Switched test to use subscribablechannel

* Added SubscriptionLoaderFhirClientTest

* Confirm that our SubscriptionProviderFhirClient works with a live fhir client

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

* Fix triggering service so it uses new subscriptionmatcherinterceptor

* Renamed "Database" classes to "Dao"

* processing -> matching naming change
2018-12-18 13:09:06 -05:00
Matti Uusitalo a3e7f5b18f Corrected group ids back to ca.uhn.hapi.fhir 2018-12-18 11:21:29 +02:00
Matti Uusitalo 01eb7faf66 Deleted unnecessary Inteface class 2018-12-18 10:15:47 +02:00
Matti Uusitalo 98f929997b Sync with upstream/master 2018-12-17 15:38:05 +02:00
Matti Uusitalo 7ad45308e0 Make this configurable 2018-12-17 14:10:15 +02:00
Matti Uusitalo 89e3cac0e2 Corrected problems caused by merge 2018-12-17 13:55:15 +02:00
Matti Uusitalo 8183c18406 Corrected project dependency version numberts 2018-12-17 13:54:43 +02:00
Matti Uusitalo 58959eec48 Do not force enableWhen to have system 2018-12-17 13:31:07 +02:00
Matti Uusitalo dd8e027ff4 Don't evaluate Extensions when determining type of answer 2018-12-17 13:31:07 +02:00
Matti Uusitalo a1f79a2063 Filter Extensions from enablewhen evaluation 2018-12-17 13:31:07 +02:00
Matti Uusitalo 755eaa5f25 bumped version n. for release 2018-12-17 13:31:07 +02:00
Matti Uusitalo c2b3d48afe Support required questionnaireitem groups 2018-12-17 13:31:07 +02:00
Matti Uusitalo a0db7e20b6 temporarily set hard coded error when no profile found 2018-12-17 13:30:36 +02:00
Matti Uusitalo cefacdc18c Returned to original state as the experiment failed 2018-12-17 13:30:36 +02:00
Matti Uusitalo 24ebe6cf03 Temporarily set isNoTerminologyServer() return true to avoid errors about loinc codes 2018-12-17 13:30:36 +02:00
Matti Uusitalo 311d92f276 Added more information to the error message about misplaced QuestionnaireResponseItem 2018-12-17 13:30:36 +02:00
Eeva Turkka 076d18977d Added support for Quantity in the default enable when evaluator 2018-12-17 13:30:36 +02:00
Matti Uusitalo b29e8d987c Avoid infinite loop when validating misaligned questionnaireresponseitems 2018-12-17 13:27:27 +02:00
Matti Uusitalo a9c625365d Added missing propagation of QuestionnaireResponse root element 2018-12-17 13:27:27 +02:00
Matti Uusitalo ab484c9819 Thread questionnaireResponse root element through questionnaire validation so implementations of enablewhen may validate against the complete resource 2018-12-17 13:27:27 +02:00
Matti Uusitalo 10fe878540 Changed versions to use fi.kela.kanta.phr parent 2018-12-17 13:27:27 +02:00
Matti Uusitalo e84689b167 Way to inject custom enablewhen evaluator added 2018-12-17 13:27:27 +02:00
Matti Uusitalo 507c78320c Added check for answering questions which are not enabled 2018-12-17 13:27:27 +02:00
Matti Uusitalo d2c6a98c24 Removed unused HapiWorkerContext 2018-12-17 13:27:27 +02:00
Okko Kauhanen a12f5892e2 Added operator evaluation for R4 enableWhen 2018-12-17 13:26:31 +02:00
Eeva Turkka 69d9e5d2b2 Unit tests up to date and maybe we need to use r4 path 2018-12-17 13:15:43 +02:00
Eeva Turkka 84c02d2e79 Cherry picked changes from master to 3.5.0 branch 2018-12-17 13:13:38 +02:00
Matti Uusitalo 3c56640d57 Do not force enableWhen to have system 2018-12-17 12:48:53 +02:00
Matti Uusitalo 73e85ce668 Don't evaluate Extensions when determining type of answer 2018-12-17 12:48:53 +02:00
Matti Uusitalo 14b5d88530 Filter Extensions from enablewhen evaluation 2018-12-17 12:48:53 +02:00
Matti Uusitalo 4956c9c7e0 bumped version n. for release 2018-12-17 12:48:53 +02:00
Matti Uusitalo c04a172fcd Support required questionnaireitem groups 2018-12-17 12:48:53 +02:00
Matti Uusitalo e13bc28b42 temporarily set hard coded error when no profile found 2018-12-17 12:45:51 +02:00
Matti Uusitalo 3f21bfb560 Returned to original state as the experiment failed 2018-12-17 12:45:51 +02:00
Matti Uusitalo 154a1d92e0 Temporarily set isNoTerminologyServer() return true to avoid errors about loinc codes 2018-12-17 12:45:51 +02:00
Matti Uusitalo c86ae90c4d Added more information to the error message about misplaced QuestionnaireResponseItem 2018-12-17 12:45:51 +02:00
Eeva Turkka 074e812162 Added support for Quantity in the default enable when evaluator 2018-12-17 12:45:51 +02:00
Matti Uusitalo 94f0520982 Avoid infinite loop when validating misaligned questionnaireresponseitems 2018-12-17 12:43:43 +02:00
Matti Uusitalo a6b0cb2a6e Added missing propagation of QuestionnaireResponse root element 2018-12-17 12:43:43 +02:00
Matti Uusitalo fa0b61d9b8 Thread questionnaireResponse root element through questionnaire validation so implementations of enablewhen may validate against the complete resource 2018-12-17 12:43:43 +02:00
Matti Uusitalo a981452957 Reverted to original version 2018-12-17 12:43:43 +02:00
Matti Uusitalo b7843498dc Changed versions to use fi.kela.kanta.phr parent 2018-12-17 12:43:43 +02:00
Matti Uusitalo 76eb85308c Way to inject custom enablewhen evaluator added 2018-12-17 12:43:43 +02:00
Matti Uusitalo 78ab112204 Added check for answering questions which are not enabled 2018-12-17 12:43:43 +02:00
Matti Uusitalo 16a4004f02 Removed unused HapiWorkerContext 2018-12-17 12:43:43 +02:00
Matti Uusitalo e7e039a851 Added default enablewhen behaviour to STU3 resources converted to R4 2018-12-17 12:43:43 +02:00
Okko Kauhanen 8f338c1b63 Remove unnecessary throw 2018-12-17 12:43:43 +02:00
Okko Kauhanen 4fff5ee27a Fixed bug in finding QuestionnaireResponse child items 2018-12-17 12:43:43 +02:00
Okko Kauhanen cddb6b993c Added operator evaluation for R4 enableWhen 2018-12-17 12:43:43 +02:00
Okko Kauhanen 6a83a3fb59 fix enablewhen result 2018-12-17 12:42:29 +02:00
Okko Kauhanen 275cc9556f Missing file 2018-12-17 12:42:29 +02:00
Okko Kauhanen 48db1d8770 First implementation of enableWhen evaluator 2018-12-17 12:42:29 +02:00
Eeva Turkka ad11409705 Unit tests up to date and maybe we need to use r4 path 2018-12-17 12:42:29 +02:00
Eeva Turkka 7097526f81 Cherry picked changes from master to 3.5.0 branch 2018-12-17 12:41:05 +02:00
James Agnew 46f5c18adc Prepare for 3.6.0 release 2018-12-17 12:32:33 +02:00
Matti Uusitalo b262985e21 Do not force enableWhen to have system 2018-12-13 13:29:17 +02:00
hdconradi 89ede0e524 Extension domains configuration for the fhr instance validator (#917)
* Fix the url of the StructureDefinition extensions

http://hl7.org/fhir/tools/StructureDefinition/ -> http://hl7.org/fhir/StructureDefinition/
That makes the entry for the structuredefinition-expression superfluous.

The url behind IG_DEPENDSON_PACKAGE_EXTENSION does not point is not (yet?) valid too.

* Add ability to configure custom extension domains.

* Testing the extension domains configuration

* Fix obvious bug when determining resource name

The for loop was completely superfluous beforehand.
Either fix it as e.g. in this patch or remove it.

* small improvements and TODO's for possible NPE's

- javadoc see
- use diamond operator for generics
- remove throws clause when exception is not thrown
- add TODO's for some cases a NPE might occur.
  My knowledge of the context is not sufficient to suggest the proper
  way to solve this.
2018-12-13 05:32:47 -05:00
Matti Uusitalo c85f4b8362 Don't evaluate Extensions when determining type of answer 2018-12-13 12:12:56 +02:00
Matti Uusitalo 82387e6902 Filter Extensions from enablewhen evaluation 2018-12-12 14:22:38 +02:00
Matti Uusitalo 3df4004539 bumped version n. for release 2018-12-11 11:17:40 +02:00
Matti Uusitalo 64f378ae78 Support required questionnaireitem groups 2018-12-10 13:58:14 +02:00
Matti Uusitalo b2e20b5c31 temporarily set hard coded error when no profile found 2018-12-10 13:57:04 +02:00
Matti Uusitalo 5a508f45b9 Returned to original state as the experiment failed 2018-12-10 13:52:38 +02:00
Matti Uusitalo f72fbbe402 Temporarily set isNoTerminologyServer() return true to avoid errors about loinc codes 2018-12-10 13:52:38 +02:00
Matti Uusitalo b922670d97 Added more information to the error message about misplaced QuestionnaireResponseItem 2018-12-10 13:52:38 +02:00
Eeva Turkka efbff93247 Added support for Quantity in the default enable when evaluator 2018-12-10 13:52:38 +02:00
Matti Uusitalo d2a1be82f8 Avoid infinite loop when validating misaligned questionnaireresponseitems 2018-12-10 13:51:12 +02:00
Matti Uusitalo 55287f126c Added missing propagation of QuestionnaireResponse root element 2018-12-10 13:51:12 +02:00
Matti Uusitalo 2941e7067a Thread questionnaireResponse root element through questionnaire validation so implementations of enablewhen may validate against the complete resource 2018-12-10 13:51:12 +02:00
Matti Uusitalo 606d901523 Reverted to original version 2018-12-10 13:48:23 +02:00
Matti Uusitalo addc44b5f4 Changed versions to use fi.kela.kanta.phr parent 2018-12-10 13:48:23 +02:00
Matti Uusitalo 11b1114fe8 Way to inject custom enablewhen evaluator added 2018-12-10 13:48:23 +02:00
Matti Uusitalo deb8de8705 Added check for answering questions which are not enabled 2018-12-10 13:48:23 +02:00
Matti Uusitalo e2cdb7bbe6 Removed unused HapiWorkerContext 2018-12-10 13:48:23 +02:00
Matti Uusitalo 98cf1becb1 Added default enablewhen behaviour to STU3 resources converted to R4 2018-12-10 13:46:45 +02:00
Okko Kauhanen 360e8d2d8f Remove unnecessary throw 2018-12-10 13:45:12 +02:00
Okko Kauhanen 430e8c89e8 Fixed bug in finding QuestionnaireResponse child items 2018-12-10 13:45:12 +02:00
Okko Kauhanen 0540efa49b Added operator evaluation for R4 enableWhen 2018-12-10 13:45:12 +02:00
Okko Kauhanen f56ad302dd fix enablewhen result 2018-12-10 13:45:12 +02:00
Okko Kauhanen 44b24a65cb Missing file 2018-12-10 13:45:12 +02:00
Okko Kauhanen e4db83ce41 First implementation of enableWhen evaluator 2018-12-10 13:45:12 +02:00
Eeva Turkka c67554e5aa Unit tests up to date and maybe we need to use r4 path 2018-12-10 13:45:12 +02:00
Eeva Turkka b0635a91cd Fixed unit test asserts 2018-12-10 13:33:55 +02:00
Eeva Turkka 4dbef9a799 Cherry picked changes from master to 3.5.0 branch 2018-12-10 13:33:55 +02:00
Matti Uusitalo b76fe1e6be Sync our fork with Hapi master. Merge remote-tracking branch 'upstream/master' 2018-12-10 13:20:27 +02:00
jamesagnew cc57bacab8 Version bump to 3.7.0-SNAPSHOT 2018-11-12 10:07:28 -05:00
James Agnew 63af04a7b4 Prepare for 3.6.0 release 2018-11-12 05:40:55 -05:00
Matti Uusitalo 130fc3a90e Removed unused HapiWorkerContext 2018-11-07 11:46:24 +02:00
Matti Uusitalo b140351650 Added default enablewhen behaviour to STU3 resources converted to R4 2018-11-06 13:11:12 +02:00
Okko Kauhanen 139ec6503f Remove unnecessary throw 2018-11-05 18:39:13 +02:00
Okko Kauhanen c099fcda0a Fixed bug in finding QuestionnaireResponse child items 2018-11-05 17:49:12 +02:00
Okko Kauhanen 4c4c8ba87a Added operator evaluation for R4 enableWhen 2018-11-05 17:03:50 +02:00
Okko Kauhanen 38a2b17a5e fix enablewhen result 2018-11-05 13:00:32 +02:00
Okko Kauhanen 91bf3b61f6 Missing file 2018-11-05 12:55:02 +02:00
Okko Kauhanen 0dcc4fa189 First implementation of enableWhen evaluator 2018-11-05 12:01:25 +02:00
Eeva Turkka 92936d6889 Unit tests up to date and maybe we need to use r4 path 2018-11-02 15:54:34 +02:00
Eeva Turkka 15610c9498 Fixed unit test asserts 2018-11-02 12:03:48 +02:00
Eeva Turkka a832b58691 Fixed test cases to make EnableWhen disable questions 2018-11-02 09:17:35 +02:00
Eeva Turkka 0c0f887ddf Added unit tests - Case when hasAnswer is false doesn't work with
InstanceValidator yet.
2018-11-01 15:58:05 +02:00
James Agnew 34bb70af65 Add validator test and allow migrator to be used for 3_3_0 2018-10-08 21:04:17 -04:00
James Agnew 1cfaeadcb8 Don't use a null version advisor in the DSTU2 version converter 2018-10-01 16:48:56 -04:00
James Agnew 3fd86efa73 One more useless class deleted 2018-09-30 13:41:58 -04:00
James Agnew d7abeb513b Remove class that is failing the build and not used 2018-09-30 13:31:06 -04:00
James Agnew 3e445faf47 Squashed commit of the following:
commit df641506885e09e63f80efc6c658d01a1a3a8142
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sat Sep 29 13:47:22 2018 -0400

    Shrink validation resources

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

    Updates to get R4 working

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

    Ongoing work on gettign R4 working

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

    More work on sync

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

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

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

    Fix compile error

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

    Merge branch 'master' into sync_r4

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

    Keep working on getting R4 building

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

    Ongoing work to get R4 working

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

    Work on getting build working

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

    Merge branch 'master' into sync_r4

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

    Work on R4 sync

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

    Work on sync

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

    Work on R$ sync

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

    Work on R4
2018-09-29 13:48:35 -04:00
James Agnew 706e004b9d Bump to 3.6.0-SNAPSHOT 2018-09-19 10:24:48 -04:00
James Agnew 261f2c73ab Merge branch 'jpa_migration' 2018-09-11 08:09:15 -04:00
jamesagnew 0e75c8ed39 A few test fixes 2018-09-10 08:50:12 -04:00
James Agnew 29f324f8de
Merge branch 'master' into master 2018-09-07 23:25:49 -04:00
James Agnew daef975734 Version bump to 3.5.0 2018-09-08 07:22:21 +08:00
James Agnew f4a21eadda Fix this issue 2018-09-01 14:38:52 +08:00
Anthony Sute 5ef647840b Follow-up fixes for unit tests for issue #1048. 2018-08-10 11:47:53 -04:00
Anthony Sute 0fdcad0985 Second pull request for fixes for issue #1048. 2018-08-06 13:17:51 -04:00
Anthony Sute 3cf3f7d5d6 Fixes for issue #1048. FhirInstanceValidator::validate() now looking in meta/profile section of request prior to calling InstanceValidator::validate(). 2018-08-06 12:50:50 -04: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 218937e425 Several fixes 2018-06-20 05:53:32 -04:00
James Agnew cc0e836680
Auth interceptor early checks (#995)
* Validator fix

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

* FIx DSTU2 test that wasn't updated

* More test fixes
2018-06-10 17:48:20 -04:00
James Agnew 91d4ab8496 Merge branch 'java9' of github.com:jamesagnew/hapi-fhir into java9 2018-05-30 15:03:29 -04:00
James Agnew 1fcb374d40 Test fixes 2018-05-30 15:03:11 -04:00
jamesagnew d127a89047 Some test fixes 2018-05-30 11:01:43 -04:00
James Agnew d819d685ee Test fix 2018-05-30 09:57:41 -04:00
jamesagnew 5a96482860 More work o JDK9 tests 2018-05-30 08:04:01 -04:00
James Agnew a52805e504 Work on JDK9 support 2018-05-30 05:45:08 -04:00
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 09eb52ed27 Fix failing tests 2018-05-24 06:33:13 -04:00
James Agnew 1ead3f715e
Merge pull request #892 from hdconradi/validate-questionnaire-response-item-type-for-text
Allow text items in questionnaire
2018-05-24 06:03:18 -04:00
James Agnew 934369a1d9
Merge branch 'master' into instance-validator-npe-on-itemtype 2018-05-24 05:55:22 -04:00
James Agnew 179e88eb86
Merge pull request #881 from hdconradi/two-typos
Two typos in the InstanceValidator
2018-05-24 05:52:39 -04:00
James Agnew 74e7152ce6
Merge pull request #880 from hdconradi/required-answer-can-be-missing-when-in-progress
Activate the QuestionnaireResponseValidatorDstu3Test again and add tests for missing required items
2018-05-24 05:46:41 -04:00
James Agnew eb77b8a225
Merge pull request #874 from hdconradi/validation-server-exception-when-local-reference-absent
Validation server exception when local reference absent
2018-05-23 06:29:25 -04:00
jamesagnew c82c57eb37 Sync validator 2018-05-23 06:28:58 -04:00
jamesagnew 7e83fc78cf Disable user resource and weaken validation on the public server 2018-05-21 19:04:37 -04:00
jamesagnew e8139192e0 FIx test issues 2018-05-21 13:07:11 -04:00
James Agnew a7cd37e2a0
Merge branch 'master' into fix936 2018-05-17 07:30:31 -04:00
patrick-werner 4d8608e721 temp. fixed: "Attempt to read a single element when there is more than one present" #949
Will be overwritten by next RI import!
2018-05-17 10:15:29 +02:00
patrick-werner 07d0cc7876 Merge branch 'master' into bpCheckValFix 2018-05-17 09:53:41 +02:00
patrick-werner 78f9d6333a temp. fixed: "Attempt to read a single element when there is more than one present" #949
Will be overwritten by next RI import!
2018-05-17 09:43:35 +02:00
James Agnew 4fd868afae Credit for #946 and add extensions to the CLI uploader 2018-05-16 19:32:12 -04:00
patrick-werner b4d2fcfc68 added core-extension validation support 2018-05-16 18:51:55 -04:00
James Agnew 0b6a146945 Don't do karaf verifier by default 2018-05-16 14:24:55 -04:00
patrick-werner 412994bfc7 Merge branch 'core-extensions' 2018-05-15 12:16:35 +02: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
James Agnew 3a03d4ff63 Add test for #942 2018-05-13 10:31:54 -04:00
patrick-werner 305cc9c9c4 added core-extension validation support 2018-05-13 16:22:57 +02:00
James Agnew 8c47d966e9 Add test for #938 2018-05-13 09:03:12 -04:00
jamesagnew 3d762b984b Sync to R4 definitions 2018-05-12 19:35:42 -04:00
patrick-werner 405bb50036 Modified Information warning about non must-support content 2018-05-12 14:12:01 +02:00
James Agnew b17eebd8d2 Squashed commit of the following:
commit 2be11651c2
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 11:50:53 2018 -0400

    Update changelog

commit b3bb5f9052
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 11:19:28 2018 -0400

    Parameter updates

commit f6b1082ba4
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 07:24:30 2018 -0400

    More test fixes

commit 81a69c265f
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 06:26:48 2018 -0400

    Fix compile error

commit 935938e92c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 06:25:18 2018 -0400

    Another test fix

commit 43568a1f8d
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 06:18:06 2018 -0400

    Fix compile error

commit e95894e643
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 06:13:50 2018 -0400

    More work on tests

commit 9393fb8f4f
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu May 10 05:36:27 2018 -0400

    One more fix

commit 437f5051e4
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed May 9 21:32:10 2018 -0400

    Work on validator

commit 20c51add4f
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed May 9 19:34:10 2018 -0400

    Validator fix

commit 7bf2b0a0e9
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed May 9 18:44:04 2018 -0400

    Fix test

commit adc73e75c9
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed May 9 17:22:34 2018 -0400

    Merge validator
2018-05-10 11:53:32 -04:00
James Agnew f092caf386
Merge pull request #903 from dgileadi/902-fix-bounds-exception
Fix #902, IndexOutOfBoundsException for DSTU2 QuestionnaireResponses with groups
2018-05-04 08:49:17 -04:00
jamesagnew 83a5eedb29 Fix performance regression in DSTU3 validation 2018-04-28 11:42:59 -04:00
Heinz-Dieter Conradi 01b84cdd96 Fix the InstanceValidator so that the test passes for text items too. 2018-04-03 23:40:36 +02:00
Heinz-Dieter Conradi 04ae5a30d1 R4: add a questionnaire test which checks all possible item types 2018-04-03 23:39:58 +02:00
Heinz-Dieter Conradi fafbabb34a DSTU3: add a questionnaire test which checks all possible item types 2018-04-03 23:37:37 +02:00
Heinz-Dieter Conradi baf53efd32 Fixing the NPE in the InstanceValidator 2018-04-03 23:35:00 +02:00
Heinz-Dieter Conradi 1aff132691 Test questionnaire with embedded items for R4.
The test for an item embedded in a text item works as expected.
    However, the embedded item in a choice or openchoice case
    triggers an NPE.
2018-04-03 23:34:53 +02:00
Heinz-Dieter Conradi eeb4fe62b7 Test questionnaire with embedded items for DSTU3.
The test for an item embedded in a text item works as expected.
However, the embedded item in a choice or openchoice case
triggers an NPE.
2018-04-03 23:33:12 +02:00
Heinz-Dieter Conradi 913283559f Wrong javadoc parameter name
This is an error in some ide's and of course in javadoc.
2018-04-03 23:28:23 +02:00
Heinz-Dieter Conradi 41207e5555 Testing missing required items in QuestionnaireResponses 2018-04-03 23:20:31 +02:00
Heinz-Dieter Conradi 2d55b1f886 Remove the Ignore from the QuestionnaireResponseValidatorDstu3Test 2018-04-03 23:20:31 +02:00
Heinz-Dieter Conradi b2107baae4 Fix the server exception when validating an invalid local reference
'fetcher == null' is ok for a local reference.

Unfortunately, there are now two messages with the same meaning:
- one from the ProfileValidation
- one from the code in this location
2018-04-03 23:11:53 +02:00
Heinz-Dieter Conradi f2cd05fe3b Add test for invalid local reference (R4)
Currently an invalid local reference causes an InternalErrorException
caused by: FHIRException: Resource resolution services not provided.
The validation should instead return normally and contain an error
message.
2018-04-03 23:11:40 +02:00
Heinz-Dieter Conradi 229e0977d2 Add test for invalid local reference (DSTU3)
Currently an invalid local reference causes an InternalErrorException
caused by: FHIRException: Resource resolution services not provided.
The validation should instead return normally and contain an error
message.
2018-04-03 23:09:39 +02:00
jamesagnew c5b286921e Tests all passing 2018-03-30 15:18:57 -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 d9c167455e Make sure we correctly clean up resources 2018-03-27 15:20:22 -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
David Gileadi 3b724107ff Fix the IndexOutOfBoundsException, #902
Add a test that demonstrates it
2018-03-26 11:10:55 -07: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
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
James Agnew 1a331838d0 Add comment for #870 2018-03-05 08:36:42 -05:00
James Agnew 1fcfc13dca Merge branch 'schematron-questionnaire-que-7' of https://github.com/hdconradi/hapi-fhir into hdconradi-schematron-questionnaire-que-7 2018-03-05 08:29:57 -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
James Agnew 790aaeb4ea Tests for #872 2018-02-28 21:34:32 -05:00
Heinz-Dieter Conradi f4fa233ad7 remove superfluous import 2018-02-28 13:34:14 +01:00
jpoth 66ebfa0ed3 Implement #826 - add OSGI support and Apache Karaf features with integration tests 2018-02-28 11:32:53 +01:00
Heinz-Dieter Conradi 8e000749ba Fix questionnaire schematron with enableWhen and hasAnswer
Without this fix, the 'hasAnswer' element of a questionnaire item is ignored.
This in turn allowes it that one can have both an 'answer' and a 'hasAnswer' item.

A fix is applied for both DSTU3 and R4 and tests are provided.

The tests for R4 are currently ignored, since they require a valid schematron,
e.g. by merging #869
2018-02-27 16:31:19 +01:00
patrick-werner 0af95842a9 fixes #853
performer validation implementation is now list based
added Test
2018-02-22 12:23:42 +01:00