03ebcafdf5
In-memory matcher ( #1116 )
...
* Initial refactoring to move database matcher out into its own class
* MAJOR REFACTOR: Pulled indexing code out of BaseHapiFhirDao into a new class ResourceIndexedSearchParams
* Moved calculateHashes
* Replaced @Bean definitions in BaseConfig.java with @ComponentScan
Annotated bean classes with either @Service (if it's stateless) or @Component (if it's stateful). It doesn't really matter which annotation is used, but it's helpful to see at a glance whether a bean is stateful or stateless.
* Move services out of BaseHapiFhirDao
Moved services required by ResourceIndexedSearchParams out of BaseHapiFhirDao and into new classes called LogicalReferenceHelper, IdHelperService, MatchUrlService, and DaoProvider.
Converted SearchBuilder into Prototype Bean
Mark Spring components that depend on daos and entitymanagers with @Lazy so they aren't picked up by hapi-fhir-spring-boot-autoconfigure.
* Added SubscriptionMatcherInMemory
Moved static data out of BaseHapiFhirDao into ResourceMetaParams
Moved translateMatchUrl methods out of BaseHapiFhirDao into MatchUrlService bean
Simplified SubscriptionMatcherInMemory to not depend on entity or dao
Turned all subscribers into prototype beans
* Moved searchParam method out to mySearchParamProvider
Also removed dao and contest parameters from of myMatchUrlService methods
Moved code out of SearchBuilder into SearchParameterMap.clean() so it can be used by inMemoryMatcher
Introduced a new composite subscription matcher that tries to match in memory and if it finds a parameter in the criteria it doesn't support, it falls back to the database matcher.
* Added support for references
Also fixed a small bug in SearchParameterMap that was missing the ";" after "_has" when creating a normalized query from search params.
* Finished implementing all tests from FhirResourceDaoR4SearchNoFtTest
* Make in-memory matcher configurable, disabled by default
* Validate Subscription criteria when they're submitted
Send HTTP 422 UnprocessableEntityException if the criteria fail validation.
* fixed Sonar "Blocker" issues.
* Don't reload the resource before sending it out
Since we can always force a reload using restHookDetails.isDeliverLatestVersion
* Added tests to cover Custom Search param.
* Split ResourceIndexedSearchParam into separate state and service classes
* Cleaned up SearchBuilder.
Removed uses of myCallingDao as an injection mechanism.
Left // FIXME KHS cookie crumbs to clean up
* Reduced dependencies on BaseHapiFhirDao
Removed methods from IDao interface that were used for injection
* Updated change log
2018-11-19 16:19:52 -05:00
bf8f26bc5f
Work on bugfixes
2018-11-19 05:49:05 -05:00
58388bb614
Allow client to return methodoutcome instead of resdource for operation
...
call
2018-11-19 11:11:49 +01:00
6a6451f694
Reduce number of queries on some DB operations
2018-11-16 12:41:50 +01:00
e4f6b3e9a2
Add a warning if an invalid class is scanned
2018-11-16 10:42:21 +01:00
4b099cf057
Fix #944 - NPE when using a custom resource class that has a @Block
...
child
2018-11-15 16:11:55 +01:00
75210d614b
Bump to 3.7.0-SNAPSHOT
2018-11-12 22:37:52 -05:00
63af04a7b4
Prepare for 3.6.0 release
2018-11-12 05:40:55 -05:00
023877e09f
Merge pull request #1047 from hdconradi/null-pointer-in-date-range-param
...
Fix NullPointerExceptions in DateRangeRaram
2018-11-11 17:02:27 -05:00
3942f1bb29
License header updates
2018-11-09 14:41:57 -05:00
f61df5c3fe
Use FHIRPath expression parser for custom SP validation
2018-11-09 14:41:20 -05:00
b32e232eb2
A bit of client tweaking
2018-11-08 17:10:39 -05:00
82ec721c99
Allow client defined parameter style for _format param
2018-11-08 15:27:35 -05:00
80b0f14c4b
Merge pull request #1103 from RuthAlk/own_message_resolver_3.6.6
...
Allow slotting in own IMessageResolver
2018-11-08 13:22:48 -05:00
76cd3f6b47
Allow client assigned IDs to be purely numeric in JPA server if
...
configured to do so
2018-11-07 18:25:50 -05:00
8c2d868f16
License updates
2018-11-01 16:13:34 -04:00
bb59e2d73a
Fix broken test
2018-11-01 10:25:13 -04:00
bbce2c69cf
Fix typo
2018-11-01 05:51:26 -04:00
3f6960d82b
Add multithreaded migrator tool
2018-11-01 05:42:51 -04:00
31ef4c68e1
Merge branch 'philips-3.6.0' of github.com:jamesagnew/hapi-fhir into philips-3.6.0
2018-10-31 05:51:13 -04:00
8955a9e54d
Add threading to migrator
2018-10-31 05:50:50 -04:00
4cd86596f2
Merge branch 'master' into fhirterser-getvalues-enhancements
2018-10-29 09:55:34 -05:00
b66e01ce65
Allow plain server @Operation methods to declare a wildcard so that any
...
opeeration invocations will be direected to them
2018-10-29 10:36:32 -04:00
729bbe04d0
Allow slotting in own IMessageResolver
...
This is useful in case we want to define our own way of translating
the codes in the thymeleaf templates.
2018-10-26 12:13:58 +02:00
794d9145e9
Move query count tests to consolidate them, and avoid an accidental
...
rewrite of existing indexes in some conditions
2018-10-24 17:54:58 -03:00
21a0390e6e
Even more additional work on FhirTerser.getValues(...) enhancements. Almost ready for review.
2018-10-24 11:43:19 -04:00
688e159493
Additional work on FhirTerser.getValues(...) enhancements.
2018-10-22 18:22:03 -04:00
225007d681
Completed work on FhirTerser.getValues(...) enhancements.
2018-10-19 18:24:26 -04:00
cd6d4302c3
Incremental work on FhirTerser.getValues(...) enhancements.
2018-10-19 15:13:51 -04:00
da2763d8c8
Merge branch 'master' into philips-3.6.0
2018-10-17 22:38:27 -04:00
99cd4ce5f7
Allow for _total parameter
2018-10-17 09:47:35 -04:00
1c1f601332
License header updates
2018-10-16 19:56:52 -04:00
755060f91e
Allow subscription triggering on a block of resources
2018-10-16 15:29:41 -04:00
34bb70af65
Add validator test and allow migrator to be used for 3_3_0
2018-10-08 21:04:17 -04:00
970c48ec37
A bit more test cleanup
2018-10-04 13:29:09 -04:00
95f00e1c94
Fix NPE in tests
2018-10-04 08:33:40 -04:00
b265c0281b
Expand search range when searching by date
2018-10-03 21:31:01 -04:00
5d5ee78873
API cleanup following JPA search performance enhancements
2018-10-03 07:43:01 -04:00
62d6771814
Use a select count query for summary count searches in JPA server
2018-09-29 21:58:14 -04:00
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 002c4b3ff7dfb4de86f1
2018-09-29 13:48:35 -04:00
ea5cf9f956
Fix the null pointer problems in the DataRangeParam class
2018-09-27 11:25:56 +02:00
734835de96
Add some test demonstrating null pointer problems in the DateRangeParam class
2018-09-27 11:25:56 +02:00
c0051f309b
Avoid NPE on parser
2018-09-21 09:48:18 -04:00
dfb4de86f1
License updates
2018-09-20 05:16:15 -04:00
706e004b9d
Bump to 3.6.0-SNAPSHOT
2018-09-19 10:24:48 -04:00
321e88c811
License header updates
2018-09-14 05:25:07 -04:00
ce6a9dbc36
Fix regression from new jetty version
2018-09-11 08:27:34 -04:00
daef975734
Version bump to 3.5.0
2018-09-08 07:22:21 +08:00
f5d567cd00
Work on migrator
2018-09-08 03:30:35 +08:00
0f7c4219cb
Merge branch 'master' into jpa_migration
2018-09-02 06:05:11 +08:00
f4a21eadda
Fix this issue
2018-09-01 14:38:52 +08:00
07cfed14b8
Work on migrator
2018-08-27 08:21:20 -04:00
df651c830e
Remove dynamic mode
2018-08-19 17:35:08 -04:00
bc1ee1f9dc
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2018-08-13 11:54:36 -04:00
ea1f17762e
Don't apply last updated to includes
2018-08-11 12:20:07 -04:00
64b3b64208
License header updates
2018-08-06 19:06:09 -04:00
4eb3281fa6
Merge branch 'client_enhancements'
2018-07-30 18:34:49 -04:00
709a5dbd0a
Merge pull request #965 from jbalbien/fixBundleUtilBug
...
fix bundle util bug
2018-07-30 09:45:09 -04:00
d6293cf9b3
Merge branch 'client_enhancements'
2018-07-30 09:42:38 -04:00
db0f082222
Merge pull request #996 from anamariaradu10/master
...
Changes regarding behavior for Prefer header
2018-07-30 09:16:20 -04:00
0f1724ac0a
Credit and a unit test for #912
2018-07-30 05:48:38 -04:00
d50dda19ae
Merge pull request #912 from InfiniteLoop90/911-contains-modifier
...
Fixes #911 - Adds support for :contains modifier
2018-07-30 05:39:27 -04:00
fc9f2ec0fb
FIx test issue
2018-07-29 18:20:09 -04:00
518092cbd4
More updates
2018-07-29 17:10:26 -04:00
3a5556006b
Merge branch 'master' into master
2018-07-27 16:59:52 +03:00
9c39733aff
Fixed issues
2018-07-27 16:48:44 +03:00
75a68a0332
Unit test fix
2018-07-26 18:58:23 +07:00
a4e4111376
Fix a unit test
2018-07-26 18:08:59 +07:00
3c80238f0e
Ongoing work on interceptors
2018-07-24 17:22:21 +07:00
23083a9283
Improvements to client and SP indexing in JPA server
2018-07-23 17:37:49 +09:00
b4aa4c0e89
Add protection against HTML injection attacks
2018-07-19 08:56:22 -04:00
401a4cd738
Clean up concept reindexing
2018-07-15 17:18:07 -04:00
43ac912033
Clean up terminology uploading
2018-07-15 15:22:52 -04:00
6d83edabb6
License header updates
2018-07-01 20:59:04 -04:00
a2d6435597
adding contentType matching independent of Charset to non-strict method
2018-06-25 10:51:05 +02:00
b1e09fcdf7
Merge pull request #1007 from jamesagnew/1006-Writing-structured-Binary
...
1006 writing structured binary
2018-06-21 18:03:14 +02:00
8bd1313492
removed unused import
2018-06-21 14:56:38 +02:00
f470653ba4
fixing tests
2018-06-21 11:50:58 +02:00
ef9f97a576
fixes #1006
2018-06-20 17:26:23 +02:00
ed0b5f54a5
More authorizationinterceptor tweaks for better security
2018-06-12 21:52:01 +08:00
dc476aeeea
In my opinion these changes should be made in order to have the behavior
...
for the Prefer header values as the one explained in the official
documentation from https://www.hl7.org/fhir/http.html
2018-06-12 14:04:05 +03:00
9498247082
Allows the Cache-Control Header in CORS header for jpa-example-server & CLI
2018-06-04 16:12:31 +02:00
d819d685ee
Test fix
2018-05-30 09:57:41 -04:00
0e2c57fa60
Bumping version.
2018-05-28 17:44:38 -04:00
2871920734
Preparing release.
2018-05-28 10:45:47 -04:00
d417bf1225
fix bundle util bug
2018-05-25 09:19:59 -07:00
a3687e446e
Correctly handle missing search params with new indexing infrastructure
2018-05-23 11:42:38 -04:00
2e74ad72cb
Improve timeouts on test ports
2018-05-23 08:52:24 -04:00
2f2900e837
Improve indexing on JPA server in anticipation of a new indexing
...
strategy in HAPI FHIR 3.5.0
2018-05-23 08:09:57 -04:00
cadb51d36c
Merge pull request #875 from RuthAlk/fix_codeableconcept_narrative
...
Fix error in narrative for CodeableConcept
2018-05-23 06:38:08 -04:00
851ce85ac6
Merge branch 'master' into wip-DateRangeParam
2018-05-23 06:03:26 -04:00
4d93b78c24
Credit for #836
2018-05-22 08:44:17 -04:00
3a68bc19e7
Merge pull request #836 from RuthAlk/include_patch
...
Fix problem with _include=MedicationRequest:medication
2018-05-22 08:40:08 -04:00
4fd868afae
Credit for #946 and add extensions to the CLI uploader
2018-05-16 19:32:12 -04:00
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
ccb859fdbe
FIxes to get the synced build working
2018-05-13 08:08:34 -04:00
150f27a9ca
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2018-05-12 19:40:31 -04:00
3d762b984b
Sync to R4 definitions
2018-05-12 19:35:42 -04:00
f1ba0016b2
Improve the error message thrown by JPA server
2018-05-11 17:03:48 -04:00
b17eebd8d2
Squashed commit of the following:
...
commit 2be11651c2b3bb5f9052f6b1082ba481a69c265f935938e92c43568a1f8de95894e6439393fb8f4f437f5051e420c51add4f7bf2b0a0e9adc73e75c9
2018-05-10 11:53:32 -04:00
d97fb8f5cf
709 the conceptmap operation called translate needs to be implemented ( #923 )
...
The ConceptMap operation $translate has been implemented.
2018-05-10 10:52:56 -04:00
5bd191d192
FIx some failing tests
2018-04-28 13:21:48 -04:00
593a705365
Performance enhancements on the CapabilityStatement generator for JPA
...
server
2018-04-28 11:06:42 -04:00
e299b062a6
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2018-04-24 19:14:56 -04:00
f1db751d1e
Update headers
2018-04-24 19:14:33 -04:00
09b1f547d0
Add expunge
2018-04-24 15:11:00 -04:00
07e7af746f
Work on expunge operation
2018-04-22 22:03:23 -04:00
591539cf13
Add expunge method
2018-04-22 18:34:56 -04:00
8c889267e5
One more parser fix
2018-04-18 06:20:11 -04:00
162069776a
Correctly handle encoding contained resources where some have user
...
assigned IDs and some do not
2018-04-17 18:26:06 -04:00
9013e44ba0
Fix a couple of broken compile issues
2018-03-31 06:08:49 -04:00
ac8e412e49
Fixes #911 - Adds support for :contains modifier
...
Adds support for the :contains modifier in StringClientParam.
2018-03-30 23:49:06 -05:00
180336e076
Sync to master
2018-03-29 06:54:24 -04:00
53c2d8a38d
Merge branch 'master' into loinc_loader_update
2018-03-29 06:21:55 -04:00
418e82032f
Prep for 3.3.0
2018-03-29 05:48:13 -04:00
94b880fd4d
Remove accidentally committed useless file
2018-03-28 10:13:51 -04:00
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
d9fcf1ef54
Merge pull request #864 from splatch/master
...
Avoid unecessary reference to javassist.
2018-03-23 06:49:59 -04:00
9125a78f33
Avoid unecessary reference to javassist.
2018-03-20 15:39:33 +01:00
308ac63a77
Merge branch 'master' into loinc_loader_update
2018-03-20 07:53:41 -04:00
9c5e32d7eb
Fix up some logging
2018-03-20 07:53:21 -04:00
6359f7f8a1
More work on loinc
2018-03-19 08:51:02 -04:00
6e2acd0689
Merge pull request #890 from jamesagnew/arglineFix
...
changed in *.pom: ${argLine} -> @{argLine}
2018-03-19 05:55:54 -04:00
4578b3889f
Allow for locale differences in StopwatchTest
2018-03-19 05:54:12 -04:00
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
142c4c6caa
Merge pull request #800 from InfiniteLoop90/issue-799-jaxrsrequest-fhir-version-support
...
Fixes issue #799 by adding logic to handle the R4 and DSTU2_1 contexts in ca.uhn.fhir.jaxrs.server.util.JaxRsRequest.
2018-03-19 05:41:20 -04:00
60354a4cc8
Merge branch 'master' into master
2018-03-12 07:41:22 -03:00
cb2f5a0bba
Merge pull request #786 from CarthageKing/bugfix-chaining-urlvalue
...
ensure to use resourceType properly when it is explicitly provided in a chained reference param
2018-03-12 07:32:27 -03:00
30cd63b929
More loinc work
2018-03-11 19:11:31 -04:00
5a653aeb20
Work on loinc mapping
2018-03-10 20:31:27 -03:00
611ee457cb
Lots of addition of loinc
2018-03-07 13:33:49 -03:00
e31aa760dd
Fix stopwatch ETA calculations
2018-03-05 19:06:05 -05:00
fee70b1a7a
Fix error in narrative for CodeableConcept
2018-03-05 16:27:07 +01:00
e201091e3a
Update licenses for changed files
2018-03-04 13:53:04 -05:00
2f7751a079
Move stopwatch into hapi-fhir-base and add timing into to client
...
LoggingInterceptor
2018-03-04 12:13:18 -05:00
928cf23b4c
Logging enhancements
2018-03-04 10:21:39 -05:00
0c0b9bd74b
Fix #814 - Don't create duplicate contained resources
2018-03-02 09:46:29 -05:00
fe140a55dd
Merge pull request #868 from Tastelezz/wip-DateParam
...
equals() and hashCode() for DateRangeParam and DateParam
2018-03-02 08:58:07 -05:00
3009ec7f74
- added guava-testlib as test dependency to modules hapi-fhir-structures-dstu2 and hapi-fhir-structures-dstu3
...
- added DateRangeParam.equals(Object) and DateRangeParam.hashCode()
- fixed broken DateParamTest
2018-03-02 13:03:30 +01:00
66ebfa0ed3
Implement #826 - add OSGI support and Apache Karaf features with integration tests
2018-02-28 11:32:53 +01:00
1caf768fd5
- implemented DateParam.equals() and DateParam.hashCode() which comes in handy when writing tests ...
2018-02-27 10:15:19 +01:00
458401864b
Handle deletes properly in HashMapResourceProvider
2018-02-25 14:20:04 -05:00
ef6ee83744
Remove test which is no longer applicable
2018-02-24 23:09:30 -05:00
1a9522cfdd
Update license header
2018-02-24 12:05:42 -05:00
f026f8a1ac
Fix compile error
2018-02-24 12:05:05 -05:00
6e47951220
Remove unneccesary log lines and clean up some documentation
2018-02-24 10:57:32 -05:00
01ff2e7c3b
- according to the design of all other IQueryParameterXXX types changed the methods setUpperBound() and setLowerBound() to return this, supporting method chaining.
...
- changed the order in which the state of a DateRangeParam instance got first modified and then verified.
- renamed the private method validateAndThrowDataFormatExceptionIfInvalid() to validateAndSet(DateParam, DateParam).
- replaced the methods haveLowerBound() and haveUpperBound() with the stateless method hasBound(DateParam).
2018-02-21 08:39:44 +01:00
2f4ac42edb
One more test fix
2018-02-18 09:17:04 -05:00
3f1a0e81c7
Avoid endless reindex loop
2018-02-17 16:10:44 -05:00
e89f8e5ba4
Fix crash with unique search parameter updates in JPA
2018-02-16 07:39:46 -05:00
Ken Stevens
jamesagnew
Ruth Alkema
Diederik Muylwyk
Heinz-Dieter Conradi
anamariaradu10
Ana Maria Radu
patrick-werner
Jeff Balbien
Clayton Bodendein
Łukasz Dywicki
Gaetano Gallo
jpoth