Commit Graph

900 Commits

Author SHA1 Message Date
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
James Agnew cdb1b2d03e Move Vagrant documentation into its own file 2014-10-17 15:23:04 -04:00
James Agnew 47edfb7b01 Almost have versions tests passing 2014-10-17 14:51:45 -04:00
petromykhailyshyn 10c49d2bd3 Added Cookie interceptor. 2014-10-17 12:52:09 +03:00
James Agnew bb0b39627d Unit tests almost all passing 2014-10-16 17:19:27 -04:00
James Agnew 1d29b2b642 Still more versions work 2014-10-16 13:41:57 -04:00
James Agnew dbc07dcb50 More versions work 2014-10-16 11:46:25 -04:00
lmds1 a642745095 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-16 10:48:58 -04:00
lmds1 5a742a492b added missing resourcetypeenums 2014-10-16 10:48:51 -04:00
James Agnew 287162af91 Fix #33 - Server was incorrectly returning contained resources as
top-level resources
2014-10-15 16:46:28 -04:00
lmds1 9f62d18b9f Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-15 15:22:45 -04:00
lmds1 fdd9939d16 added resource type to IResource so all resource subclasses must declare what type they are (to facilitate auditing of resources) 2014-10-15 15:22:42 -04:00
James Agnew b22bcaec32 More cleanup for contained resources 2014-10-15 14:34:14 -04:00
Joseph Athman 2741f1cae5 Fixes #32
Creates new methods that return a ValidationResult object instead of throwing an exception which requires catching and inspecting the exception itself. Migrating from the old to the new API should be pretty simple as the method calls match quite closely.
2014-10-15 12:26:30 -05:00
James Agnew 2a9d92df7a Clean up encoding of contained resources so that resources are not
modified as a part of the encoding
2014-10-14 14:20:19 -04:00
lmds1 6049df0bfa Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-10-10 15:42:29 -04:00
James Agnew abecee2766 Some work on supporting multiple versions 2014-10-02 09:54:52 -04:00
James Agnew 507ea9bedf One more windows unit test break 2014-10-01 16:27:47 -04:00
James Agnew c6dcd4b1af Fix broken unit tests on Windows 2014-10-01 16:02:22 -04:00
James Agnew 751face0a6 Argh. Fix to 0.7-SNAPSHOT, not 0.6-SNAPSHOT 2014-09-30 13:16:09 -04:00
James Agnew 1feb69b545 Revert to 0.6-SNAPSHOT version 2014-09-30 11:59:38 -04:00
James Agnew 3eeea9b0fc Merge branch 'tags-set' 2014-09-30 11:58:00 -04:00
James Agnew 24caec9f44 Get tags working as a set instead of a list 2014-09-30 11:57:15 -04:00
jamesagnew 75c5123797 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-09-29 21:07:01 -04:00
jamesagnew dcccf5553e Return a content-location header on update 2014-09-29 21:05:55 -04:00
t106uhn 686237f970 bump to 0.8-SNAPSHOT 2014-09-26 20:50:36 -04:00
t106uhn 2e89fd7554 fixed compile error with org-apache-commons.StringUtils 2014-09-26 18:38:38 -04:00
James Agnew 0d6eca70a9 Work on #30, still not working though... 2014-09-26 17:16:37 -04:00
James Agnew 1d084fe6b0 Fix #29 - Encoding resources with contained resources caused the parent
resource to grow with each encode pass.
2014-09-26 10:58:19 -04:00
James Agnew c362e21997 Add test for contained binary resources. Close #26 fixed by Alexander
Kley
2014-09-26 09:37:41 -04:00
James Agnew e4009bcb4a Merge pull request #28 from Cloudyle/issue-#26
Thanks for the submission! Looks good to me.
2014-09-26 09:32:35 -04:00
James Agnew 69c5663128 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-09-26 09:24:28 -04:00
James Agnew 4f4fdfd279 Docs 2014-09-26 09:23:03 -04:00
jamesagnew 4622af7a82 Docs 2014-09-26 07:43:25 -04:00
lmds1 86b5e4acf9 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-25 11:21:07 -04:00
jamesagnew d159584b43 Don't fail is Woodstox isn't the default StAX parser 2014-09-25 08:35:15 -04:00
akley b380a8f797 Update PraserState.java
Issue #26: XMLParser doesn't read Binary content from XML. Binary content is discarded during xml parsing, because attribute check of ID is missing in BinaryResourceState.attributeValue(...)
2014-09-25 10:36:29 +02:00
lmds1 bdad121f01 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-24 19:09:45 -04:00
lmds1 88e95c1b0a fixed exception handling for auditing interceptor 2014-09-24 19:09:35 -04:00
jamesagnew dd5e442bcb Add an explicit dependency on phloc-commons to fix a build error, thanks to Odysseas Pentakalos for the contribution. 2014-09-24 17:36:59 -04:00
lmds1 8c45f32ce3 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-24 15:52:57 -04:00
lmds1 e0d160ad7e added AuditingInterceptor and IAuditDataStore with various ResourceAuditors to provide pluggable auditing functionality to FHIR server 2014-09-24 15:52:48 -04:00
James Agnew a610c1cb38 Add client interceptor which adds bearer tokens for OAUTH2 2014-09-24 14:57:37 -04:00
James Agnew 5c0ccaab9a Resources containing entities which are not valid in basic XML (e.g.
&sect;) will have those
				entities converted to their equivalent
unicode characters when resources are encoded, since FHIR does
				not allow extended entities in resource
instances.
2014-09-22 16:44:59 -04:00
James Agnew c214f7fe19 Fix #24 - Add a bunch of elements to the automatically generated
conformance profiles to ensure that they validate against the HL7
schemas.
2014-09-22 16:27:57 -04:00
jamesagnew 7192c9348a Doc tweaks 2014-09-19 08:52:39 -04:00
James Agnew b67a4cc4e4 Allow read/vread/search using absolute URL - Thanks to Doug Martin for
the contribution
2014-09-18 17:13:43 -04:00
James Agnew 06e2b6632d Fix build 2014-09-17 11:43:18 -04:00
lmds1 cb8dca13d2 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-17 11:36:41 -04:00
James Agnew 62bf2620f1 Properly handle bundle entry summary element 2014-09-17 11:35:57 -04:00
lmds1 4b730cc418 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2014-09-17 11:35:44 -04:00
lmds1 9906b61987 added UserInfoInterceptor to pass user context for auditing, added narratives for Medication Prescription, moved URL into RequestDetails so it's available to interceptors 2014-09-17 11:35:15 -04:00
jamesagnew b316d556b7 Fix unit test 2014-09-17 09:07:01 -04:00
jamesagnew 594b04d838 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-09-17 08:33:52 -04:00
jamesagnew 1fecb8ad76 Parameter type cleanup from connectathon 2014-09-17 08:32:15 -04:00
James Agnew 83f9c1c6a9 Still working on unit tests 2014-09-16 17:21:04 -04:00
James Agnew 774e38eacc Just logging in unit test 2014-09-16 17:16:03 -04:00
James Agnew 49726fb17c Properly escape characters in narrative blocks 2014-09-16 17:06:48 -04:00
James Agnew e7d2a19ac6 Fix broken build - Thanks Jenkins! 2014-09-16 15:25:20 -04:00
James Agnew af64f1b9e1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-09-16 12:06:42 -04:00
James Agnew ef57a5f47e Work on #21 - Don't depend on Servlet 3+ APIs 2014-09-16 12:05:44 -04:00
t106uhn f79b7adabd added jetty-http dependancy to allow test case classes to compile in
eclipse
2014-09-15 20:40:40 -04:00
jamesagnew 5701572e08 Fix url determination 2014-09-13 12:15:35 -05:00
jamesagnew 1f0f9176fe Work on base server URL determination code 2014-09-13 12:05:57 -05:00
jamesagnew f3ae6cbffd Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
	hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
	restful-server-example/.settings/org.eclipse.wst.common.component
2014-09-12 18:57:57 -05:00
James Agnew cdd4b137fb Bump to 0.7-SNAPSHOT 2014-09-11 16:57:45 -04:00
James Agnew 0b6c985f3a Merge branch 'oauth2'
Conflicts:
2014-09-11 16:29:08 -04:00
James Agnew 960c89989c Documentation tweaks 2014-09-11 16:28:29 -04:00
James Agnew f388c6df3d Nothing 2014-09-10 14:13:01 -04:00
James Agnew 8a77ac939d Documentation enhancements 2014-09-10 14:12:11 -04:00
jamesagnew 09af35e5d8 Site tweaks for release 2014-09-08 07:51:21 -04:00
jamesagnew 13dd6d5e11 Complete 0.6 2014-09-08 07:41:44 -04:00
James Agnew 6761e9a945 Starting to rework the oauth2 filter 2014-09-04 18:03:19 -04:00
James Agnew f9419ea910 Fix up examples 2014-09-03 18:03:44 -04:00
James Agnew 095945562b Potential #19 2014-09-03 12:57:17 -04:00
jamesagnew 93c54f57fe More work on fixing #19 2014-09-03 09:08:55 -04:00
James Agnew c704aa185d Fix #19 - Now have a whitelist and a blacklist for parameter names 2014-09-02 16:41:01 -04:00
jamesagnew 9217ee28bf Starting work on #19 2014-09-02 08:21:06 -04:00
jamesagnew bda33737f1 Doc updates as suggested by David Hay 2014-09-01 20:05:16 -04:00
jamesagnew e7f34e8dbb Check compartment support in 2014-08-29 13:05:04 -04:00
James Agnew ce99ee8324 Whitespace 2014-08-28 17:42:35 -04:00
James Agnew a8be093b1f Use better valueset enums for SecurityEvent's values 2014-08-28 12:58:13 -04:00
James Agnew 4d426cb2b2 Fix resource reference encode order 2014-08-28 09:47:59 -04:00
James Agnew 46fbfeb66e Fix encoding issue on narrative blocks 2014-08-28 09:44:04 -04:00
jamesagnew d205075e35 More validator work 2014-08-28 07:53:41 -04:00
James Agnew c75c37d24d Rename SecurityEvent.Object to SecurityEvent.ObjectElement 2014-08-27 12:01:46 -04:00
James Agnew 9a58e2e56e Close #14 - HAPI will now not ignore _id parameter when choosing a
backing method
2014-08-27 11:34:13 -04:00
James Agnew 5d2d6f410f Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-27 10:37:19 -04:00
James Agnew f549cd5cc4 Unit test for #14 - Doesn't pass yet though 2014-08-27 10:36:56 -04:00
jamesagnew bfd6329303 Performance improvements 2014-08-27 08:55:00 -04:00
James Agnew 794db6a141 Document interceptor framework 2014-08-26 18:18:00 -04:00
James Agnew 9bb10a5968 More tweaks 2014-08-26 16:23:56 -04:00
James Agnew 812870f5dc Make this a bit easier to read 2014-08-26 16:22:43 -04:00
James Agnew f5823a8e2f Server logging interceptor enhancements 2014-08-26 16:10:27 -04:00
James Agnew 84c479927e Add test for #11 2014-08-26 10:13:35 -04:00
James Agnew faa28cb825 Fix unit test, should close #13. Our hudson server is temporarily
offline and I need to do a better job of manually running the tests
until it is back!
2014-08-26 10:04:26 -04:00
jamesagnew 9413bfa47b Correctly parse List resource 2014-08-26 08:10:15 -04:00
jamesagnew e6d6ec88b2 Fix unit test 2014-08-25 21:53:21 -04:00
James Agnew 2cad32aa08 Detect invalid read method 2014-08-25 17:07:02 -04:00
jamesagnew d01f43e4b3 Add server interceptor layer as well as starting work on property file for versions 2014-08-25 09:11:28 -04:00
jamesagnew 8d462f3cda Add validator support 2014-08-23 16:40:26 -04:00
James Agnew 3808f95f6a Start working on server interceptors 2014-08-22 19:15:49 -04:00
jamesagnew ab17c9f3d1 Let server return profile info if configured to do so 2014-08-21 00:34:19 -04:00
jamesagnew 731d369be0 Improve documentation on exception handling for servers 2014-08-20 22:46:15 -04:00
James Agnew 45253cba5d Eclipse settings 2014-08-20 19:21:41 -04:00
James Agnew 1ec49a4f80 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
2014-08-20 15:24:39 -04:00
James Agnew 47c522ac6f Exception enhancements 2014-08-20 15:22:25 -04:00
jamesagnew f8a5acfed9 Exception enhancements 2014-08-20 09:01:09 -04:00
jamesagnew 71e6efbc31 Fix resource reference encoding for JSON parser - Thanks Tommy Nguyen for reporting! 2014-08-20 07:48:51 -04:00
jamesagnew 6bc9140def Fix unit test failure 2014-08-19 09:12:25 -04:00
jamesagnew 598eec53ed Add model visitor, and allow bundles to have categories (as allowed in the spec) 2014-08-19 07:48:06 -04:00
jamesagnew fd41bafa82 Allow bundle as param in transaction method 2014-08-17 22:58:30 -04:00
jamesagnew 8078452f78 Lots more documentation and let users interact with link self/search 2014-08-16 17:46:30 -04:00
James Agnew d67a29a366 Unit tests 2014-08-15 15:55:39 -04:00
jamesagnew d5c6623da0 Start adding ability to override fields in extended definition classes 2014-08-15 09:19:07 -04:00
James Agnew 901ce12e8e Start adding view generator 2014-08-13 18:16:34 -04:00
James Agnew 04b4d5acb7 Server sending some named queries to non named query method 2014-08-13 16:43:54 -04:00
James Agnew 408114235f Start server profiles 2014-08-12 17:22:05 -04:00
James Agnew 0ff847ac21 Fix failing unit tests 2014-08-12 12:27:51 -04:00
James Agnew d0edc03f14 Linked resources in server now correctly returned 2014-08-12 11:04:41 -04:00
jamesagnew e2b9b3318d Add OperationOutcome narrative template 2014-08-11 09:09:01 -04:00
jamesagnew 04bc96ff8e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-09 12:18:54 -04:00
jamesagnew 3e2cfcd02d Doc updates 2014-08-09 12:18:47 -04:00
James Agnew 2ede952342 Fix up CORS support 2014-08-08 17:40:43 -04:00
James Agnew 8149df964e Annotation client will not return incorrect resource types 2014-08-08 15:15:10 -04:00
James Agnew b43b6c6d2f Fix #6: Allow update operation to create a resource if it doesn't
already exist
2014-08-08 14:07:03 -04:00
jamesagnew e17af44a09 Add _language search support 2014-08-08 08:34:28 -04:00
jamesagnew ba3bc70eae Fix CORS support 2014-08-08 07:33:12 -04:00
James Agnew 95f5031251 Documentation enhancements 2014-08-07 18:41:33 -04:00
James Agnew 4ba4226dad Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-07 12:18:38 -04:00
jamesagnew deef33317d Annotation documentation updates 2014-08-07 08:27:52 -04:00
jamesagnew 0b7cfec06b Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-06 09:05:21 -04:00
jamesagnew f36be04168 Typo edits 2014-08-06 09:05:01 -04:00
James Agnew 2c44a4f76e Correctly handle contained resources in client 2014-08-05 17:06:35 -04:00
James Agnew aef7ea5e9f Correctly encode JSON composite elements with extensions 2014-08-05 14:57:53 -04:00
James Agnew f29349f537 Improve conformance provider documentation 2014-08-05 13:15:08 -04:00
James Agnew 1793f6d9ab Fix #4- Create operation should return HTTP 200 2014-08-05 10:46:46 -04:00
jamesagnew 33d667d448 Doc updates 2014-08-05 07:55:58 -04:00
jamesagnew cac3306c64 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-08-01 07:35:59 -04:00
jamesagnew 9d4eff967e Doc updates 2014-08-01 07:35:44 -04:00
James Agnew fa3bd7f25d Start adding OpenID support 2014-07-31 18:06:04 -04:00
James Agnew 0ba7a63803 Allow repeatable prarmater values 2014-07-30 17:43:15 -04:00
James Agnew ef10560c76 Version bump to 0.6-SNAPSHOT 2014-07-30 11:58:06 -04:00
jamesagnew 0a57647b17 Tag 0.5 2014-07-30 07:58:57 -04:00
jamesagnew 67fb593146 Finalize 0.5 2014-07-29 22:26:19 -04:00
James Agnew de5aeb5c7a More tests 2014-07-29 17:27:16 -04:00
James Agnew 98d0fe679a Rebuild resource models 2014-07-29 15:59:11 -04:00
jamesagnew 0bc703107c Add suport for composite and sorting to JPA (not yet complete) 2014-07-29 09:10:25 -04:00
James Agnew 318dcfcaaf Contained resource handling improved 2014-07-23 17:02:54 -04:00
jamesagnew 4cd3bdf441 A few fixes and additions to the fluent client, as well as fixing a bug on extension encoding (null extensions were still being encoded) 2014-07-23 09:15:07 -04:00
James Agnew 622e528f43 Lots of documentation updates 2014-07-22 18:12:01 -04:00
James Agnew efb14397df Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-base/src/changes/changes.xml
2014-07-22 14:25:59 -04:00
James Agnew e53aaf0950 Add content-disposition header for binary resources 2014-07-22 14:25:33 -04:00
jamesagnew af3c35cbc0 More API cleanup and documentation 2014-07-22 09:14:02 -04:00
James Agnew fc74cda994 Clean up examples and unit tests to use new parameter types 2014-07-21 18:37:08 -04:00