Commit Graph

572 Commits

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