Commit Graph

954 Commits

Author SHA1 Message Date
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
James Agnew 5cf5bb0473 Fix #167 - Rename "myEntityManagerFactory" to just
"entityManagerFactory" as this is the default expected in some spots in
Spring
2015-04-30 09:36:14 -04:00
James Agnew cb7d94841e Fix #168 - Client conformance check should use any registered client
interceptors
2015-04-29 20:02:01 -04:00
James Agnew b68ce95b3f Fix #36 - Allow removal of extensions 2015-04-28 13:58:22 -04:00
James Agnew 3a1cc48048 Fix broken unit test and allow invalid dates in web testewr UI 2015-04-28 10:33:14 -04:00
James Agnew 5e8fe01af1 Allow fluent client users to execute a transaction using a string as
input
2015-04-27 13:19:40 -04:00
jamesagnew f8dee1f47a Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-24 09:05:34 -04:00
jamesagnew 3d00800212 Fix #163 - Parser doesn't populate resource ID's Resource type 2015-04-23 22:19:04 -04:00
jamesagnew e6d087b1f6 Add docs to explain #161 2015-04-23 21:46:49 -04:00
James Agnew 7db7097e25 Fix #162 - Allow web testing UI to configure the client 2015-04-23 17:52:51 -04:00
James Agnew 8072ca1bc1 Do HTTP post for tester UI create/updates 2015-04-23 16:57:50 -04:00
jamesagnew 5bcd6a4751 Don't include an mpty text element in Bundles being returned by the server 2015-04-23 08:04:05 -04:00
James Agnew e18433d709 Trying to remove empty text node 2015-04-22 17:45:00 -04:00
James Agnew 37ed62f863 Add advanced JPA example 2015-04-22 10:08:33 -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 91167733c6 Don't return a Content-Location header when returning the new bundle
format
2015-04-20 17:32:20 -04:00
James Agnew 4f1d2a3c75 Merging cleanup from local branch with commit from #153 2015-04-20 15:28:20 -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 b42737262b Work on HL7org structs 2015-04-20 07:31:45 -04:00
James Agnew eddcf5f4d8 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-15 16:37:35 -04:00
James Agnew 3db46c2db2 More work on hl7org strfucts 2015-04-15 16:37:24 -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
James Agnew 41c215efe2 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-15 10:57:43 -04:00
James Agnew ddd68b8d57 Credit for #155 2015-04-15 10:57:15 -04:00
James Agnew 7f7ff5c936 Merge pull request #155 from wdebeau1/master
#154 - FhirTerser now uses the complete path to a resource when creating...
2015-04-15 10:48:52 -04:00
jamesagnew cfff2006ec More work on HL7org structs 2015-04-15 07:49:18 -04:00
jamesagnew 2edc7eadab Work on HL7.org structs 2015-04-13 08:32:49 -04:00
jamesagnew b6f2b57ed9 Work on HL7 structs 2015-04-10 08:02:05 -04:00
jamesagnew 8c873ef023 Remove hard coded persistence context name 2015-04-09 21:44:18 -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
mochaholic e4b5943314 Merge remote-tracking branch 'origin/master'
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
2015-04-09 07:24:40 -06:00
jamesagnew 11507ef97c Fix #148 - Add _count support to everything operation 2015-04-05 14:53:15 -04:00
jamesagnew 8c37973a78 Fix #147 - no duplicates in 'everything' operation 2015-04-04 23:36:04 -04: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
James Agnew 29140691d1 Add a bit of documentation to note the inclusion of #138 2015-04-02 13:06:17 -04:00
James Agnew 94af375e4d Fix #116 - Preserve _include links across pages 2015-04-02 12:49:45 -04:00
jamesagnew e63323ca5c Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-01 21:46:49 -04:00
James Agnew 065b87c31e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-04-01 16:29:04 -04:00
James Agnew 25a9c254e3 Sync to DSTU2 again 2015-04-01 16:03:54 -04:00
b.debeaubien 243b9a71a4 #138 - rewrote to always use super's address base, then fixup the host name and protocol 2015-03-31 12:53:40 -04:00
b.debeaubien d111d19071 #138 - if x-forwarded-proto is set, use that 2015-03-30 17:23:50 -04:00
b.debeaubien dbc944f4fc #138 - AddressStrategy that can cope with addresses proxied by Apache http server 2015-03-30 12:20:47 -04:00
jamesagnew d6e8b66301 Add Google Errorprone compiler to build 2015-03-28 19:28:34 -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 4426080374 Documentaiton on idempotence 2015-03-21 09:12:41 +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 1c46989d00 Fix unit test failure 2015-03-19 13:26:16 +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
James Agnew 95d5503a9a Fix #113 - Handle contained resources with non-local IDs 2015-03-19 11:49:25 +01:00
James Agnew c3877c1da9 Add tests for operations 2015-03-19 06:03:23 -04:00
James Agnew 75877c18eb Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-03-17 10:03:51 -04:00
jamesagnew 577f26cb74 Version bump a few dependencies 2015-03-17 08:11:42 -04:00
James Agnew 823bb4ed82 Add support for profiles and tags in meta for DSTU2 2015-03-16 17:02:44 -04:00
jamesagnew 43e2cd1653 Version bump to 1.0-SNAPSHOT 2015-03-16 09:06:53 -04:00
jamesagnew faf7c410e1 Fix transaction parsing bug for DSTU2 using old Bundle format. Finalize documentation for 0.9 2015-03-14 15:06:32 -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 7540203836 Fix #108 - Don't check the server version from the client until the first actual request 2015-03-12 22:15:15 -04:00
b.debeaubien bac290bc89 #77 - Fixed wildcard string compare that was breaking inclusion 2015-03-12 10:32:22 -04:00
James Agnew 7f9b1baa14 Fix build problem 2015-03-11 22:31:20 -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
James Agnew a2e562de64 Implement sorting on _id and clean up create/update semantics for DSTU2 2015-03-11 12:49:47 -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
jamesagnew 2ca0b5e85b Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-03-09 19:21:18 -04:00
jamesagnew 4682f953bc Fix #122 - Thanks to Ryan for reporting! 2015-03-09 19:20:48 -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
jamesagnew 5fd987c497 Work on sort support in JPA 2015-03-09 08:01:13 -04:00
jamesagnew da1d49a108 Correctly index Observation.applies[x] in JPA server 2015-03-08 16:55:42 -04:00
jamesagnew 32ad3ab22c Complete Extended Operations support 2015-03-08 15:40:04 -04:00
jamesagnew 06ea9a1453 More work on operation support for DSTU2 2015-03-06 17:55:35 -05:00
James Agnew 7a953bf5de More work on operations support for DSTU2 2015-03-06 13:05:56 -05:00
jamesagnew 967d44326b Reinstate DEV structures for now 2015-03-05 08:37:50 -05:00
James Agnew 082b9cfc4b Performance enhancements 2015-03-04 13:50:58 -05:00
jamesagnew b68d07b546 Work on operation support in client 2015-03-04 08:44:31 -05:00
James Agnew fc4fb07562 Work on history suport for fluent client 2015-03-03 18:31:01 -05:00
jamesagnew 27e126254c More work on operations in client 2015-03-03 08:22:26 -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
James Agnew 722f08de13 Site updates 2015-03-02 17:04:09 -05:00
James Agnew 748efc4a97 Site updates 2015-03-02 06:56:16 -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
mochaholic 8a2f9ff983 Fixed this bug: the security labels wouldn't be encoded if versionId or lastUpdated weren't present. 2015-02-23 21:10:38 -07: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
mochaholic 9cd005e9e3 Merged with the latest master snapshot. 2015-02-23 09:14:29 -07:00
jamesagnew 315ad439e4 Work on adding conditional HTTP operations to client and JPA server 2015-02-23 09:08:59 -05:00
mochaholic c13b0363dd Merged with the latest master snapshot. 2015-02-21 23:57:47 -07:00
James Agnew 0f01260301 Get extensions working for HL7.org structures 2015-02-20 17:34:13 -05:00
mochaholic 31d4dcdb90 Added preliminary support for DSTU2-style security labels. 2015-02-19 18:14:02 -07:00
James Agnew cf3a78ecd2 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-19 10:27:52 -05:00
jamesagnew 4f93ab9313 Work on JPA Transaction for DSTU2 2015-02-18 22:23:46 -05:00
James Agnew dbeb6c09c6 More work on new structures 2015-02-18 17:00:47 -05:00
James Agnew 7d62951f71 Fix the build for real! 2015-02-17 16:06:28 -05:00
jamesagnew 3631160269 Fix build 2015-02-17 13:54:26 -05:00
jamesagnew 7e1f9cfdbf More work on new bundle type 2015-02-17 08:45:40 -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 795041a514 More work on struct integration 2015-02-16 11:33:46 -05:00
jamesagnew 6a036dabe5 Remove most valuesets out of core 2015-02-14 16:14:52 -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
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
jamesagnew 9828d27eec Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-09 22:26:17 -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
jamesagnew 5600ba6763 Implement DSTU2 transaction semantics in JPA 2015-02-08 19:21:29 -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 37e2abb4e2 Fix #100 - HAPI failed to initialize in an environment without Woodstox
on the classpath. Will deploy a new snapshot shortly.
2015-02-04 14:15:11 -05:00
James Agnew a474870a1e Work on JPA example 2015-02-03 17:53:22 -05:00
James Agnew 309ba79c6f Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-03 10:40:25 -05:00
James Agnew 3249b0cb12 Merge pull request #97 from twilson650/patch-2
Update DateClientParam.java
2015-02-03 10:36:59 -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 af8bf42e1d Fix reression from #86 2015-01-28 07:52:47 -05:00
jamesagnew 9bee09efcd Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-01-27 21:56:23 -05:00
James Agnew 84cea27f44 Merge pull request #86 from harsha89/master
extracting request path generating code to protected method in order to ...
2015-01-27 17:49:58 -05:00
James Agnew 1f9d9a7957 Merge pull request #78 from ahenket/patch-2
Update RestfulServer.java
2015-01-27 15:04:39 -05:00
James Agnew 8f52954ec9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-01-27 14:59:42 -05:00
James Agnew d3d242bc7e Documentation updates 2015-01-27 14:59:10 -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
Tom Wilson 8eb659cf27 Update DateClientParam.java
method "second" has been using DAY precision.
2015-01-26 13:17:22 -08: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 aa8684c977 Working on #89 - Won't mark it until server is redeployed though 2015-01-24 13:01:32 +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 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
harsha89 4c998d2f1b extracting request path generating code to protected method in order to users to have their own mapping to FHIR HAPI rest server #85 2015-01-15 14:45:21 +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 6dfb5d03e4 Remove redundant <meta/> element from XML resource encoding 2015-01-10 11:18:42 -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
jamesagnew 1063b6cf1e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-01-09 22:02:56 -05:00
jamesagnew fb5a775fbd Add support for bundle entry states 2015-01-09 22:02:31 -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
Alexander Henket 261ed51c7f Update RestfulServer.java
I believe that in line 538 you are falsely assuming that multiple _* parts in the path could not happen. As of DSTU2 there's _meta/_delete. Unfortunately the DSTU for Comment erroneously lists _meta-delete.
2015-01-07 13:24:28 +01:00
jamesagnew 1fd3bd93b1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-01-05 21:19:58 -05:00
jamesagnew f1c151b2f5 Documentation 2015-01-05 21:19:47 -05:00
James Agnew c786b00950 Add status to bundle entries 2015-01-05 17:57:35 -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 b856c2386b Better logging for public server 2014-12-23 15:44:54 -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
James Agnew 81f9e492f3 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	src/changes/changes.xml
2014-12-23 09:43:46 -05:00
James Agnew c8adab5452 Better logging in JPA 2014-12-23 09:42:16 -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 a044eb51d7 Working on binary resources in DEV 2014-12-18 08:21:07 -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
jamesagnew a46183ddb8 Add some documentation for #59 2014-12-17 12:40:22 -05:00
James Agnew 2d5293c2ef Merge pull request #63 from wdebeau1/master
Fix for #59
2014-12-17 12:25:07 -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
jamesagnew 59ba1c9f7b Almost have unit tests passing 2014-12-14 22:29:15 -05:00
jamesagnew ebd0f222f4 Remove artifacts from merge 2014-12-13 13:03:38 -05:00
James Agnew e2aea7d1b2 More merging 2014-12-12 17:18:13 -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 d8e14e4213 ...more work on HL7 structs 2014-12-10 17:40:47 -05:00
James Agnew ec8fdc7d68 More work on HL7.org structs 2014-12-10 14:28:25 -05:00
James Agnew 463fe249e6 Merge remote-tracking branch 'origin/master' into hl7org_structs 2014-12-10 11:09:44 -05:00
James Agnew c4c26e482f Fix a compile issue reported by Bill de Beaubien 2014-12-10 10:17:33 -05:00
jamesagnew 26e60b1b85 More work on hl7.org structs 2014-12-10 09:25:15 -05:00
jamesagnew cee02ea605 More structures work from hl7 2014-12-09 08:24:35 -05:00
James Agnew 45e48c62bf More structures work 2014-12-05 18:06:25 -05:00
James Agnew c901330583 Fix build failure 2014-12-04 11:41:13 -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 a346219930 Just some work on the structs 2014-12-03 17:41:32 -05:00
James Agnew 29dab8bad9 Messing around with the POM to try and get android working 2014-12-03 17:09:13 -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
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
James Agnew 028c349d10 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-11-21 12:24:40 -05:00
James Agnew 24595ca6db Documentation updates 2014-11-21 12:24:31 -05: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 51f2ce1e37 Do not share interceptors between individual interface based client
instances
2014-11-21 11:39:21 -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
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
James Agnew 87b5ac2449 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-11-20 10:16:18 -05:00
James Agnew 39cddf59ac More tutorial code 2014-11-20 10:15:58 -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
jamesagnew 8264f06ef7 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-11-19 07:28:30 -05:00
jamesagnew c01e2021d0 Documentation and samples 2014-11-19 07:27:52 -05: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
James Agnew 7ca4bc30d2 Dont overwrite absolute IDs in the server 2014-11-18 14:29:57 -05:00
James Agnew d8fa4696d9 Merge pull request #53 from petromykhailysyn/master
In DateDt DEFAULT_PRECISION was added to default constructor.
2014-11-18 13:55:03 -05:00
James Agnew 14a8f4f4cf JPA module now handles search params with | in them - More work on #52 2014-11-18 13:11:05 -05:00
petromykhailyshyn e253d166c7 In DateDt DEFAULT_PRECISION was added to default constructor. 2014-11-18 16:21:54 +02:00
James Agnew 93c34fdbbe Fix issue #52 - JPA module won't save resource types with empty path
search params
2014-11-17 16:58:34 -05:00
jamesagnew 23de3c53b7 Merge branch 'issue50'
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java
2014-11-17 14:41:27 -05:00
jamesagnew 1b7586f7ed Fix #50 - Primitive datatypes now retain their textual values as well as the "parsed" values 2014-11-16 21:38:25 -05:00
James Agnew cfcad3aabf More work on #50, almosty have all primitives done 2014-11-14 14:58:54 -05:00
James Agnew e2d59ef5ba Add unit test for BaseDateTimeDt 2014-11-14 14:36:26 -05:00
James Agnew d09e735a3d Start work on #50 2014-11-14 10:52:38 -05:00
lmds1 71b5c7d875 replaced files with trival changes with current version from master 2014-11-13 18:34:25 -05:00
lmds1 5074da9002 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-11-13 18:11:38 -05:00
James Agnew 9fe80dfee1 Cleanup some unused files and warnings 2014-11-13 15:53:52 -05:00
lmds1 66ddd25eb7 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-11-12 19:18:14 -05:00
lmds1 7e224d3ca1 Fixed POST parameter processing for long input and includes, removed extra unused param from IParameter.translateClientArgumentIntoQueryArgument 2014-11-12 19:16:26 -05:00
lmds1 40d127b274 removed unused import 2014-11-12 18:09:25 -05:00
lmds1 01878f0ad2 removed unused import from IResource 2014-11-12 18:08:27 -05:00
lmds1 fd60715e14 removed dependency on javax.xml.bind.DatatypeConverter for parsing dates to avoid XML parser conflicts 2014-11-12 18:05:25 -05:00
James Agnew 374d95ea76 Merge pull request #49 from wdebeau1/master
Added @Destroy annotation, which allows ResourceProviders to do cleanup ...
2014-11-11 14:05:50 -05:00
lmds1 039e5655a8 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
Conflicts:
	hapi-tinder-plugin/src/main/resources/vm/resource.vm
	hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
2014-11-10 18:17:29 -05:00
lmds1 5f3a366ab0 updated IResourceAuditor interface 2014-11-10 18:09:11 -05:00
James Agnew 4dcfdc88fd Fix build issues 2014-11-10 18:08:08 -05:00
b.debeaubien 21d058f86b Added @Destroy annotation, which allows ResourceProviders to do cleanup when the server shuts down; renamed "ResfulServer" tests to "RestfulServer" 2014-11-10 17:50:49 -05:00
James Agnew 479c09b174 Fix failure to parse child of type "any" for code values 2014-11-10 17:33:45 -05:00
James Agnew 030ad3934c DOcumentation updates 2014-11-10 10:59:48 -05:00
jamesagnew fcb9a80bbc DateRangeParam now correctly handles requests containing a single date 2014-11-08 12:17:42 -05:00
jamesagnew 450b270c00 Fix compile issues in previous merge 2014-11-08 11:18:04 -05:00
jamesagnew 66bb291e04 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	examples/pom.xml.orig
	hapi-deployable-pom/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
	hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
	hapi-fhir-structures-dev/.gitignore
	hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/CustomObservation.java
	hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java
	hapi-tinder-plugin/src/main/resources/vm/resource.vm
	hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
	pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/.settings/org.eclipse.wst.common.component.orig
	src/changes/changes.xml
	src/site/resources/svg/restful-server-interceptors.svg
	src/site/site.xml
2014-11-08 10:58:35 -05:00
jamesagnew 5c9cf8ddf8 More merging cleanup 2014-11-08 10:38:25 -05:00
jamesagnew d1fb878c55 Merging 2014-11-08 10:36:27 -05:00
James Agnew d22a35788f Implement handleException on the server interceptor framework, as well
as some site and documentation enhancements
2014-11-07 14:26:59 -05:00
b.debeaubien 8f704030ed Added RES_ID property to BaseResource to facilitate searching for resources based on _id. 2014-11-07 12:24:16 -05:00
lmds1 f303e174fc Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-11-04 17:32:00 -05:00
lmds1 b227d9ff99 changed iResource to return a String resourcename instead of an enum (to be used for auditing), moved audit classes from base to dstu so they can access dstu classes, updated templates to add new method to generated resources 2014-11-04 17:31:53 -05:00
James Agnew 4e769da4ca Give securityevent a common parent 2014-11-04 13:29:21 -05:00
lmds1 f366cb52f1 merged changes from master 2014-11-03 17:18:33 -05:00
lmds1 0c7cf18914 refactored auditing interceptor, added additional securityevent info 2014-11-03 17:01:52 -05:00
lmds1 48a6d9ba6a no changes 2014-11-03 16:03:32 -05:00
lmds1 07de445a5e this looks like it doesn't actually have changes but git won't let me pull because it thinks it does so committing 2014-11-03 16:02:48 -05:00
James Agnew 5aafeee3d3 Documentation updates 2014-11-03 14:16:04 -05:00
b.debeaubien 4a4dd90f6e Added the ProvidesResources annotation and supporting classes, which allows server authors to specify resources that should be added to the initial resource list (and thus show up in the list of profiles returned from a search) 2014-11-03 09:04:16 -05:00
James Agnew 9c3ce5be86 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-10-31 15:00:38 -04:00
James Agnew ae56cf665e Skup failing test on windows 2014-10-31 15:00:26 -04:00
b.debeaubien 11894710f9 Updated docs in ResourceDef to indicate what id is used for (potentially it's also used for other things, though I didn't find any)
Added a test that demonstrates using ResourceDef.id to set the id for a custom resource's profile
2014-10-31 12:14:54 -04:00
James Agnew 60425a003c Add credit for #44 2014-10-30 14:01:45 -04:00
James Agnew c7d4441d3b Merge branch 'master' of github.com:petromykhailysyn/hapi-fhir into petromykhailysyn-master 2014-10-30 13:59:12 -04:00
James Agnew e9ab9c8259 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-10-30 13:58:33 -04:00
James Agnew 135ba9d9e6 Moving site generation into root project 2014-10-30 13:57:29 -04:00
petromykhailyshyn c474839f01 IOException is removed from CustomThymeleafNarrativeGenerator 2014-10-30 16:59:10 +02:00
b.debeaubien b733b1a1dd https://github.com/jamesagnew/hapi-fhir/issues/39
AddProfileTagEnum is now public, so that one can actually call setAddProfileTag.
2014-10-30 10:07:34 -04:00
James Agnew f2f09d03df Add constructor and javadocs 2014-10-29 16:23:19 -04:00
James Agnew d2e6fc2253 Test updates to make Jenkins happy 2014-10-29 15:48:05 -04:00
James Agnew 094a617644 Merge branch 'versions'
Conflicts:
	hapi-fhir-base/examples/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
	hapi-fhir-base/testmindeps/pom.xml
	hapi-fhir-jpaserver-uhnfhirtest/pom.xml
	hapi-fhir-testpage-overlay/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	restful-server-example-test/pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/pom.xml
2014-10-29 15:34:59 -04:00
James Agnew 8f610d2c3a Add some tests 2014-10-29 09:04:44 -04:00
James Agnew 5abdb5680a Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-10-28 11:16:07 -04:00
b.debeaubien 7f965c447f ServerProfileProvider now uses IdDt.getIdPart() rather than getValue() so that it can find the profiles in in FhirContext's myIdToResourceDefinition. 2014-10-27 13:53:01 -04:00
James Agnew d756b73fa5 Docs 2014-10-24 16:24:06 -04:00
James Agnew c0ed32c49a More work on versions 2014-10-24 16:21:01 -04:00
James Agnew d170c1e408 More work on DEV 2014-10-24 16:10:54 -04:00
James Agnew c26602f0c8 Versions now builds completely! 2014-10-24 15:43:35 -04:00
James Agnew 69ee8a4777 Documentation updates 2014-10-23 12:32:54 -04:00
James Agnew 8f02bd734e Docs for release 0.7 2014-10-23 10:58:15 -04:00
jamesagnew 818177f70f Bunp to 0.7 for release 2014-10-23 08:12:58 -04:00
James Agnew 084d0d3010 Doc updates 2014-10-21 13:23:25 -04:00
James Agnew 81ddb3f1d5 More versions work 2014-10-20 18:59:02 -04:00
lmds1 ebb906adae updated generated files with license comment from hapi-fhir-base build 2014-10-20 15:17:09 -04:00
lmds1 11f5a08814 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-20 14:19:25 -04:00
lmds1 45a3fa8254 updated tinder to generate resources with a getResourceType method returning the ResourceTypeEnum, removed Test resource 2014-10-20 14:19:18 -04:00
James Agnew b07b8b9845 Start adding DEV structures 2014-10-17 18:08:37 -04:00
James Agnew 4f8eec4075 Add an example for #35 - Cookie Interceptor 2014-10-17 16:39:47 -04:00
James Agnew e31970f095 Merge pull request #35 from petromykhailysyn/master
Added Cookie interceptor.
2014-10-17 16:29:54 -04:00
James Agnew 79f92e8728 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-10-17 16:03:48 -04:00
James Agnew b2efa07a05 Doc updates 2014-10-17 16:03:33 -04:00
James Agnew d140e0b829 Merge pull request #34 from jjathman/remove-validation-exception
Fixes #32 - removes new validation API that doesn't use exceptions
2014-10-17 15:41:21 -04:00