Commit Graph

335 Commits

Author SHA1 Message Date
James Agnew 9755ae8d35 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-01 10:24:15 -04:00
James Agnew 20a16d62fe More work on bugfixing #164 - Support for :missing 2015-05-01 08:20:01 -04:00
James Agnew 3fc6958ff2 Work on #164 - Add support for :missing in JPA server 2015-04-30 19:26:26 -04:00
James Agnew 5f4a966077 Work on #164 - Improve error messages when an invalid or missing content
type header is detected for creat/update requests
2015-04-30 12:04:51 -04:00
jamesagnew f8dee1f47a Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-24 09:05:34 -04:00
James Agnew 5310d684df Add some tests 2015-04-22 17:17:52 -04:00
jamesagnew 147305b70e More work on getting HL7org structs working 2015-04-22 07:46:33 -04:00
jamesagnew b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml
2015-04-21 13:30:58 -04:00
James Agnew 4f1d2a3c75 Merging cleanup from local branch with commit from #153 2015-04-20 15:28:20 -04:00
James Agnew dfbfed2d35 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-20 14:48:18 -04:00
James Agnew 02070affbf Merge pull request #153 from mochaholic/master
Read server interceptors from the spring context.
2015-04-20 14:47:24 -04:00
James Agnew 89519faa6f Just add some unit tests 2015-04-20 12:07:52 -04:00
James Agnew b42737262b Work on HL7org structs 2015-04-20 07:31:45 -04:00
James Agnew 3db46c2db2 More work on hl7org strfucts 2015-04-15 16:37:24 -04:00
b.debeaubien addcad7749 #157 - removed published from the xml embedded into tests 2015-04-15 11:25:58 -04:00
b.debeaubien de1effbf52 #157 - removed published from dstu1 bundle, as it should only be present for bundleEntry 2015-04-15 11:10:08 -04:00
b.debeaubien 6918bb6b4b #154 - FhirTerser now uses the complete path to a resource when creating ResourceReferenceInfo entries 2015-04-09 14:06:14 -04:00
mochaholic 3003b5e17b Update to the latest upstream. 2015-04-09 07:25:09 -06:00
jamesagnew 461fdb50ce Fix #143 and fix #146 - Issues with resource references for non contained resources when parsing a DSTU2 bundle, and issues encoding contained resources when encoding JSON 2015-04-03 15:42:02 -04:00
jamesagnew 4054aa781a Fix unit test 2015-04-02 15:01:25 -04:00
James Agnew 94af375e4d Fix #116 - Preserve _include links across pages 2015-04-02 12:49:45 -04:00
James Agnew 25a9c254e3 Sync to DSTU2 again 2015-04-01 16:03:54 -04:00
James Agnew 690bcb4b68 Add support for a NarrativeModeEnum parameter to interact with
_narrative in the request URL
2015-03-27 16:52:48 -04:00
James Agnew c484425c78 Update license file generation and gitignores 2015-03-26 11:57:07 -04:00
jamesagnew 986094617a Fix #135 - Remove Eclipse and IntelliJ artifacts from version control 2015-03-26 07:56:24 -04:00
James Agnew f9b8432d65 Searching in JPA server with no search parameters returns deleted
resources when it should exclude them
2015-03-24 18:39:19 -04:00
James Agnew 0c8f50737f Sync to latest version of DSTU2 2015-03-24 17:19:34 -04:00
James Agnew c7558c7780 Fix #131 - Narrative generator incorrectly sets the Resource.text.status
to 'generated' even if the given resource type does not have a template
(and therefore no narrative is actually generated).
2015-03-24 17:18:34 -04:00
James Agnew cffda7539f Work on support for $everything operation 2015-03-23 19:06:14 -04:00
James Agnew c8a70c1904 Fix #124 - Resource references shouldn't include version when they are
encoded
2015-03-23 07:55:32 +01:00
James Agnew e84fdb33b0 Fix up some regressions caused by move to DSTU2 style include paths and
work on revincludes
2015-03-22 16:59:10 +01:00
James Agnew 596dd664f9 Switch JPA server to use new include style 2015-03-22 13:04:52 +01:00
James Agnew ce4fc46958 Fix broken unit test 2015-03-21 09:15:48 +01:00
James Agnew cc7e8c424c Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java
2015-03-21 08:58:49 +01:00
James Agnew 8f93366a43 Allow operations to work with GET 2015-03-21 01:03:57 +01:00
b.debeaubien 5956ab75fd #128 - pass RestfulServer into exception handlers so they don't need to use the possibly null RequestDetail to sort out the server and server base 2015-03-19 10:05:29 -04:00
James Agnew 5ee0286914 Fix #128 - Regression in 0.9 - Server fails with an HTTP 500 and NPE if
the client requests an unknown resource type
2015-03-19 13:51:03 +01:00
James Agnew 6020368162 Add setEncoding and setPrettyPrint methods to generic client, and add
documentation for #113
2015-03-19 12:16:04 +01:00
jamesagnew 43e2cd1653 Version bump to 1.0-SNAPSHOT 2015-03-16 09:06:53 -04:00
James Agnew adfbfcb96b Site and dist updates for 0.9 release 2015-03-13 17:59:55 -04:00
jamesagnew 3c6febb668 Preparing for 0.9 release 2015-03-13 08:34:52 -04:00
jamesagnew 745876c188 Fix unit test for #108 2015-03-12 22:19:52 -04:00
James Agnew 8434f96e97 Fix #111 - Don't return stack traces in server responses y default 2015-03-11 17:18:42 -04:00
James Agnew 4ac0ef4374 Add the ability to configure the default pretty-print and encoding for a
server
2015-03-11 14:16:32 -04:00
jamesagnew 1a4a23bdc5 Credit for #120 2015-03-11 09:11:36 -04:00
James Agnew 9a9501c53f JPA demo enhancements and site work 2015-03-10 17:56:55 -04:00
jamesagnew 009815786f Site updates 2015-03-10 08:40:15 -04:00
jamesagnew 102f509120 Merging #117 2015-03-09 19:29:54 -04:00
James Agnew 1fec2d0d67 -Accept content type of "application/fhir+xml" as XML encoding
-Correctly handle back button in testing UI for Firefox searches
2015-03-09 13:35:21 -04:00
James Agnew 7a953bf5de More work on operations support for DSTU2 2015-03-06 13:05:56 -05:00
jamesagnew b68d07b546 Work on operation support in client 2015-03-04 08:44:31 -05:00
James Agnew 533339c92c Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-03-03 18:31:22 -05:00
James Agnew fc4fb07562 Work on history suport for fluent client 2015-03-03 18:31:01 -05:00
lmds1 5225976b53 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2015-03-03 15:03:21 -05:00
James Agnew 45f30deee2 Start working on operations in client 2015-03-03 07:45:37 -05:00
James Agnew dae2a810d6 Update resource definitions for DSSTU2 2015-03-02 22:39:53 -05:00
jamesagnew a81e081798 Work on transaction support for DSTU2 2015-03-01 18:00:06 -05:00
James Agnew db65d5db59 Work on support for new bundle format in DSTU2 2015-02-27 18:09:24 -05:00
jamesagnew 6580abe5f2 Add some new tests for JPA DSTU2 operations 2015-02-27 08:45:34 -05:00
James Agnew 0f2eb230e7 More work on getting conditional updates working 2015-02-26 17:17:22 -05:00
James Agnew ecd3620e27 Add configurable default response encoding to server, and serve Binary
resources as FHIR resources instead of blobs if the user has explicitly
requested an encoding
2015-02-25 11:18:37 -05:00
jamesagnew 3812260a55 Fix #110 - Support DSTU2 Security Labels, merging in Pull Request from Mohammad Jafari - Merge branch 'master' of https://github.com/mochaholic/hapi-fhir into mochaholic-master
Conflicts:
	hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java
2015-02-24 07:49:31 -05:00
lmds1 424e6bebe4 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2015-02-23 20:02:30 -05:00
James Agnew c2a6e78e67 Add conditional deletes and updates 2015-02-23 18:27:13 -05:00
mochaholic 64715477bd Merged with the latest master snapshot. 2015-02-23 11:35:27 -07:00
James Agnew 819dc67d71 Just automated license file updates 2015-02-23 13:24:17 -05:00
James Agnew 0f01260301 Get extensions working for HL7.org structures 2015-02-20 17:34:13 -05:00
jamesagnew 70aa4e812d Work on build 2015-02-16 23:02:50 -05:00
jamesagnew e845ab7a40 Work on Android 2015-02-16 14:17:29 -05:00
jamesagnew c40a933590 Merge branch 'decouple_dstu1_structs' 2015-02-16 12:19:27 -05:00
jamesagnew 795041a514 More work on struct integration 2015-02-16 11:33:46 -05:00
jamesagnew 6012a60ccf Tests all pass on deparated structure defs! 2015-02-14 13:27:11 -05:00
James Agnew 7492b25325 More work on separating versions 2015-02-13 18:01:55 -05:00
James Agnew 86e8103657 More work on splitting out resources to different versions 2015-02-13 14:17:44 -05:00
jamesagnew 083a0baf79 Add a test for #107 2015-02-13 08:26:21 -05:00
James Agnew 35a2f852fe Start work on decoupling dstu1 structures 2015-02-12 17:32:00 -05:00
jamesagnew 46b6979125 Unescape Read ID and Version IDs 2015-02-10 14:57:16 -05:00
lmds1 0c0a014454 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2015-02-10 11:35:56 -05:00
James Agnew c8bd93ba92 Fix #101 - Calling BaseDateTimeDt#setValue(Date, TemporalPrecisionEnum) did not always actually respect the given precision when the value was encoded. Thanks to jacksonjesse for reporting! 2015-02-09 14:50:13 -05:00
James Agnew 0b726c3564 Fix compile issues 2015-02-06 16:41:34 -05:00
James Agnew f4805f83d1 Create DSTU2 project 2015-02-06 15:50:29 -05:00
James Agnew 91f8c3f26f Fix #103 - Don't encode contained resources unless they are actualy
referenced somewhere in the resource body
2015-02-05 12:07:37 -05:00
James Agnew a3be361e40 Add some tests for #82 - Not working, but we have tests at least 2015-01-29 14:37:55 -05:00
James Agnew 6c6685137f Lots of tweaks for DSTU2 support 2015-01-29 11:34:57 -05:00
jamesagnew 9bee09efcd Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-01-27 21:56:23 -05:00
James Agnew f463e0453e Merge pull request #74 from wdebeau1/master
#73 - added matchesToken method to BaseCodingDt and doesCodingListMatch ...
2015-01-27 14:57:47 -05:00
jamesagnew c36cbb893d Fix some broken unit tests and do a few documentation updates 2015-01-24 16:17:20 +01:00
jamesagnew e19e96db28 Fix #88 - Client should check which FHIR version the server implements and fail if it is incorrect for the client 2015-01-24 14:51:47 +01:00
jamesagnew 15a57242aa Fix #91 - Unable to add more than two extensions with unknown orders to a custom resource 2015-01-24 07:42:14 +01:00
jamesagnew 0898260232 Add one more test for #93 - I am unable to reproduce this issue so far; I think it may have been resolved as a result of a chackin in 0.8 2015-01-24 01:49:44 +05:30
jamesagnew cc5c014331 Fix #84 - Use multiple <contained/> tags, one for each contained resource instead of putting all contained resources in a single <contained/> tag 2015-01-24 01:39:59 +05:30
jamesagnew 18acda7be2 Get all of the unit tests passing for DSTU1/DSTU2 split 2015-01-24 01:07:09 +05:30
b.debeaubien f7209b45ef #73 - added matchesToken method to BaseCodingDt and doesCodingListMatch to TokenOrListParam 2015-01-12 08:18:36 -05:00
jamesagnew 96fe70de59 Clean up metadata parsing in XML parser 2015-01-10 13:44:40 -05:00
jamesagnew 8f8f9ed308 Server create and update methods failed with an IllegalArgumentException if the method type was a custom resource definition type (instead of a built-in HAPI type). Thanks to Neal Acharya for the analysis. 2015-01-10 07:42:46 -05:00
James Agnew 8e73705000 Work on Android binary - This commit appears huge because the License
plugin just updated the year on everything to 2015
2015-01-09 16:15:55 -05:00
James Agnew 6b3d92fde1 Cleaning up JavaDocs to allow building in Java 8 2014-12-30 16:39:38 -05:00
James Agnew 0b44a32910 Fix #69 2014-12-29 17:20:34 -05:00
jamesagnew c73e867736 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
2014-12-29 09:35:34 -05:00
jamesagnew fd8ba68e62 Implementing ETag support 2014-12-29 09:33:36 -05:00
James Agnew 81851f4808 Fix #65 - Correctly parse and encode extensions on non-repeatable
primitive fields
2014-12-23 14:10:53 -05:00
jamesagnew 31d61100db Fix #67 - Correctly parse local IDs in IdDt even if they look like real IDs 2014-12-22 22:37:24 -05:00
James Agnew 5a0ef91337 Get public server working with DSTU2 2014-12-22 12:03:02 -05:00
jamesagnew 994e49057d Lots of work on DSTU2 server 2014-12-21 18:13:37 -05:00
jamesagnew 4ca405a8fc Unit tests all pass again, elements in baseresouerce reordered 2014-12-19 09:14:40 -05:00
James Agnew c5d014e9ee More work on getting unit tests passing for DEV resources 2014-12-18 17:34:33 -05:00
jamesagnew 1f3991caf9 Bump version to 0.9-SNAPSHOT 2014-12-17 17:04:10 -05:00
jamesagnew 3963bb68e8 Merge remote-tracking branch 'origin/master' into hl7org_structs
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-12-17 16:08:59 -05:00
jamesagnew 7e8f81293e Tagging and deploying 0.8 2014-12-17 14:22:10 -05:00
James Agnew 2d5293c2ef Merge pull request #63 from wdebeau1/master
Fix for #59
2014-12-17 12:25:07 -05:00
b.debeaubien 4599ec1544 #59 - Even more sorting out profile vs id problem 2014-12-16 13:48:59 -05:00
James Agnew 3b5d4bfe52 Fix accidental failed unit tests from #60 2014-12-16 11:55:45 -05:00
James Agnew 35b5f90318 Merge remote-tracking branch 'origin/master' into hl7org_structs
Conflicts:
	hapi-fhir-structures-hl7org-dev/.gitignore
2014-12-16 11:32:58 -05:00
b.debeaubien 8865a77227 #59 - More sorting out profile vs id problem 2014-12-16 11:25:57 -05:00
James Agnew 326aa515a9 Fix #60 - Client did not correctly send charset declaration as a part of
content-type header on POST/PUT requests
2014-12-16 11:09:26 -05:00
b.debeaubien d0db838f45 #59 - More sorting out profile vs id problem 2014-12-16 09:25:12 -05:00
James Agnew 551ffb43b4 More work on DEV operations 2014-12-15 17:41:24 -05:00
lmds1 6fe4261daf added a check for null resources in auditing interceptor 2014-12-12 17:29:07 -05:00
b.debeaubien 1501b3e278 #59 - Start of sorting out profile vs id problem 2014-12-12 11:52:04 -05:00
James Agnew 2f7cbeb348 Merge branch 'hl7org_v08' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-12-11 16:07:00 -05:00
jamesagnew e1aa3f335e Unit tests all pass! 2014-12-10 22:02:31 -05:00
James Agnew 3329a0a5c0 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-12-10 15:25:10 -05:00
b.debeaubien da22349b47 Fixed bug in recursive extension scanner caused by the previous fix to the extension scanner 2014-12-10 15:24:54 -05:00
James Agnew 840e004580 Unit test refactor 2014-12-10 15:11:32 -05:00
James Agnew 8ac479b7bd Prevent profile generation issue with multiple resource definition
classes that share an extension
2014-12-10 10:40:29 -05:00
b.debeaubien 84ecec2835 Added test demonstrating that using the same extension in 2 different resources causes the profile extension scanner to throw up its hands in despair 2014-12-10 10:24:04 -05:00
James Agnew ecadd83711 Return a better error message if the server finds multiple resource
providers for the same resource type
2014-12-04 11:04:53 -05:00
James Agnew 826fa1d7c1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_PatientResourceProvider.java
	hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_SimpleRestfulServer.java
	src/changes/changes.xml
2014-12-03 13:49:19 -05:00
James Agnew 3ca9fbbebb Encoding a Binary resource without a content type set should not result
in a NullPointerException.
2014-12-03 13:46:46 -05:00
lmds1 df05f00b80 updated patient auditor to get patient name as a string from basehumannamedt 2014-12-03 13:21:23 -05:00
jamesagnew c294e1c064 Begin multi version work 2014-12-01 08:13:32 -05:00
lmds1 ed66ffebc9 added unit tests for auditing interceptor 2014-11-28 17:38:07 -05:00
lmds1 edc00091e8 merging null pointer check from v0.8-uhn-branch to master 2014-11-26 10:53:54 -05:00
lmds1 cc9f12bf31 added null check on resource mapping for conformance method bindings 2014-11-26 10:36:34 -05:00
jamesagnew 383d4929c8 Fix #57: Date/Time types should not throw exceptions for bad precision on setValue(String) but should for constructors 2014-11-25 09:14:11 +01:00
b.debeaubien 428af56c82 Fixed issue where empty narrative caused a StringIndexOutOfBoundsException
Fixed encoding issue on XmlParserTest so it'll run in windows
2014-11-21 12:19:18 -05:00
James Agnew 84c08b1684 Do not share interceptors between individual interface based client
instances

Conflicts:
	src/changes/changes.xml
2014-11-21 11:46:23 -05:00
James Agnew 51f2ce1e37 Do not share interceptors between individual interface based client
instances
2014-11-21 11:39:21 -05:00
James Agnew c0d125f288 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-11-20 16:41:42 -05:00
James Agnew 6e293a6623 More tutorial samples, as well as credit for #54 2014-11-20 16:29:10 -05:00
James Agnew 284625a1bc Merge pull request #54 from jjathman/master
Fixes #51 - cache whether or not validation was successful when the Vali...
2014-11-20 16:28:33 -05:00
lmds1 d757bc1f16 set version for all hapi projects to 0.8-uhn-branch 2014-11-20 14:48:33 -05:00
James Agnew 06a1e459d4 Returned resource objects from server methods should not be modified
while converting to a bundle
2014-11-20 14:42:24 -05:00
lmds1 57b34cd869 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-11-19 15:48:20 -05:00
lmds1 bf65cb974b added more auditors for new resource types, updates existing auditors to include subject 2014-11-19 15:48:12 -05:00
Tahura Chaudhry c95af615f1 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-11-19 14:22:35 -05:00
tahura 641e3cefd4 now adding Resources within contained to the Bundle 2014-11-19 14:19:39 -05:00
James Agnew 74b15e2295 Add a new date/time setter and update documentation 2014-11-19 11:29:33 -05:00
Joseph Athman fb4246577d fixes a test which fails if the local time zone was not EST as the output from the formatter would change the offset of the reproduced string value. 2014-11-18 22:19:50 -06:00
Joseph Athman 0cce1d21df Fixes #51 - cache whether or not validation was successful when the ValidationResult object is created so that mutations to the underlying OperationOutcome do not change the validation result success status. 2014-11-18 22:17:22 -06:00