Commit Graph

4548 Commits

Author SHA1 Message Date
James Agnew 73dda18f59
Eevaturkka master (#1196)
* Added unit tests - Case when hasAnswer is false doesn't work with
InstanceValidator yet.

* Fixed test cases to make EnableWhen disable questions

* Fixed unit test asserts

* Unit tests up to date and maybe we need to use r4 path

* First implementation of enableWhen evaluator

* Missing file

* fix enablewhen result

* Added operator evaluation for R4 enableWhen

* Fixed bug in finding QuestionnaireResponse child items

* Remove unnecessary throw

* Added default enablewhen behaviour to STU3 resources converted to R4

* Removed unused HapiWorkerContext

* Cherry picked changes from master to 3.5.0 branch

* Unit tests up to date and maybe we need to use r4 path

* Added operator evaluation for R4 enableWhen

* Removed unused HapiWorkerContext

* Added default operator type EQUALS

* Added check for answering questions which are not enabled

* Way to inject custom enablewhen evaluator added

* Changed versions to use fi.kela.kanta.phr parent

* Copying modifierExtensions from QuestionnaireItems added

* Thread questionnaireResponse root element through questionnaire validation so implementations of enablewhen may validate against the complete resource

* Added missing propagation of QuestionnaireResponse root element

* Avoid infinite loop when validating misaligned questionnaireresponseitems

* Added support for Quantity in the default enable when evaluator

* Added more information to the error message about misplaced QuestionnaireResponseItem

* Temporarily set isNoTerminologyServer() return true to avoid errors about loinc codes

* Returned to original state as the experiment failed

* temporarily set hard coded error when no profile found

* Support required questionnaireitem groups

* bumped version n. for release

* Filter Extensions from enablewhen evaluation

* Don't evaluate Extensions when determining type of answer

* Do not force enableWhen to have system

* Corrected project dependency version numberts

* Corrected problems caused by merge

* Make this configurable

* Deleted unnecessary Inteface class

* Corrected group ids back to ca.uhn.hapi.fhir
2019-02-05 16:31:35 -05:00
James Agnew e3dd296db7 Fix flaky test hopefully? 2019-02-05 15:36:21 -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
James Agnew 4498335ae5 Elements query cleanup 2019-02-05 14:16:47 -05:00
jamesagnew c7d857df98 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2019-02-04 16:34:55 -05:00
jamesagnew d4af1ee2a3 Add tests and license headers 2019-02-04 16:34:39 -05:00
James Agnew edb79b8c6a Updates to parser dont encode elements functionality 2019-02-04 16:34:05 -05:00
James Agnew 88eb2c424e formatting 2019-02-04 13:50:47 -05:00
James Agnew 87a6c24bde More subscription logger work 2019-02-04 13:49:10 -05:00
James Agnew e401ec86e4
Enhanced elements (#1192)
Squashed merge: Add elements exclude mode

* Start working on elements enhancement

* Work on elements projection

* Work on elements filter

* Feature is now working

* Just some cleanup

* Address compile issues
2019-02-03 16:41:33 -05:00
James Agnew 447c394cac
Ja subscription debug logger (#1190)
Squashed commit adding subscription debug logger

* Work on subscription debug logger

* Add subscription logging interceptor

* Remove unneeded variables

* A bit of cleanup

* Tweak the output logs a bit

* Address review comments
2019-02-03 16:33:54 -05:00
James Agnew b928af7bc0
Merge pull request #1191 from jamesagnew/standalone-subscription-delete-fail
Standalone subscription delete fail
2019-02-03 16:32:57 -05:00
Ken Stevens 4a49a9362e just clearing the cache doesn't shut down the channel consumers. Switching to unregisterAll 2019-02-02 19:26:20 -05:00
Ken Stevens 84db66d2e3 fixed 2019-02-02 19:07:06 -05:00
Ken Stevens 37670ac039 actually, we shouldn't be trying to match on deleted resources. Corrected assertion in test. 2019-02-02 19:00:14 -05:00
Ken Stevens 4106d67eb7 ready for review 2019-02-02 18:03:09 -05:00
Ken Stevens dd0b56142d found another bug in standalone subscriptions 2019-02-02 17:14:05 -05:00
Ken Stevens 3662d080d0 Merge branch 'master' into windows-fixes-2
# Conflicts:
#	hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java
2019-02-02 13:16:23 -05:00
Ken Stevens 6616fbc9bb added CannonicalSubscription.toString() 2019-02-02 13:15:07 -05:00
jamesagnew 86a12bcf2a Credit for #1114 2019-02-02 11:33:08 -05:00
James Agnew b7ba529353
Merge pull request #1114 from zilin375/hapiFhir001
Fix NPE
2019-02-02 11:31:43 -05:00
jamesagnew ea84f2c377 Version bump hibernate search 2019-02-02 11:26:19 -05:00
Ken Stevens f40148fba5 Merge branch 'master' into windows-fixes-2
# Conflicts:
#	hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/ResourceModifiedMessage.java
#	hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/FhirObjectPrinter.java
#	hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/PointcutLatch.java
#	pom.xml
2019-02-01 16:40:49 -05:00
Ken Stevens 9280cde491
Subscription only registers active (#1189)
* Fixed a bug in standalone subscription subscriber:  It was adding REQUESTED subscriptions to the active subscription registry.  (Only ACTIVE subscriptions should be added.)
2019-02-01 10:14:46 -05:00
James Agnew 3af878201d
Merge pull request #1187 from bdenton/r4-json-like-tests
Add JSON-like tests for DSTU3 and R4
2019-01-31 16:47:26 -05:00
Ken Stevens 5ca352aeb8 Merge branch 'master' into windows-fixes-2 2019-01-31 09:52:09 -05:00
Ken Stevens 25f1afeabe Merge branch 'windows-fixes-2' of https://github.com/jamesagnew/hapi-fhir into windows-fixes-2 2019-01-31 09:50:41 -05:00
James Agnew ba225c6945
Merge pull request #1112 from bdenton/master
Enhancements to tinder generic Mojo and Ant tasks
2019-01-31 08:25:50 -05:00
jamesagnew b46b60798a Credit for #1130 2019-01-31 05:26:14 -05:00
R. Estevez (r624047) d0b33e45ae issue-1128: update versions in dependencies so that mvn clean package will be successful 2019-01-31 05:22:58 -05:00
jamesagnew db42609ca7 Credit for #1135 2019-01-31 05:20:43 -05:00
Steve Lewis c6a7c52c8c Update old removed Chef syntax in Vagrant provision
The original reported issue was due to the deprecation and removal of
`Chef::Platform.set`. This was fixed by moving to the new provider
syntax.

Other changes in the Chef cookbooks were performed to address similar
changes due to deprecated and removed methods and models as well as to
conform to new enforcements.

One issue not addressed in this change is to make the Oracle JDK
download work, since Java 8u20 is no longer available.

This fix was tested with the following override in the Vagrantfile:

java: {
  install_flavor: 'openjdk',
  jdk_version: 7
}

The above change is NOT included in this patch set. Further work
would be necessary to update the Oracle download before `vagrant up`
will work without this modification.

Fix #1123

Signed-off-by: Steve Lewis <steven.lewis@cambiahealth.com>
2019-01-31 05:17:22 -05:00
Ken Stevens 4b298fe40e Retrier now uses RetryTemplate 2019-01-30 22:34:26 -05:00
bdenton 737ee9e97c add JSON-like tests for DSTU3 and R4 2019-01-30 17:32:06 -08:00
Ken Stevens 6b601708dd Merge branch 'master' into windows-fixes-2 2019-01-30 18:01:17 -05:00
Ken Stevens adb037e805 copying over updates to helper classes 2019-01-30 17:56:47 -05:00
bdenton ca3b17f3b9 Merge remote-tracking branch 'upstream/master' 2019-01-30 12:09:25 -08:00
jamesagnew 5f29e4fbf3 Fix #1174 - Prevent serialization exception 2019-01-30 05:49:45 -05:00
jamesagnew 5d540d9208 Query optimization in JPA 2019-01-27 20:03:48 -05:00
Ken Stevens 16c44d264b reducing visibility of internal class 2019-01-27 12:50:09 -05:00
jamesagnew 503d1d8aff Subscription NPE fix 2019-01-26 18:42:01 -05:00
Ken Stevens 10c59fceeb
Subscription strategy tag (#1178)
tests pass
2019-01-25 13:01:04 -05:00
James Agnew f55be0b6d0 Test fix 2019-01-25 10:56:17 -05:00
Graham, Gary f2fa65c5ed Remove erroneous test 2019-01-24 17:20:29 -08:00
Graham, Gary 237a508d83 Allow specimen to be converted from STU3 -> STU2 2019-01-24 16:06:08 -08:00
James Agnew 38d03ea99a
Invalid ids in subscription queue (#1175)
* Start work on this

* Work on interceptors

* Attempt fix

* Avoid environment dependency

* Test fixes

* One more test fix

* One more build tweak

* Lots of cleanup

* A bit more cleanup

* Still more cleanup

* Some test fixes

* Add legacy methods temporarily

* Don't auto-scan interceptor beans

* One more test fix

* rsolve merge conflicts

* Address review comments
2019-01-23 21:17:47 -05:00
James Agnew e5723f209c
Merge pull request #1177 from jamesagnew/windows-fixes
Windows fixes
2019-01-23 19:16:10 -05:00
Ken Stevens 0eb70b81fe Oops. This was supposed to be automatically backed out. But SQUASH MERGE prevented that from happening. Hmmmmm...... 2019-01-23 18:13:29 -05:00
Ken Stevens cdd75bbe3a Merge branch 'master' into windows-fixes
# Conflicts:
#	hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/SubscriptionDeliveringRestHookSubscriber.java
2019-01-23 17:16:08 -05:00