Commit Graph

3146 Commits

Author SHA1 Message Date
Nick 684b77d396 Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc 2021-01-11 09:21:29 -05:00
Frank Tao f6d4a40388
UCUM Service Support (#2261)
* Added UcumServiceUtil

* Removed ucum-essense.xml

* Added ucum service existing test cases passed

* Added more test cases

* Merge branch 'master' into ft-ucum-support

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Added back extractReferenceParamsAsQueryTokens

* Added changelog and migration script

* Added length for the string type

* Moved UCUM util to hapi-fhir-jpaserver-model

* Renamed UCUM support to Normalized Quantity Search Support

* Moved setNormalizedQuantitySearchNotSupported to AfterEach

* Changed migrate task to 530

* Removed comments

* Fixed in memory search issue and added more test cases

* Fixed the version order

* License header updates

* Updated based on review comments

* Updated the migration task based on review comments

* Fixed RES_TYPE with type String and length 100

* Changed myParamsQuantityNormalizedPopulated type to Boolean class
2021-01-10 21:05:24 -05:00
Frank Tao 88b01a3bb4
Changed the minGramSize back to 3 (#2279) 2021-01-10 09:02:59 -05:00
Nick 9338a4e73e Survivorship 5 2021-01-08 19:25:25 -05:00
jamesagnew 0b6e8e3f4d Add license header 2021-01-08 16:35:42 -05:00
ianmarshall 14270e8aa4 Remove the now redundant PackageSystemRequestDetails class. 2021-01-07 10:18:39 -05:00
ianmarshall e23e3c660c Merge remote-tracking branch 'origin/master' into im_2021_01_04_package_load_with_partitioning 2021-01-06 12:23:21 -05:00
ianmarshall 634f7a8026 Fix typo. 2021-01-06 10:33:47 -05:00
ianmarshall 659e83f451 Address use case where packages include non-conformance resources. Update documentation as well. 2021-01-06 10:29:10 -05:00
jamesagnew 496a8bd3cd Test fix 2021-01-05 18:41:43 -05:00
James Agnew 0bb878e4a8
Repository validation enhancements (#2270) 2021-01-05 18:22:34 -05:00
jamesagnew 12d366c86e License header updates 2021-01-05 18:13:14 -05:00
Tadgh efc6809ea6
Replacing Hibernate Search 5 with Hibernate Search 6 (#2190)
* Beginning work on converting to hibernate search 6
* replace all out of date properties
* replace all POM references to old versions
* remove the shaded ES jars as HS6 supports 7.9
* Convert "Bridges" to RoutingBinder and RoutingBridge
* Modernize all indexing annotations
* Begin refactoring of search queries (wip)

* Fix spatial API changes, work on BaseTermReadSvcImpl

* Most of the way through the various filter property conversions

* Finished i think with BaseTermReadSvcImpl

* Compiling, but definitely broken

* Start test compilation failures

* All tests compiling (i think)

* remove suggest keywords operation

* Fix bootstrap errors, still have to deal with transient fields

* Rollback CR

* More refactoring, got IDs baked back into docs

* Fix coord util, fix a few more fields which require projection

* merge fixes

* begin refactor of valuesetexpansion tests

* fix another test

* Update tests

* remove todos, add TestContainers

* Fix descendant in

* Add testcontainers, fix another test

* fix more tests, replace embedded es

* Rip out embedded elastic, replace with TestContainer

* merge conflicts for new analyzers

* Bump to CR2 for hibernate search 6. Add forgotten CLI dep. Add backwards compatible codecs

* Remove dead deps, update testcontainer

* Remove java-hamcrest

* Pull asserts up, refactor tests to pass in RP tests

* Update V2 check

* Remove suggest keyword tests

* Split line for testing

* Fix perhaps one of the dumbest programming mistakes in my career so far

* Refactor tests which no longer rely on a strict known order

* Fix up test config, disable log test temporarily

* Remove log4j from being transitively pulled in. re-enable test

* Update log4j exclusions with new bridge. Update test to check for core class

* Move dependency to root pom in dep management section

* Update changelog, add changelog for HS6 with ES requirements. Remove dead comment

* update testst, remove todos

* Add hibernate props provider method, add elastic regexp query

* Add todo for high level client builder

* Modify ElasticsearchRestClientFactory to support HTTPS hosts

* Remove protocol extraction from rest url

* do we even need to index this...?

* remove purge of non-indexed resources

* Add longer timeout to testcontainers

* Add task to add docker CLI to azure pipeline via task, for testcontainers

* WIP remove this

* Dont update version

* Add test for duplicate termconcepts

* Use real hibernate ORM methods

* merge issues

* Add partitionsettigns bean to match master

* Trying to debug testcontainers on azure...

* Trying to debug testcontainers on azure...

* Run even on previous failure

* Fix testcontainer port binds

* Add full text logs attaching, and test reporting

* I love yaml

* Remove comment

* Refactor delta remove to not do a once-over traversal and flatten all children pre-delete. Resolves transaction commit boundary issue

* Modify TX beheaviour

* wip

* Rework to use config and mocked beans for partition-aware lastN

* rework to not use beans and just inject vars i need for test, keps test envs cleaner

* update azure pipeline to only copy test results

* Remove erroneous publish

* Always get test logs

* Make it so indexing works,

* Add todos

* revert deleteByPid

* Work on test fixes

* Test fixes

* Test fixes

* Another test fix

* Test fix

* Work on tests

* Test fixes

* All tests passing locally

* Fix test failure

* FIx build error

* Rename usages of HibernateDialectProvider -> HibernatePropertiesProvider

* Update ngram of token filters

* Tidying

* subvert the purpose of hibernate elastic props builder to inject template

* dead space

* Rename changed class

Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-05 17:56:59 -05:00
ianmarshall 446dd5c782 Fixed package loading to enable loading of binary package files into the default partition when partitioning is enabled. 2021-01-05 17:51:04 -05:00
James Agnew d943260927
Rework valueset index for MySQL (#2269)
* Rework valueset index for MySQL

* Add changelog
2021-01-05 10:03:33 -05:00
ianmarshall 1f0ea21cde Changes per code review plus test fixes. 2021-01-04 19:09:04 -05:00
ianmarshall bac47dbbf6 Changes per code review plus test fixes. 2021-01-04 19:06:39 -05:00
ianmarshall 8a2dfe86fd Merge remote-tracking branch 'origin/master' into 2260-fix-sorting-for-mysql 2021-01-04 09:00:21 -05:00
James Agnew 3e6d80bdc2
Fix SQL Server paging with new querybuilder (#2265)
* Fix SQL Server paging with new querybuilder

* Add changelog
2021-01-02 11:13:51 -05:00
jamesagnew d20b07c78e Update license headers 2021-01-01 15:50:24 -05:00
jamesagnew f30999b053 License header updates 2021-01-01 15:07:23 -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
ianmarshall 63e0c90023 Change order by clause in search query to support MySQL, MSSQL and MariaDB. 2020-12-24 13:54:37 -05:00
Frank Tao 89cf6e6293
Fixed the pre-expansion with filter issue (#2257)
* Fixed the pre-expansion with filter issue

* Changed minGramSize to 3 instead of 2
2020-12-17 23:31:33 -05:00
Tadgh e79114e2ec
Un-revert the MDM changes, now that issues have been addressed (#2226)
* Backward compatibility changes

* Revert "Revert "Remove all references to Person from EMPI.""

* Updated docs

* Removed mdm channel references

* Initial implementation

* fix coarseness bug. Fix tests. reinitialize silly bean

* Add forgotten json file

* Generic provider PoC

* Refactored provider to use BundleBuilder

* Removed version-specific MDM providers

* Addressed code review comments

* Fixed after merge

* Fixed docs

* MDM SVG for Update Use Cases

* Removed obsolete docs

Co-authored-by: Nick <nick.goupinets@smilecdr.com>
Co-authored-by: Nick Goupinets <73255752+nvg-smile@users.noreply.github.com>
2020-12-17 10:12:53 -05:00
Frank Tao effbd19924
Merge pull request #2240 from hapifhir/ft_support_composite_sort
Add support for composite sorting
2020-12-16 16:54:56 -05:00
Frank Tao de845300c2 Updated based on the review comments 2020-12-16 15:48:10 -05:00
Frank Tao 0411967e26 Added composite sort test case for R5 2020-12-11 22:25:12 -05:00
Frank Tao dcbdc83d8e Supported composite sort 2020-12-11 21:50:32 -05:00
Ruslan Zinovyev 368e9a9b56
Rz 20201207 remove component scan (#2228)
* deleted component scan

* added fixme

* fix abstract bean

* fixed

* final bean fixes

* added fixes

Co-authored-by: Ken Stevens <khstevens@gmail.com>
2020-12-11 09:18:27 -05:00
James Agnew e4d6c51290
Allow plus symbol in email address match url (#2224)
* Allow plus symbol in email address match url

* Add changelog
2020-12-09 21:52:03 -05:00
Tadgh 0938d72b51
Revert "Remove all references to Person from EMPI." 2020-12-09 14:57:00 -05:00
Nick efb429b319 Fixed todos and reverted FK check in the test 2020-12-08 13:00:02 -05:00
Nick 6018dd0537 Fixed ambitious schema update 2020-12-08 10:44:11 -05:00
Nick d3c0944388 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-07 22:02:45 -05:00
Nick fd90eb699f Review updates 2020-12-07 18:03:56 -05:00
James Agnew fd528a0f7d
Improve error message on unsupported resource type (#2221)
* Improve error message on unsupported resource type

* Add changelog
2020-12-07 17:35:51 -05:00
Nick f5f7f2df14 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-07 11:55:51 -05:00
James Agnew d958764d49
Partition data leaks across searches (#2220)
* Partition data leaks across searches

* Add changelog

* Resolve FIXME

* Add test logging

* Test fix

* Test fix
2020-12-06 16:32:07 -05:00
Nick 4352e0a61f Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-03 11:28:21 -05:00
James Agnew 1eae5db374
autoCreatePlaceholderReferenceTargets true breaks multitenancy (#2215)
* Fix #2209 - autoCreatePlaceholderReferenceTargets true breaks multi-tenancy

* Add changelog

* Address fixme
2020-12-03 08:53:37 -05:00
James Agnew 35f4d48eee
Fix validating capabilitystatements (#2214)
* Fix validating capabilitystatements

* Add changelog
2020-12-03 05:31:04 -05:00
Nick Goupinets ffee7a894f Removed person refs 2020-12-02 17:41:42 -05:00
James Agnew a3ae6c3813
Add partition selector to id parameter (#2208)
* Add partition selector to id parameter

* Add changelog
2020-12-02 14:10:37 -05:00
Nick Goupinets 417ae55cb4 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-02 09:29:47 -05:00
James Agnew 6e72ee8f6b
Fix new searchbuilder on oracle (#2205)
* Fix new searchbuilder on oracle

* Add changelog
2020-12-02 06:22:41 -05:00
jamesagnew 18541d4388 Correctly chunk resource version queries 2020-12-01 17:20:44 -05:00
Nick Goupinets d63c580e82 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-12-01 13:18:42 -05:00
James Agnew c309737166
Allow reading from multiple partitions (#2198)
* Partitioning rework

* Work on partition improvements

* Partition updates

* Work on partitiong

* Test fixes

* Add docs

* Add changelog

* Resolve FIXME

* Test fixes

* Test fixes

* Test fixes

* Compile fix

* Fix compile error

* Test fix

* Test fixes
2020-11-30 17:59:52 -05:00
Nick Goupinets 3f3b811b16 Fixed Foreign Key references 2020-11-30 17:21:56 -05:00
jamesagnew 74aed5d107 License headers 2020-11-29 20:53:19 -05:00
Ken Stevens 3d3242cf9a
Resource change listener (#2191)
* init rev

* fix build

* Tweaked the POM config settings and also added some dependency exclusions (commented out for now).

* More re-factoring of the CQL Unit Tests.

* Removed a LogMessages.html file and a minor Unit Test change.

* Unit Tests.

* added debug logging to troubleshoot the dao that has no name

* added debug logging to troubleshoot the dao that has no name

* workaround to get past null dao resourceName issue

* fix jsons to get test to pass.  Test still fails with library id problem

* gitignore

* gitignore

* test passes!  Woohoo!

* undo troubleshooting logging

* added timer and logging.

* added asserts and time multiple evaluations and measure the average

* readme

* adding explanations

* added more explanatory notes

* measure 2 patients

* move pom to use cqf snapshot

* roughed out cache

* roughed out cache

* Added code to VersionChangeCache class.

* added tests

* added polling test

* wrote init version

* wrote init version

* optimized versioncache

* worked on getting tests to pass

* redesigned interfaces

* all tests pass

* fixmes

* fixmes

* rename param

* Added Unit Tests.

* javadoc

* Fixed the 2-Patient Unit Test.

* More Unit Test work.

* make ResourceVersionMap immutable

* Fixed a Unit Test that was failing intermittently by adding a new way to refresh the cache.

* Use a new method called doRefreshAllCaches(0) to force a refresh and have all Listeners called immediately.

* Cleaned up IVersionChangeListenerRegistry interface to make methods more clear and resolved all Unit Tests.

* disabled tests

* disabled tests

* removed unused test method

* fixed refresh logic and added asserts

* moved cache so it can be used by searchparamregistry

* Updated the Cql Unit Tests to be properly configured for Dstu3 or R4.

* started rewriting SearchParamRegistryImpl to use new cache
added init method to listener interface

* added fixmes

* adding tests

* tests pass

* added tests

* Fixed the way CqlProviderFactory Autowires Beans so it can work with both Dstu3 and R4 contexts.

* moar tests

* fix test

* work tests

* reverting unneccessary refactors

* undo unneccessary import changes to reduce MR size

* undo unneccessary import changes to reduce MR size

* Unit Test fixes...more to come...

* add unregister

* fix tests

* Changed ResourceVersionCache to use a Map of Maps.

* searchparam test

* test passes

* resolved fixme

* fixmies

* strengthen test asserts

* More Unit Test changes and added some FIMXME items.

* changed from long to changeresult

* renamed VersionChange -> ResourceChange

* fixed delete bug

* organize imports

* fix test

* add update test

* add test reset function

* fix stack overflow

* fix startup race condition (might still be intermittent)

* found the problem.  delete doesn't work because we can't look up the deleted resource to find out what its name is

* fixed regression

* abandoned idea of incrementally updating searchparam registry.  Rebuilding every time--it doesn't change that often.

* fix test

* begin with failing test

* test passes

* fixmes and javadoc

* fix test

* fixme

* fix test

* whack-a-mole.  Either subs pass or cql passes.  Something's fishy with the FhirContext

* fix subscription test initialization

* fix method name

* Re-factored the CqlProvider Unit Tests.

* changed ResourceChange API

* add interface

* add interface

* fix test

* add schedule test

* add doc

* init rev

* FIXME

* modify FhirContext change

* change fhirContext.getResourceTypes to lazy load

* converted subscriptions

* converted subscriptions

* begin with failing test

* test passes

* fix test

* test coverage

* test coverage

* test coverage

* test coverage

* good coverage now

* pre-review cleanup.  I think I found a bug.

* moved cache into listener entry
tests pass with fixmes

* fix test

* fix test

* fix test

* fixme

* FIXMEs

* merge cache and registry

* method reorg

* javadoc

* javadoc done.  all FIXMEs resolved.

* change log

* changes needed by cdr

* spring config cleanup

* james feedback

* james feedback

* might not work. Try moving resourcechangeconfig into searchparam config

* merge ResourceChangeListenerRegistryConfig.java into SearchParamConfig

* fix test

* fix SubscriptionLoader

* fix SubscriptionLoader

* create ResourceVersionMap from resources

* added cache handle interface

* fix test

* javadoc

* fix test

* fix test

* James feedback: clone searchparametermap

* fix startup

* fix test

* fix test

* fix intermittent

* pre-review cleanup

* FIXME

* final FIXME yay!

* Address a couple of my own reviw comments

Co-authored-by: Kevin Dougan <kevin.dougan@smilecdr.com>
Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2020-11-29 19:42:40 -05:00
James Agnew 1e5def260c
Bump woodstox version (#2199) 2020-11-27 19:49:06 -05:00
Nick Goupinets 2a3b72db17 Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-11-27 16:54:04 -05:00
Nick Goupinets dc2a9e55c5 Renamed sourceResource to goldenResource 2020-11-27 16:53:47 -05:00
jamesagnew fbbba11417 Formatting only 2020-11-27 16:16:01 -05:00
IanMMarshall 722e24d80c
Merge pull request #2175 from jamesagnew/ft-fix-expend-filter-contains-issue
Fixed expand filter issue
2020-11-27 14:47:05 -05:00
ianmarshall bbba4428ee Changed name for new tokenFilter to make it unique. 2020-11-27 11:38:24 -05:00
ianmarshall be88a256d0 Changed name for new tokenFilter to make it unique. 2020-11-27 11:32:08 -05:00
Frank Tao 014e2ba9cb Rework on the expand issue replaced the EdgeAnalyzer 2020-11-26 20:37:51 -05:00
Frank Tao a511543e77 Merge branch 'master' into ft-fix-expend-filter-contains-issue
# Conflicts:
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoValueSetR4.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoValueSetR5.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java
2020-11-26 18:47:10 -05:00
swagers cb693afe25
Changed the names URIs and IDs of a few LOINC concept maps (#2197)
Changed to match what LOINC uses for these concept maps

Co-authored-by: Steven Wagers <swagers@regenstrief.org>
2020-11-26 10:06:17 -05:00
James Agnew fb8658da70
Always apply vs filters correctly (#2195)
* Always apply valueset filters correctly

* Test fix

* Testfix

* Test fix

* Add changelog

* Test fix
2020-11-24 18:12:02 -05:00
Frank Tao 3d9e0aeac1 Added more test cases 2020-11-23 21:32:46 -05:00
Frank Tao 5a05513250 Revoked filter op to EQUAL and enabled NGramAnalyzer 2020-11-21 14:46:26 -05:00
Frank Tao 5b471602c6 Merge branch 'master' into ft-fix-expend-filter-contains-issue 2020-11-20 10:29:58 -05:00
James Agnew a01f5ae906
Fix subsumption test direction (#2183)
* Fix subsumption test direction

* Add changelog

* Test fixes
2020-11-19 21:48:54 -05:00
James Agnew 8b65db0c98
Improve error message on unique constraint violation (#2182)
* Improve error message on unique constraint violation

* Add changelog

* Test fixes

* Test fix
2020-11-19 21:20:59 -05:00
Frank Tao e551f1837e Updated based on review 2020-11-19 20:22:13 -05:00
Tadgh 953b662827 Merge branch '2161-refactor-empi' into gg_20201105-remove-person-references 2020-11-19 14:24:51 -05:00
ianmarshall d99db2dbcc Fixed NPE in package loader when package description is null. Also renamed tests that would have caught this problem sooner. 2020-11-18 22:37:35 -05:00
Frank Tao 878c22192e Added expand filter impl for R5 and dstu3, changed the filter logic 2020-11-18 22:26:21 -05:00
Frank Tao f65fdb0d52 Merge branch 'master' into ft-fix-expend-filter-contains-issue 2020-11-18 19:54:01 -05:00
Tadgh 75c0c25d7b remove references to EMPI 2020-11-18 19:50:00 -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
Tadgh 805d5b1d6c Merge branch '2161-refactor-empi' into gg_20201105-remove-person-references 2020-11-17 09:28:37 -05:00
IanMMarshall 7532313c0f
Change to not set ValueSet expansion component parameter id HibernateSearch not enabled. (#2178)
Co-authored-by: ianmarshall <ian@simpatico.ai>
2020-11-17 07:46:55 -05:00
Frank Tao 78f730c4ca Fixed expend filter issue 2020-11-15 22:39:14 -05:00
jamesagnew 1db0944243 Improve logging for terminology ingestion 2020-11-13 17:25:14 -05:00
IanMMarshall ed953d82f8
Rename index that was recently changed. (#2173)
* Restoring name of index that was changed in migration task.

* Rename TermValueSetConcept index that was recently changed.

Co-authored-by: ianmarshall <ian@simpatico.ai>
2020-11-13 14:12:25 -05:00
Tadgh f648d8ec2b renaming in personsvc 2020-11-13 09:44:15 -05:00
Nick Goupinets 2bbfb6dfaa WIP 2020-11-11 15:27:57 -05:00
Nick Goupinets b0f449ff5e MergerSvcTest WIP 2020-11-11 10:17:03 -05:00
IanMMarshall bf9e02bc16
Merge pull request #2164 from jamesagnew/im_20201029_ig_package_long_description
Truncate package descriptions that are longer than 200 characters.
2020-11-10 12:01:53 -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
ianmarshall 881193cf24 Truncate package descriptions that are longer than 200 characters. 2020-11-09 16:19:05 -05:00
jamesagnew 4f6be9d9a7 Reduce test timeout 2020-11-09 14:46:15 -05:00
Nick Goupinets 4c0fab8cec Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references 2020-11-09 09:06:50 -05:00
jamesagnew 22fe9420ac Add tests 2020-11-06 09:10:47 -05:00
Tadgh 5797cd0682 * Add source_resource_id column
* Add source_resource columm
Still need to depracate the old columns.
Reworked a Matcher to ignore Person
2020-11-05 13:07:45 -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
IanMMarshall 38a975f09d
Im 20201028 fix versioned valueset expansions (#2151)
* Fixes to ValueSet expansion for cases where CodeSystem is versioned.

* Fixes to ValueSet expansion for case where URL and filter parameters specified.

* Restore maven-wrapper.properties file inadvertently deleted from GitHub.

* Fix JUnit tests and ValueSet exclude.

Co-authored-by: ianmarshall <ian@simpatico.ai>
2020-11-04 16:36:43 -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
jamesagnew 783cbb3cf8 Bump postgres driver version 2020-10-26 19:34:50 -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
James Agnew 4a5f5199b5
Add custom partition interceptor examples (#2145)
* Add custom partition interceptor examples

* Add documentation

* Test fixes

* Remove outdated test

* Test modification
2020-10-25 19:19:40 -04:00
blangley28 d468183edd
Validate theSearchParamRegistry is not null (#2142) 2020-10-23 10:29:55 -04:00
IanMMarshall 1c9e4dcc81
Merge pull request #2135 from jamesagnew/im_20201015_loinc_versioned_resourceids
Im 20201015 loinc versioned resourceids
2020-10-22 19:01:31 -04:00
IanMMarshall fd46d0965f
Merge pull request #2141 from jamesagnew/im_20201020_package_installer_enhancements
Enable package installer to load non-Conformance resources
2020-10-21 18:28:15 -04:00
ianmarshall 115b09e4d4 Throw exception if any resources in package have no url and no identifier. 2020-10-21 17:23:40 -04:00
ianmarshall 756432e61a Enable package installer to load resources other than conformance resources. 2020-10-21 15:47:31 -04:00
jamesagnew 9b4c1a58a6 License header updates 2020-10-21 12:58:29 -04:00
Ken Stevens 3b91873b7c
delete expunge (#2131)
Added delete _expunge=true
2020-10-20 17:21:50 -04:00
James Agnew 9e8e98b6fb
Rework scheduler to use Spring factory (#2134)
* Rework scheduler to use Spring factory

* Add test
2020-10-19 10:33:12 -04:00
ianmarshall f3639ee1ce Changes to terminology loader to support preserving the original resource IDs for LOINC even when multiple versions are loaded. 2020-10-16 16:30:37 -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
vedion e4214a4cbe
Exposing hasIncludes PersistedJpaBundleProvider (#2047)
Co-authored-by: ahn <anders.havn@systematic.com>
2020-10-12 17:37:12 -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
IanMMarshall a44037daf3
Merge pull request #2122 from jamesagnew/im_20201007_conceptmap_sourcesystemversion
Fixed loader so that it now sets source system version for ConceptMap…
2020-10-08 14:04:49 -04:00
James Agnew d2aae361bf
Rewrite deferred interceptor callback framework (#2121)
* Rewrite deferred interceptor callback framework

* Improve deferred handling

* Null guard

* Test fix
2020-10-07 20:08:18 -04:00
ianmarshall 476eba676e Fixed loader so that it now sets source system version for ConceptMap resources. 2020-10-07 15:07:25 -04:00
ianmarshall 46b2fde1db Fixed tests to accommodate suggested changes from code review. 2020-10-07 11:07:34 -04:00
IanMMarshall 1bac646dc3
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-07 11:01:54 -04:00
IanMMarshall e24e233ec6
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-07 11:01:47 -04:00
ianmarshall 0f39eeb0e9 Bug fix and test improvements. 2020-10-06 21:22:09 -04:00
ianmarshall d9841e59ac Restore ability to load LOINC PartLink data from a single file for pre-2.68 versions. 2020-10-06 14:36:23 -04:00
IanMMarshall 5ec1284b8a
Apply suggestions from code review
Edits per code review.

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-05 15:14:39 -04:00
ianmarshall 2258d37283 Documentation for terminology. 2020-10-05 09:02:00 -04:00
IanMMarshall f1710fd0be
Merge pull request #2081 from jamesagnew/feature_2020_09_02_term_multi_version_support
Feature 2020 09 02 term multi version support
2020-10-01 12:24:40 -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
Ken Stevens 09d09233ff
empi bugfixes and enhancements (#2104) 2020-09-29 17:27:43 -04:00
IanMMarshall c593958d2c
Apply suggestions from code review
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 15:16:46 -04:00
IanMMarshall d63c15ef09
Apply suggestions from code review
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:27:57 -04:00
IanMMarshall 43c16e1737
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:27:03 -04:00
IanMMarshall 43b6bd38ff
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:26:30 -04:00
IanMMarshall 2be47b5567
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:18:21 -04:00
IanMMarshall b8531e599f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:18:00 -04:00
IanMMarshall 3940e7526f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:17:36 -04:00
IanMMarshall 6aa1a5ec3f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:17:19 -04:00
IanMMarshall ebb3fa0ca1
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:16:56 -04:00
IanMMarshall 10620a8bb4
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderCodeSystemDstu3.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:16:13 -04:00
ianmarshall 9d8664ccd8 Additional tests and updates. 2020-09-27 21:09:06 -04:00
ianmarshall e86d9deaac Additional tests. 2020-09-27 17:45:15 -04:00
ianmarshall 732624bfaf Fix broken JUnit test. 2020-09-25 22:55:01 -04:00
ianmarshall 1dc4a533d6 Fixes to terminology loader. 2020-09-25 21:43:15 -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 2bceacd9a6 Update loader to ensure that ConceptMap and ValueSet Ids are unique for each version loaded. 2020-09-25 08:51:53 -04:00
ianmarshall 5fe46be41c Validate code changes and new tests. 2020-09-24 18:51:47 -04:00
ianmarshall e5daea17b7 Additional cleanup and migration tasks. 2020-09-23 17:17:07 -04:00
ianmarshall dffc02a126 Missing fixes for DSTU3 and R5. 2020-09-23 16:51:18 -04:00
ianmarshall 640ee94c5c Merge remote-tracking branch 'origin/master' into im_20200728_term_multi_version_support 2020-09-23 16:43:22 -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 3d3d013d72 Changed import of IdType to r5. 2020-09-23 09:19:06 -04:00
Frank Tao b6d86dc5f2 Added fail(); in the invalid test cases 2020-09-22 20:39:20 -04:00
Frank Tao 20661c7a2b Removed unused import 2020-09-22 20:19:43 -04:00
Frank Tao 673274a966 Added invalid test cases for CodeSystem/$validate-code R3 2020-09-22 20:18:18 -04:00
ianmarshall b32c4f01a8 Fixed lookupCode implementation in InMemoryTerminologyServerValidationSupport. 2020-09-22 18:46:16 -04:00
ianmarshall 4216cee8c6 Added and enhanced tests plus fixes arising from tests. 2020-09-22 14:44:32 -04:00
James Agnew ef4f3df945
Don't install draft package contents (#2099)
* Don't install draft package contents

* Add changelog

* Add changelog
2020-09-22 09:44:36 -04:00
James Agnew 072e63be5a
Avoid a crash on double date chains (#2097)
* Avoid a crash on double date chains

* Add changelog

* Address coverage warning
2020-09-21 15:43:07 -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
Frank Tao 8f692a4776 CodeSystem/$validate-code not supported for DSTU2, DSTU3 2020-09-19 22:54:39 -04:00
Frank Tao a3a032584b Made Transactional 2020-09-19 15:18:28 -04:00
Frank Tao 01d88a665d Added CodeSystem/$validate-code for R5 2020-09-19 14:13:07 -04:00
Frank Tao 7db9f7475b Changed fetch size to 1 for CodeSystem $validate-code 2020-09-19 12:52:18 -04:00
Frank Tao 05de0c5031 Added more test cases for R4 2020-09-19 12:36:14 -04:00
Frank Tao 64f2bae2e7 Impl CodeSystem $validate-code for R4 with basic test cases 2020-09-18 22:30:59 -04:00
Ken Stevens 3189819dd5
limit transaction size config (#2087) 2020-09-16 14:13:03 -04:00
jamesagnew b64e982ec3 Credit for #2083 2020-09-16 09:07:33 -04:00
Tue Toft Nørgård c884f29112
SearchCoordinatorSvcImpl gets ExecutorService from injected ThreadPoolTaskExecutor (#2083)
* Get ExecutorService from injected ThreadPoolTaskExecutor which enables support of TaskDecorators (e.g. to add/clear ThreadLocal logging context (MDC) variables)

* Properly initialize ThreadPoolTaskExecutor
2020-09-16 09:05:28 -04:00
ianmarshall 7f7e1f39bc Merge remote-tracking branch 'remotes/origin/im_20200728_term_multi_version_support' into feature_2020_09_02_term_multi_version_support 2020-09-15 22:06:43 -04:00
ianmarshall b2b63cbb02 Fixed JUnit tests. 2020-09-15 22:05:46 -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 ca0bdc8e4c Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-09-15 16:49:06 -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
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
ianmarshall b4cd09a5b6 Further cleanup 2020-09-15 12:30:26 -04:00
ianmarshall fe684ee4c0 Further cleanup 2020-09-15 12:26:17 -04:00
ianmarshall cd104ad635 Revised approach for versioning of ValueSet. 2020-09-15 10:21:42 -04:00
James Agnew 9711b5ed18
Update resources on package reinstall (#2078)
* Start testing

* Update resources on package install

* Add changelog
2020-09-15 08:46:43 -04:00
Frank Tao 0d929d4d19 Updated based on review comments 2020-09-14 09:30:03 -04:00
Frank Tao 8551b33e8a Merge branch 'feature_2020_09_02_term_multi_version_support' into ft_2020_09_11_term_multi_version_support_loader 2020-09-14 09:15:12 -04:00
Frank Tao 701fe81acf
Merge pull request #2072 from jamesagnew/ft_2020_09_10_term_multi_version_support_db_migration
Term multi version support db migration - ConceptMap table change
2020-09-14 09:13:12 -04:00
Frank Tao 91c1df7ce4 Supported ConceptMap Version from the properties 2020-09-11 21:38:42 -04:00
Frank Tao 750cbf4ba3 @Deprecated the old findTermConceptMapByUrl method 2020-09-11 09:20:01 -04:00
Frank Tao 16a5f57ae9 Added for ConceptMap DB migration 2020-09-10 21:41:06 -04:00
Frank Tao 972bdbd87d Updated based on code review 2020-09-10 21:17:41 -04:00
Frank Tao c873b6d6dd Fixed ConceptMap $translation without conceptMapVersion issue. 2020-09-09 22:24:02 -04:00
ianmarshall b4a87adc64 Suggested test that includes case where ConceptVersion is not specified in $translate operation. 2020-09-09 16:53:14 -04:00
Frank Tao 2fd692f5bb Updated R5 reverse $translate test case for more coverage 2020-09-07 20:54:35 -04:00
Frank Tao 5e17625a1b Fixed NullPointerException for reverse $translate operation. 2020-09-07 18:09:01 -04:00
Frank Tao 5410042643 Multi-version supported for ConceptMap $translate operation 2020-09-07 10:43:58 -04:00
Frank Tao 81cd73f820 Added test cases to for duplicate url and version of ConceptMap 2020-09-06 15:27:29 -04:00
Frank Tao 1ecec0abc9 Fixed duplicate ConceptMap URL only 2020-09-06 15:23:26 -04:00
Frank Tao 45b88de3b6 Fixed typo 2020-09-06 11:47:07 -04:00
Frank Tao ed2801dbaf ConceptMap multi-version supported 2020-09-06 11:33:55 -04:00
ianmarshall 5b707f97a9 Missing commits 2020-09-04 09:25:35 -04:00
ianmarshall 019d08a064 Merge remote-tracking branch 'remotes/origin/master' into im_20200728_term_multi_version_support 2020-09-03 22:37:39 -04:00
ianmarshall 5f005120c9 Initial changes to support multi-version ValueSets 2020-09-03 22:36:15 -04:00
jamesagnew 5b7e6b593b Avoid startup retry loop 2020-09-02 19:56:57 -04:00
James Agnew d8542899e5
Don't lazy load DAOs (#2061)
* Don't lazy load DAOs

* More tweaks
2020-09-01 09:54:50 -04:00
James Agnew c6777578a8
Avoid DB binary storage deadlock (#2062)
* Avoid DB binary storage deadlock

* Add changelog

* Rework
2020-09-01 09:52:38 -04:00
ianmarshall 94440c849f Ensure that LOINC loader assigns a distinct ID for each version. 2020-08-30 21:53:38 -04:00