Commit Graph

603 Commits

Author SHA1 Message Date
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.
§) 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