Commit Graph

391 Commits

Author SHA1 Message Date
michael.i.calderero 125f9b4fed JsonParser tests for OverrideResourceIdWithBundleEntryFullUrl 2017-04-13 13:37:02 -05:00
michael.i.calderero b890bf3c75 XmlParser tests for OverrideResourceIdWithBundleEntryFullUrl 2017-04-13 12:09:31 -05:00
James Agnew 23b7de5dd8 More perf work 2017-04-12 18:28:10 -04:00
Sebastien Riviere e99495a83f Adding Unit tests to reproduce : Extension of Id Datatype and Extension of primitive extension lost during parsing/encoding #622 2017-04-12 10:00:32 +02:00
James Agnew 6ab1cb4c2e Fix compile issues from new version of errorprone 2017-04-03 14:43:59 -04:00
Ben Spencer 42819dba77 Fix FhirContext initialisation race condition. 2017-03-28 17:24:48 +01:00
James 40848b1beb Version bump to 2.4-SNAPSHOT 2017-03-18 12:24:39 -04:00
James e18ab206d7 Version bump to 2.3 2017-03-17 21:21:59 -04:00
James Agnew b59dd77bfc Fix compile error 2017-03-17 21:10:50 -04:00
James 8758b6f3da Updating to 1.9.0 structures
Squashed commit of the following:

commit 81edf46fe02a88851693f958e60855edfe69c04c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Mar 17 21:05:22 2017 -0400

    Work on converter

commit 3342d987008892dd3a75dddd251fe599c31c5a6c
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 08:40:37 2017 -0400

    Site updates

commit 7dcb63904ece1fcb59a09dc268e8382ac0b75535
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 08:36:39 2017 -0400

    STU3 structs working!

commit c5aec809e3f19f3fedf0aaaeab8cdd7924c144a2
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 07:05:54 2017 -0400

    Format test

commit 5033090010e8c93644505bccaa5e41ccbd756485
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 07:03:39 2017 -0400

    Merge tests for STU3

commit de40a516bfa4d2ab7f5e28e2d95815fde68bd10a
Merge: d5a5a60 899ed25
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 06:59:20 2017 -0400

    Merge branch 'master' into dstu3_latest_structs

commit d5a5a601b53d8be6712f0bfe37ba7e6eb4d3ce58
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 14 12:04:37 2017 -0400

    Latest fixes

commit ae46ad53d2075e66e3c58c1e626652b4e144f20c
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 14 06:51:59 2017 -0400

    STU3 structs passing

commit ec3b62d31131d303001f8574c58fb7a8b8194f68
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 22:20:05 2017 -0400

    Fix some tests

commit 933f9b08c32dd8671638f406a0966c5ee07d86a1
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 21:18:03 2017 -0400

    Fix test

commit 2a3ad0b422f58cfffea966a7005c6a3d86d189da
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 21:07:33 2017 -0400

    Resolve compile issues in STU3

commit fe04eba312a42c74b10a3971e4d61d58ba003bf9
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:51:35 2017 -0400

    FIx compilation error

commit 6c63a558c97cf176105967a84a0b32472c6c0fcb
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:48:13 2017 -0400

    Another STU3 struct fix

commit 6acd25458aad89aaff94768c824d4d1fcdac97ba
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:41:16 2017 -0400

    Work on STU3 structs

commit 90a476dba2665a129572ad5cbbd8dd29afd9d4c8
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:28:32 2017 -0400

    Resolve JDK8 dependencies

commit 783bc1519971e977fe7139aa1d3a2e7f37940a63
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:20:57 2017 -0400

    Fix some tests

commit 60c379175b689495e65278bb6a237af3de379aa8
Author: James <jamesagnew@gmail.com>
Date:   Sun Mar 12 19:56:29 2017 -0400

    Work on STU3 structs

commit e98c2eed6601f7009e199aca3b82399a3377077c
Author: James <jamesagnew@gmail.com>
Date:   Sun Mar 12 19:41:48 2017 -0400

    Work on DSTU3 structures

commit 3ce909212bf0f11561b8342d406cffcf957afeb3
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 7 21:03:14 2017 -0500

    Work up upgrading structs
2017-03-17 21:06:12 -04:00
James Agnew 45e4bd92ee Merge branch 'master' into jaxrs-sever-evolution 2017-03-16 22:04:55 -04:00
James 5282110f02 Tests for #142 2017-03-16 22:00:04 -04:00
James Agnew 01d102accc Correct handling of contained resources in a response for annotation
client
2017-03-01 17:23:31 -05:00
James f1828d1ca8 Fix handling of filters on valueset expansions 2017-02-10 11:05:59 -05:00
Sebastien Riviere c3447c3b4d Remove substitution string to use relative url, Fix client parser and custom extension. 2017-02-08 11:14:19 +01:00
James cb8492d353 Fix occasionally failing test 2017-02-07 20:10:06 -05:00
James a665aed85d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-02-07 07:01:59 -05:00
James b7f165019d Tweak re-indexing 2017-02-07 07:00:51 -05:00
James Agnew c836a8905e Add test for #551 2017-02-06 11:48:19 -05:00
Sebastien Riviere 3bf6555d61 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir into jaxrs-sever-evolution 2017-02-06 11:34:31 +01:00
James 7149d2e053 Merge branch 'custom_jpa_search_params' 2017-02-04 16:34:05 -05:00
James dd0e47afc3 Make projects import cleanly into eclipse 2017-02-04 16:31:18 -05:00
James Agnew 3f8a8cd8aa Merge pull request #548 from sekaijin/cleanup
Cleanup
2017-02-04 16:02:50 -05:00
James b4a362b8ee Work in progress 2017-02-01 05:55:35 -05:00
James b66aa9761e Allow parsing of RSQuot 2017-01-29 15:49:10 -05:00
sekaijin a150a96089 dependencies convergence
correct dependencies convergence
correct version use ${project.version}
2017-01-29 19:22:28 +01:00
sekaijin 23784c1619 remove .settings .project .classpath file of eclipse 2017-01-28 17:13:47 +01:00
Sebastien Riviere dabb3ea2c5 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir into jaxrs-sever-evolution
# Conflicts:
#	hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java
2017-01-27 10:16:43 +01:00
James 12598b4e3b Correctly handle declared extensions with multiple possible types
Squashed commit of the following:

commit d6ea0552b7
Author: James <jamesagnew@gmail.com>
Date:   Thu Jan 26 09:04:58 2017 -0500

    FIx test

commit e5876f7d86
Author: James <jamesagnew@gmail.com>
Date:   Thu Jan 26 08:35:38 2017 -0500

    Work on extensison

commit 7e573c2299
Author: James <jamesagnew@gmail.com>
Date:   Thu Jan 26 07:27:25 2017 -0500

    Work on extensions

commit 234b4a0c1c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jan 26 06:25:47 2017 -0500

    More work on these extensison

commit 2eb780a690
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed Jan 25 22:35:57 2017 -0500

    Work on multitype extensions
2017-01-26 11:07:52 -05:00
James Agnew 589804d974 Add test 2017-01-24 13:57:15 -05:00
James Agnew 344e324929 Fix #544
Squashed commit of the following:

commit 1ab9b58e9f
Author: James Agnew <jamesagnew@gmail.com>
Date:   Tue Jan 24 10:46:56 2017 -0500

    Changes working now

commit 5c752cdace
Author: James <jamesagnew@gmail.com>
Date:   Tue Jan 24 08:43:04 2017 -0500

    Get JPA working with new uuid: logic

commit 127b76884a
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jan 23 21:11:18 2017 -0500

    Fix test

commit 599bbe236c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jan 23 18:42:46 2017 -0500

    Work on #544
2017-01-24 10:47:24 -05:00
James Agnew d1542e98c5 JPA server was not correctly validating and expanding SCT codes 2017-01-19 17:37:43 -05:00
James Agnew 64e3435a8e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2017-01-19 15:50:48 -05:00
James Agnew e342d211d1 Add some logging and a test 2017-01-19 15:50:41 -05:00
Sebastien Riviere 13646168f0 Use the profile of the datatype if available, intead of the default hl7.org url 2017-01-19 14:55:42 +01:00
Sebastien Riviere cac44c736c Add the possibility to use the serverBaseUrl to generate the url of extension, if %BASE_SERVER_URL% is found 2017-01-19 14:54:17 +01:00
James 06f9d86bf1 Fix bad dependency 2017-01-18 22:26:10 -05:00
James Agnew b80897d16c Add warnign to DateType 2017-01-18 22:12:48 -05:00
James Agnew 322051a383 Fix failing tests 2017-01-14 07:55:42 -06:00
James Agnew dbc6abc658 Fix #504 - Error if custom type has illegal extensions 2017-01-13 21:46:16 -06:00
James Agnew fa1ad5ba85 Fix #519 - Issues with JPA capabilitystatement related to the _id param 2017-01-13 21:19:19 -06:00
James Agnew f9aa8c3ba4 Add test for #531 2017-01-13 11:35:15 -05:00
James b448e13edd Version bump to 2.3 2016-12-20 19:01:31 -05:00
James 0ec61533a8 Publish 2.2 2016-12-20 19:00:37 -05:00
James Agnew 750d6d4655 Switch public server to use CapabilityStatement for metadata return type 2016-12-20 15:35:54 -05:00
James 18e47c2130 More validator tests 2016-12-20 09:30:46 -05:00
James 964919d880 Improve parsing 2016-12-19 14:03:11 -05:00
James 88117f8d6e Port in changes from RI 2016-12-12 07:32:53 -05:00
James e30d478bf6 Add suggested test for #523 2016-12-12 07:25:10 -05:00
James ab17ee68a3 Revert IFhirVersion method signature changes for #520 2016-12-11 18:55:59 -05:00
James a2b24d4d07 Fix compile error 2016-12-11 18:27:10 -05:00
James Agnew 2bca44eb1e Merge pull request #523 from CarthageKing/master
ensure ElementDefinition properties with longer names are processed first in order to find the property that most matches the given nodeName
2016-12-11 18:12:46 -05:00
James 9cb014724b Add validator for DSTU2.1 2016-12-11 17:39:05 -05:00
James 901a85880c Update STU3 definitions and being in STU2.1 defs too 2016-12-10 19:51:25 -05:00
James b0d656e5d9 Refactor fix for #520 a bit so that version in DSTU3 is always pulled
from the model
2016-12-10 14:40:27 -05:00
James ee63bbea74 Fix #516 - Handle STU3 invalid enum values with an appropriate exception 2016-12-10 14:14:22 -05:00
James Agnew 0def3d5a72 Merge pull request #525 from aehrc/feature/parser_exception_handling
#516 Report invalid values for enums through parser error handler
2016-12-10 07:39:36 -05:00
James 5149e581db Fix #521 - Wrong or missing ID body in update should be an error 2016-12-08 08:31:52 -05:00
Michael Lawley a9a3507544 #516 Report invalid values for enums through parser error handler 2016-12-06 10:32:23 +10:00
michael.i.calderero 7a203fa7d5 ensure ElementDefinition properties with longer names are processed
first in order to find the property that most matches the given nodeName
2016-12-02 21:42:09 -06:00
James Agnew a9d7b8d636 Add test and credit for #518 2016-11-25 18:28:18 -05:00
James Agnew 81773de261 Fix #276 - Prevent contained resources being encoded as duplicates 2016-11-25 17:18:57 -05:00
jamesagnew 69871bb8c2 Improve testing on CorsInterceptor 2016-11-24 19:25:37 -05:00
James 233e979963 Fix build 2016-11-22 06:33:20 -05:00
James Agnew 888f42a032 Introduce new CORS interceptor and switch examples to use it 2016-11-21 18:30:51 +01:00
James Agnew 03935be97f Work on common FluentPath interface 2016-11-21 15:52:17 +01:00
James Agnew 5846ce4518 Make the parser configurable so that when parsing an invalid empty value (e.g. {"status":""} parser will either throw a meaningful exception or log a warning depending on the configured error handler. 2016-11-21 14:48:44 +01:00
James Agnew bf35f7e4b2 Fix #495 - Auto-detect DSTU3 mode when those resources are on classpath 2016-11-21 13:44:54 +01:00
James Agnew ba896e2553 Clean up CORS 2016-11-21 13:37:59 +01:00
James Agnew 72a62817aa Improve detection for #477 2016-11-15 05:54:56 -05:00
James Agnew 4252415e9c Fix #477 - Gracefully handle unexpected elements starting with _ 2016-11-15 05:44:45 -05:00
James 2d7592f7a8 Version bump to 2.2-SNAPSHOT 2016-11-11 22:39:45 -05:00
James 2dd26b6367 Version bump to 2.1 2016-11-11 15:16:53 -05:00
James Agnew a03805a6d4 Clean up patch client 2016-11-11 15:08:16 -05:00
James a5d5d3e031 Bump FHR version 2016-11-06 17:34:13 -05:00
James 8c53ad24f7 Clean up authorization interceptor tests 2016-11-03 08:10:54 -04:00
James 3a5a771de7 Fix #484 - Correctly parse resources containing an empty div tag as the narrative 2016-11-03 07:51:11 -04:00
James Agnew f5bec16cb4 Fix tests for #472 2016-10-26 14:10:43 -04:00
James Agnew a67171e231 Fix #472 - Wrong header being returned (Content-Location instead of
Location) on STU3 server
2016-10-26 12:12:19 -04:00
James Agnew f80bf98dcd Fix #327 - Correctly serialize JSON extension with a reference to a
contained resource
2016-10-14 16:36:29 -04:00
James Agnew e56c75e80c Switch Android library to use OkHttp by default 2016-10-14 16:15:27 -04:00
James Agnew deae820ebe Fix up comnpile issue 2016-10-12 15:29:40 -04:00
James Agnew 97cd78e6bf Fix #454 - Chinese characters were not being correctly normalized 2016-10-12 12:50:56 -04:00
James Agnew 11d3ae9447 Fix #411 - Searching by POST with urlencoded parameters doesn't work if
interceptors are accessing the parameters and there is are also
parameters on the URL
2016-10-06 13:23:32 -04:00
James Agnew f5eda76388 Use new STU3 mimetypes by default 2016-10-06 12:17:59 -04:00
James Agnew 1fd881d8f8 Return an error if a parameter is called with a chain even though it
doesn't support chaining
2016-10-04 17:02:13 -04:00
James Agnew 26cd316343 Fix #414: Parser should not choke with a NullPointerException if it
encounters an extension without a URL
2016-09-30 17:35:29 -04:00
James Agnew 8b80d932da Fix #443 - XhtmlNode.equalsDeep() did not work 2016-09-29 15:00:01 -04:00
James Agnew 5da1d22d02 Docs 2016-09-28 17:04:55 -04:00
James Agnew 8a9a031a8d Fix uploading CLI DSTU2 examples 2016-09-28 16:25:01 -04:00
James Agnew 090f079442 Try to fix race conditions in tests 2016-09-26 12:56:37 -04:00
James Agnew cb31e706c7 Add test for #411 2016-09-26 10:50:04 -04:00
James 714adcd4be Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-09-22 21:55:11 -04:00
James 3428aa40f3 Logging changes 2016-09-22 21:55:05 -04:00
James Agnew 3d73aad275 Fix unit tests 2016-09-21 16:58:57 -04:00
James Agnew ae97165a0a Add interceptor method on server which will be called after all other
processing
2016-09-18 16:08:16 -04:00
James Agnew b20a5e6b90 Bundles for history did not validate 2016-09-18 10:28:24 -04:00
James Agnew 40286f49c2 Merge branch 'patch' of github.com:jamesagnew/hapi-fhir into patch 2016-09-17 23:40:54 -04:00
James Agnew 1343badba4 Working on patch 2016-09-17 13:40:03 -04:00
James Agnew 364c18e06e Use more compatible Accept header in STU3 client. Also fixes missing
Woodstox library in android builds per #450)
2016-09-16 23:46:06 -04:00
James Agnew f92c5a7232 Fix #446 - Don't give child resources the ID of the parent 2016-09-16 15:01:14 -04:00
James Agnew 12790d385c Fix #445 - Server was using the wrong mimetype for conf statement 2016-09-16 13:25:03 -04:00
James Agnew a2ffc6af05 Fix #444 - Correct handling of parsing milliseconds in dates before 1970 2016-09-09 18:18:28 -04:00
James Agnew d41b412dee Fix #440 - Don't depend on Saxon 2016-09-08 15:56:15 -04:00
James Agnew 202a1ea885 Fix web testing UI regression 2016-09-06 17:59:04 -04:00
James Agnew 98e0753b93 Properly add include resources 2016-08-30 16:38:09 -04:00
James Agnew 906bcfb803 Version bump to 2.1 2016-08-30 10:55:55 -04:00
James Agnew d27aad487e Bump to 2.0 release 2016-08-30 10:50:04 -04:00
James 333aa0afde Correctly update versions on transactipn update 2016-08-28 22:56:59 -04:00
James ddc0abe4ed Update to final STU3 ballot definitions 2016-08-26 07:55:10 -04:00
James Agnew a1105fac1e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-08-25 18:27:32 -04:00
James Agnew 17940b8a24 Improve performance when parsing contained resources 2016-08-25 17:41:33 -04:00
James acdbdc0be7 Fix #426 - Extension with datatype of ID failed to parse 2016-08-25 07:32:37 -04:00
James Agnew c4d302df8d Upgrade to Thymeleaf 3 2016-08-23 19:11:49 -04:00
James Agnew 82da79cd5f Add a new test 2016-08-23 13:49:31 -04:00
James Agnew cc6c32f987 Fix tests 2016-08-22 09:43:01 -04:00
James Agnew 7f15520db8 Don't include Location header in server responses for DSTU3 servers 2016-08-21 11:39:44 -07:00
James Agnew da8abca1ff Add custom extension example 2016-08-21 10:24:42 -07:00
James Agnew 379abb8e47 Don't strip urn: prefixes from references when encoding 2016-08-16 11:23:07 -07:00
James Agnew eee168ced6 Add support for conditional operations to AuthorizationInterceptor 2016-08-15 13:35:50 -04:00
James b0d19c3a65 Fix #423 - Encode custom types with custom type fields correctly 2016-08-14 13:05:16 -04:00
James Agnew 8354f4b565 Use correct accept header 2016-08-05 18:39:44 -04:00
James Agnew 74950a4efc Fix regression when parsing contained resources 2016-08-05 18:01:44 -04:00
James Agnew a3f4864bd6 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-08-05 12:37:06 -04:00
James Agnew 3e7cd153fd Update DSTU3 definitions to latest 2016-08-05 12:36:41 -04:00
jamesagnew 545b359697 Fix #406 - Allow arbitrary authentication realm 2016-08-01 21:36:50 -04:00
James Agnew dd8b1cd979 Use corrrect types from client 2016-07-27 18:15:09 -04:00
jamesagnew 7dbd5a21ca Fix tests 2016-07-24 09:20:54 -04:00
jamesagnew a9b29d5088 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-23 18:51:08 -04:00
jamesagnew 350e82b6cf Fix #403 - Allow references to keep versions when encoding 2016-07-23 18:48:00 -04:00
James Agnew 748c13d0dc Remove bad dependency 2016-07-22 18:33:16 -04:00
James Agnew 7bea8431f7 Add interceptor for rejecting TRACE and other invalid verbs 2016-07-19 19:16:09 -04:00
jamesagnew 5073692eda Always include SUBSETTED tag when _elements is used on server 2016-07-18 07:05:11 -04:00
jamesagnew 196c11bfa2 Use new style mimetypes but keep supportuing the old ones as well 2016-07-17 18:35:06 -04:00
jamesagnew ef1c81e241 Fix #150 - Don't encode null fluent client values 2016-07-14 07:18:48 -04:00
James Agnew 0b69367b11 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-13 09:22:19 -04:00
jamesagnew 5b46e9655a Fix compile errors 2016-07-13 07:59:08 -04:00
jamesagnew fa37afb61f Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-12 21:44:52 -04:00
jamesagnew ed941a116b Update to use GSON 2016-07-12 21:44:40 -04:00
James Agnew c550681aeb Update defs to 1.5.0 versions 2016-07-12 18:29:10 -04:00
James Agnew c3e9f618eb Version bump to 2.0-SNAPSHOT 2016-07-12 11:12:07 -04:00
jamesagnew acaf2135c5 Finalize 1.6 release 2016-07-06 07:29:20 -04:00
James Agnew 74feb38085 Fix test regression 2016-07-05 17:30:14 -04:00
James Agnew d63e289cbe Validation fixes 2016-07-05 16:56:06 -04:00
James Agnew 9226e43090 Fix tests 2016-07-05 09:57:55 -04:00
James Agnew a8585c881d Fix #396 - Make tests timezone independent 2016-07-04 13:48:05 -04:00
jamesagnew 32bdd14639 Work on term service 2016-07-02 17:14:36 -04:00
jamesagnew 4a49e5b7f9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-01 14:31:25 -04:00
James Agnew 38d30eef49 Respect order for order=REPLACE_PARENT 2016-06-29 10:26:36 -04:00
James Agnew 1eb1dc7e36 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-06-29 09:56:12 -04:00