450b270c00
Fix compile issues in previous merge
2014-11-08 11:18:04 -05:00
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
5c9cf8ddf8
More merging cleanup
2014-11-08 10:38:25 -05:00
d1fb878c55
Merging
2014-11-08 10:36:27 -05:00
d22a35788f
Implement handleException on the server interceptor framework, as well
...
as some site and documentation enhancements
2014-11-07 14:26:59 -05:00
8f704030ed
Added RES_ID property to BaseResource to facilitate searching for resources based on _id.
2014-11-07 12:24:16 -05:00
f303e174fc
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-11-04 17:32:00 -05:00
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
4e769da4ca
Give securityevent a common parent
2014-11-04 13:29:21 -05:00
f366cb52f1
merged changes from master
2014-11-03 17:18:33 -05:00
0c7cf18914
refactored auditing interceptor, added additional securityevent info
2014-11-03 17:01:52 -05:00
48a6d9ba6a
no changes
2014-11-03 16:03:32 -05:00
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
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
9c3ce5be86
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-10-31 15:00:38 -04:00
ae56cf665e
Skup failing test on windows
2014-10-31 15:00:26 -04:00
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
60425a003c
Add credit for #44
2014-10-30 14:01:45 -04:00
c7d4441d3b
Merge branch 'master' of github.com:petromykhailysyn/hapi-fhir into petromykhailysyn-master
2014-10-30 13:59:12 -04:00
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
135ba9d9e6
Moving site generation into root project
2014-10-30 13:57:29 -04:00
c474839f01
IOException is removed from CustomThymeleafNarrativeGenerator
2014-10-30 16:59:10 +02:00
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
f2f09d03df
Add constructor and javadocs
2014-10-29 16:23:19 -04:00
d2e6fc2253
Test updates to make Jenkins happy
2014-10-29 15:48:05 -04:00
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
8f610d2c3a
Add some tests
2014-10-29 09:04:44 -04:00
5abdb5680a
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-10-28 11:16:07 -04:00
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
d756b73fa5
Docs
2014-10-24 16:24:06 -04:00
c0ed32c49a
More work on versions
2014-10-24 16:21:01 -04:00
d170c1e408
More work on DEV
2014-10-24 16:10:54 -04:00
c26602f0c8
Versions now builds completely!
2014-10-24 15:43:35 -04:00
69ee8a4777
Documentation updates
2014-10-23 12:32:54 -04:00
8f02bd734e
Docs for release 0.7
2014-10-23 10:58:15 -04:00
818177f70f
Bunp to 0.7 for release
2014-10-23 08:12:58 -04:00
084d0d3010
Doc updates
2014-10-21 13:23:25 -04:00
81ddb3f1d5
More versions work
2014-10-20 18:59:02 -04:00
ebb906adae
updated generated files with license comment from hapi-fhir-base build
2014-10-20 15:17:09 -04:00
11f5a08814
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-20 14:19:25 -04:00
45a3fa8254
updated tinder to generate resources with a getResourceType method returning the ResourceTypeEnum, removed Test resource
2014-10-20 14:19:18 -04:00
b07b8b9845
Start adding DEV structures
2014-10-17 18:08:37 -04:00
4f8eec4075
Add an example for #35 - Cookie Interceptor
2014-10-17 16:39:47 -04:00
e31970f095
Merge pull request #35 from petromykhailysyn/master
...
Added Cookie interceptor.
2014-10-17 16:29:54 -04:00
79f92e8728
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-10-17 16:03:48 -04:00
b2efa07a05
Doc updates
2014-10-17 16:03:33 -04:00
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
cdb1b2d03e
Move Vagrant documentation into its own file
2014-10-17 15:23:04 -04:00
47edfb7b01
Almost have versions tests passing
2014-10-17 14:51:45 -04:00
10c49d2bd3
Added Cookie interceptor.
2014-10-17 12:52:09 +03:00
bb0b39627d
Unit tests almost all passing
2014-10-16 17:19:27 -04:00
1d29b2b642
Still more versions work
2014-10-16 13:41:57 -04:00
dbc07dcb50
More versions work
2014-10-16 11:46:25 -04:00
a642745095
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-16 10:48:58 -04:00
5a742a492b
added missing resourcetypeenums
2014-10-16 10:48:51 -04:00
287162af91
Fix #33 - Server was incorrectly returning contained resources as
...
top-level resources
2014-10-15 16:46:28 -04:00
9f62d18b9f
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-15 15:22:45 -04:00
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
b22bcaec32
More cleanup for contained resources
2014-10-15 14:34:14 -04:00
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
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
6049df0bfa
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-10-10 15:42:29 -04:00
abecee2766
Some work on supporting multiple versions
2014-10-02 09:54:52 -04:00
507ea9bedf
One more windows unit test break
2014-10-01 16:27:47 -04:00
c6dcd4b1af
Fix broken unit tests on Windows
2014-10-01 16:02:22 -04:00
751face0a6
Argh. Fix to 0.7-SNAPSHOT, not 0.6-SNAPSHOT
2014-09-30 13:16:09 -04:00
3eeea9b0fc
Merge branch 'tags-set'
2014-09-30 11:58:00 -04:00
24caec9f44
Get tags working as a set instead of a list
2014-09-30 11:57:15 -04:00
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
dcccf5553e
Return a content-location header on update
2014-09-29 21:05:55 -04:00
2e89fd7554
fixed compile error with org-apache-commons.StringUtils
2014-09-26 18:38:38 -04:00
0d6eca70a9
Work on #30 , still not working though...
2014-09-26 17:16:37 -04:00
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
c362e21997
Add test for contained binary resources. Close #26 fixed by Alexander
...
Kley
2014-09-26 09:37:41 -04:00
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
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
4f4fdfd279
Docs
2014-09-26 09:23:03 -04:00
4622af7a82
Docs
2014-09-26 07:43:25 -04:00
86b5e4acf9
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-25 11:21:07 -04:00
d159584b43
Don't fail is Woodstox isn't the default StAX parser
2014-09-25 08:35:15 -04:00
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
bdad121f01
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-24 19:09:45 -04:00
88e95c1b0a
fixed exception handling for auditing interceptor
2014-09-24 19:09:35 -04:00
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
8c45f32ce3
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-24 15:52:57 -04:00
e0d160ad7e
added AuditingInterceptor and IAuditDataStore with various ResourceAuditors to provide pluggable auditing functionality to FHIR server
2014-09-24 15:52:48 -04:00
a610c1cb38
Add client interceptor which adds bearer tokens for OAUTH2
2014-09-24 14:57:37 -04:00
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
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
7192c9348a
Doc tweaks
2014-09-19 08:52:39 -04:00
b67a4cc4e4
Allow read/vread/search using absolute URL - Thanks to Doug Martin for
...
the contribution
2014-09-18 17:13:43 -04:00
06e2b6632d
Fix build
2014-09-17 11:43:18 -04:00
cb8dca13d2
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-17 11:36:41 -04:00
62bf2620f1
Properly handle bundle entry summary element
2014-09-17 11:35:57 -04:00
4b730cc418
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir
2014-09-17 11:35:44 -04:00
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
b316d556b7
Fix unit test
2014-09-17 09:07:01 -04:00
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
1fecb8ad76
Parameter type cleanup from connectathon
2014-09-17 08:32:15 -04:00
83f9c1c6a9
Still working on unit tests
2014-09-16 17:21:04 -04:00
774e38eacc
Just logging in unit test
2014-09-16 17:16:03 -04:00
49726fb17c
Properly escape characters in narrative blocks
2014-09-16 17:06:48 -04:00
e7d2a19ac6
Fix broken build - Thanks Jenkins!
2014-09-16 15:25:20 -04:00
af64f1b9e1
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-09-16 12:06:42 -04:00
ef57a5f47e
Work on #21 - Don't depend on Servlet 3+ APIs
2014-09-16 12:05:44 -04:00
5701572e08
Fix url determination
2014-09-13 12:15:35 -05:00
1f0f9176fe
Work on base server URL determination code
2014-09-13 12:05:57 -05:00
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
cdd4b137fb
Bump to 0.7-SNAPSHOT
2014-09-11 16:57:45 -04:00
0b6c985f3a
Merge branch 'oauth2'
...
Conflicts:
2014-09-11 16:29:08 -04:00
960c89989c
Documentation tweaks
2014-09-11 16:28:29 -04:00
8a77ac939d
Documentation enhancements
2014-09-10 14:12:11 -04:00
09af35e5d8
Site tweaks for release
2014-09-08 07:51:21 -04:00
13dd6d5e11
Complete 0.6
2014-09-08 07:41:44 -04:00
6761e9a945
Starting to rework the oauth2 filter
2014-09-04 18:03:19 -04:00
f9419ea910
Fix up examples
2014-09-03 18:03:44 -04:00
095945562b
Potential #19
2014-09-03 12:57:17 -04:00
93c54f57fe
More work on fixing #19
2014-09-03 09:08:55 -04:00
c704aa185d
Fix #19 - Now have a whitelist and a blacklist for parameter names
2014-09-02 16:41:01 -04:00
9217ee28bf
Starting work on #19
2014-09-02 08:21:06 -04:00
bda33737f1
Doc updates as suggested by David Hay
2014-09-01 20:05:16 -04:00
e7f34e8dbb
Check compartment support in
2014-08-29 13:05:04 -04:00
ce99ee8324
Whitespace
2014-08-28 17:42:35 -04:00
a8be093b1f
Use better valueset enums for SecurityEvent's values
2014-08-28 12:58:13 -04:00
4d426cb2b2
Fix resource reference encode order
2014-08-28 09:47:59 -04:00
46fbfeb66e
Fix encoding issue on narrative blocks
2014-08-28 09:44:04 -04:00
d205075e35
More validator work
2014-08-28 07:53:41 -04:00
c75c37d24d
Rename SecurityEvent.Object to SecurityEvent.ObjectElement
2014-08-27 12:01:46 -04:00
9a58e2e56e
Close #14 - HAPI will now not ignore _id parameter when choosing a
...
backing method
2014-08-27 11:34:13 -04:00
5d2d6f410f
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-27 10:37:19 -04:00
f549cd5cc4
Unit test for #14 - Doesn't pass yet though
2014-08-27 10:36:56 -04:00
bfd6329303
Performance improvements
2014-08-27 08:55:00 -04:00
794db6a141
Document interceptor framework
2014-08-26 18:18:00 -04:00
9bb10a5968
More tweaks
2014-08-26 16:23:56 -04:00
812870f5dc
Make this a bit easier to read
2014-08-26 16:22:43 -04:00
f5823a8e2f
Server logging interceptor enhancements
2014-08-26 16:10:27 -04:00
84c479927e
Add test for #11
2014-08-26 10:13:35 -04:00
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
9413bfa47b
Correctly parse List resource
2014-08-26 08:10:15 -04:00
e6d6ec88b2
Fix unit test
2014-08-25 21:53:21 -04:00
2cad32aa08
Detect invalid read method
2014-08-25 17:07:02 -04:00
d01f43e4b3
Add server interceptor layer as well as starting work on property file for versions
2014-08-25 09:11:28 -04:00
8d462f3cda
Add validator support
2014-08-23 16:40:26 -04:00
3808f95f6a
Start working on server interceptors
2014-08-22 19:15:49 -04:00
ab17c9f3d1
Let server return profile info if configured to do so
2014-08-21 00:34:19 -04:00
731d369be0
Improve documentation on exception handling for servers
2014-08-20 22:46:15 -04:00
45253cba5d
Eclipse settings
2014-08-20 19:21:41 -04:00
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
47c522ac6f
Exception enhancements
2014-08-20 15:22:25 -04:00
f8a5acfed9
Exception enhancements
2014-08-20 09:01:09 -04:00
71e6efbc31
Fix resource reference encoding for JSON parser - Thanks Tommy Nguyen for reporting!
2014-08-20 07:48:51 -04:00
6bc9140def
Fix unit test failure
2014-08-19 09:12:25 -04:00
598eec53ed
Add model visitor, and allow bundles to have categories (as allowed in the spec)
2014-08-19 07:48:06 -04:00
fd41bafa82
Allow bundle as param in transaction method
2014-08-17 22:58:30 -04:00
8078452f78
Lots more documentation and let users interact with link self/search
2014-08-16 17:46:30 -04:00
d67a29a366
Unit tests
2014-08-15 15:55:39 -04:00
d5c6623da0
Start adding ability to override fields in extended definition classes
2014-08-15 09:19:07 -04:00
901ce12e8e
Start adding view generator
2014-08-13 18:16:34 -04:00
04b4d5acb7
Server sending some named queries to non named query method
2014-08-13 16:43:54 -04:00
408114235f
Start server profiles
2014-08-12 17:22:05 -04:00
0ff847ac21
Fix failing unit tests
2014-08-12 12:27:51 -04:00
d0edc03f14
Linked resources in server now correctly returned
2014-08-12 11:04:41 -04:00
e2b9b3318d
Add OperationOutcome narrative template
2014-08-11 09:09:01 -04:00
04bc96ff8e
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-09 12:18:54 -04:00
3e2cfcd02d
Doc updates
2014-08-09 12:18:47 -04:00
2ede952342
Fix up CORS support
2014-08-08 17:40:43 -04:00
8149df964e
Annotation client will not return incorrect resource types
2014-08-08 15:15:10 -04:00
b43b6c6d2f
Fix #6 : Allow update operation to create a resource if it doesn't
...
already exist
2014-08-08 14:07:03 -04:00
e17af44a09
Add _language search support
2014-08-08 08:34:28 -04:00
ba3bc70eae
Fix CORS support
2014-08-08 07:33:12 -04:00
95f5031251
Documentation enhancements
2014-08-07 18:41:33 -04:00
4ba4226dad
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-07 12:18:38 -04:00
deef33317d
Annotation documentation updates
2014-08-07 08:27:52 -04:00
0b7cfec06b
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-06 09:05:21 -04:00
f36be04168
Typo edits
2014-08-06 09:05:01 -04:00
2c44a4f76e
Correctly handle contained resources in client
2014-08-05 17:06:35 -04:00
aef7ea5e9f
Correctly encode JSON composite elements with extensions
2014-08-05 14:57:53 -04:00
f29349f537
Improve conformance provider documentation
2014-08-05 13:15:08 -04:00
1793f6d9ab
Fix #4- Create operation should return HTTP 200
2014-08-05 10:46:46 -04:00
33d667d448
Doc updates
2014-08-05 07:55:58 -04:00
cac3306c64
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-08-01 07:35:59 -04:00
9d4eff967e
Doc updates
2014-08-01 07:35:44 -04:00
fa3bd7f25d
Start adding OpenID support
2014-07-31 18:06:04 -04:00
0ba7a63803
Allow repeatable prarmater values
2014-07-30 17:43:15 -04:00
0a57647b17
Tag 0.5
2014-07-30 07:58:57 -04:00
67fb593146
Finalize 0.5
2014-07-29 22:26:19 -04:00
de5aeb5c7a
More tests
2014-07-29 17:27:16 -04:00
98d0fe679a
Rebuild resource models
2014-07-29 15:59:11 -04:00
0bc703107c
Add suport for composite and sorting to JPA (not yet complete)
2014-07-29 09:10:25 -04:00
318dcfcaaf
Contained resource handling improved
2014-07-23 17:02:54 -04:00
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
622e528f43
Lots of documentation updates
2014-07-22 18:12:01 -04:00
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
e53aaf0950
Add content-disposition header for binary resources
2014-07-22 14:25:33 -04:00
af3c35cbc0
More API cleanup and documentation
2014-07-22 09:14:02 -04:00
fc74cda994
Clean up examples and unit tests to use new parameter types
2014-07-21 18:37:08 -04:00
063e2961ab
Fix bug 2- Process Content-Location header in client read invocations
2014-07-21 14:57:37 -04:00
64481185c7
Fixing bug 3- Instance history calls incorrectly get routed to vread
...
method
2014-07-21 14:15:22 -04:00
ad043a1b79
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java
2014-07-21 09:24:38 -04:00
6aa3560564
Starting work on consolidating params
2014-07-19 12:10:43 -04:00
d15dbd4317
Add interceptor framework
2014-07-18 17:49:14 -04:00
2285d3812e
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-07-17 13:02:21 -04:00
bb14ad09ea
Start preparingh for multiple versions of FHIR
2014-07-17 09:53:52 -04:00
84af486d51
Tester now suports chained parameters
2014-07-17 08:32:01 -04:00
41f160ed67
Documentation updates and bump to 0.5-SNAPSHOT
2014-07-15 18:36:13 -04:00
2adaa4a072
Site updates
2014-07-14 08:21:50 -04:00
568972b098
Release 0.4
2014-07-13 21:59:41 -04:00
a2a1035003
More work on tester
2014-07-11 18:27:27 -04:00
0a7f7d0390
Start with sample code in tester UI
2014-07-11 09:15:38 -04:00
1346802403
reference params should handle resource types properly
2014-07-10 18:17:44 -04:00
4ddaaf0406
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java
2014-07-10 13:22:58 -04:00
28ebda71e1
Let IdDt clone without being heavyweight
2014-07-10 08:50:51 -04:00
4d517aa76f
Add ability for IDs to be client specified in JPA
2014-07-10 08:17:55 -04:00
1b7b141396
Tester improvements
2014-07-08 08:44:13 -04:00
d3b4a3ad60
Add searching by code text
2014-07-07 18:34:49 -04:00
0484c6509f
Display queries properly in UHN implementation
2014-07-07 15:37:23 -04:00
b1a602d88b
Fix a few unit tests
2014-07-07 12:42:37 -04:00
46828030db
Deal with max lenghts in search params
2014-07-07 12:15:20 -04:00
cb2b54cb09
Move searches with required parameters to unnamed queries
2014-07-07 09:23:23 -04:00
add96f2124
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-07-04 17:19:51 -04:00
0d13dc886b
Allow server to specify its own base
2014-07-04 17:19:33 -04:00
8c1c156e04
testing commit
2014-07-04 16:24:48 -04:00
02357bce4d
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-07-04 16:18:10 -04:00
ec2326b1f2
Narrative fixes
2014-07-04 16:17:53 -04:00
e0d0574cce
commit
2014-07-04 15:59:12 -04:00
8703e81821
commit
2014-07-04 15:49:54 -04:00
ca9264061b
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git
2014-07-04 14:32:09 -04:00
93a7c3e5b5
Deprocate confusing get/setId methods
2014-07-04 09:27:36 -04:00
e98205a8f2
added new exception
2014-07-03 18:51:18 -04:00
de51a40904
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
2014-07-03 18:35:54 -04:00
ee53c40ff8
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
...
Conflicts:
hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html
2014-07-03 18:35:37 -04:00
80c13494a8
Fix JSON parser NPE
2014-07-03 18:35:23 -04:00
ca0929df07
Work on narrative generator
2014-07-03 18:02:14 -04:00
c811c164b5
Fix unit test
2014-07-03 10:34:55 -04:00
0ece666c88
FIx a bunch more unit tests
2014-07-02 18:01:29 -04:00
3e8ea1d4ed
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git
2014-07-02 16:20:20 -04:00
1c05bcb29c
Fix a number of unit tests
2014-07-02 15:24:29 -04:00
14befcd091
Lots of tester enhancements
2014-07-02 08:57:07 -04:00
f87c50b4b4
Lots of tester work
2014-06-27 18:28:27 -04:00
50d68d6090
Fix a few parsing issues and add multi server support to tester
2014-06-27 09:05:51 -04:00
4cd7ff16fb
More tester enhancements
2014-06-26 18:06:23 -04:00
e576d5ba8f
Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git
2014-06-26 14:06:26 -04:00
97e17f9149
Fix code highlighting
2014-06-26 09:06:10 -04:00
3bc1d35698
Add method which was removed but make it deprocated
2014-06-25 17:22:47 -04:00
acbffecd15
Still trying to get this working with Jenkins
2014-06-25 17:01:32 -04:00
cf63f6bacf
FIx unit tests
2014-06-25 13:54:44 -04:00
1916656e6e
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
...
Conflicts:
hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html
2014-06-25 09:56:12 -04:00
411644c4ff
More tester work
2014-06-25 09:49:13 -04:00
68ea31495c
More enhancements for the tester, and merge read/vread methods
2014-06-25 09:07:14 -04:00
e093b23892
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-06-24 08:47:36 -04:00
a51edb83aa
More paging work on tester
2014-06-24 08:46:54 -04:00
875acee2ac
Fix failing unit tests
2014-06-23 10:31:02 -04:00
ba09da38b6
Start adding paging support
2014-06-23 09:04:48 -04:00
4d90955e75
Make resource detection kind of case insensitive (to deal with some healthintersections responses)
2014-06-20 16:54:09 -04:00
f4b8f18a8a
Make highlighting optional
2014-06-17 09:18:37 -04:00
5152f0ba9b
Lots more work getting the JPA tester working
2014-06-17 07:48:50 -04:00
bba62b2972
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-06-12 22:21:45 -04:00
00f7a76ee9
Lots more work on the tester servlet
2014-06-12 22:20:23 -04:00
ab3d656249
Fix some encoding issue for token params
2014-06-12 17:13:49 -04:00
58bb97e6d0
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-06-12 13:04:30 -04:00
d241df9868
Fix broken test cases
2014-06-12 13:00:31 -04:00
96986f8829
Lots of cleanup and try to speed up transacitons in JPA
2014-06-12 11:42:28 -04:00
7ef8640ef7
update restful server to prompt user for credentials on authorization exception if request came from a browser
2014-06-10 15:34:50 -04:00
04fc0827ef
Clean up transactions in JPA
2014-06-06 17:10:31 -04:00
54078be6e0
Fox a bunch of JPA bugs
2014-06-05 16:01:00 -04:00
9724f1219b
Merge branch 'master' of ssh://nacharya@git.code.sf.net/p/hl7api/fhircode
2014-06-03 20:46:57 -04:00
bb86724e12
Allow contained resources to parse and encode correctly
2014-06-03 16:52:21 -04:00
51d16ea92f
Merge branch 'master' of ssh://nacharya@git.code.sf.net/p/hl7api/fhircode
2014-06-02 19:34:01 -04:00
dfa88a442c
Get history and tags working properly on JPA
2014-06-02 09:07:10 -04:00
be44a2bca2
More work on JPA
2014-05-29 19:00:16 -04:00
a0b120f70e
Add history to JPA
2014-05-29 09:17:12 -04:00
2720e7d273
Lots more JPA improvementsa
2014-05-28 16:07:53 -04:00
adde115c53
working on binary resources
2014-05-28 07:30:40 -04:00
0ad18c0b77
JPA server is almost working
2014-05-27 18:52:46 -04:00
245533773f
More work to get transactions working
2014-05-26 09:09:54 -04:00
de3fbc9023
Get transaction working in server
2014-05-23 18:29:32 -04:00
03bf040ef9
More JPA work
2014-05-23 08:37:40 -04:00
78d712de25
Add transaction operation support, and refactor IdDt into smarter datatype with URL awareness
2014-05-22 18:38:29 -04:00
30065fdfae
More work on transaction method
2014-05-22 10:20:51 -04:00
62b909ff22
Starting work on transaction interaction
2014-05-22 07:46:24 -04:00
fab60d1ac8
Add deleted bundle entry handling
2014-05-21 18:12:00 -04:00
1b44e7282d
Fix a few issues with JPA
2014-05-21 16:17:45 -04:00
413baed28d
fdfdfd
2014-05-21 15:32:15 -04:00
df93b808e8
my change
2014-05-21 15:28:12 -04:00
f52ed02fa4
Get all of the tests passing again
2014-05-20 18:28:13 -04:00
5675237f40
Lots more JPA work, and getting sorting in`
2014-05-20 08:44:55 -04:00
27dab8a442
More JPA work
2014-05-18 09:40:52 -04:00
4002cc8824
More JPA work
2014-05-16 17:00:06 -04:00
610bb542ca
Introduce the ability for search parameters to have qualifiers, and add StringParameter to allow exact string matches
2014-05-16 08:34:31 -04:00
54ab77d51a
More JPA work
2014-05-15 17:52:56 -04:00
ca5927880f
More work on JPA
2014-05-15 08:08:07 -04:00
ed0902e40f
More JPA work
2014-05-14 18:03:17 -04:00
10dc8b39aa
More work on JPA server
2014-05-14 08:55:27 -04:00
4d0b7ba84c
Add QuantityDt and work on JPA server
2014-05-13 18:59:18 -04:00
0869b1fc14
Site updates
2014-05-12 08:38:06 -04:00
a269d257d3
Bump 0.3 and get all tests passing
2014-05-11 21:46:36 -04:00
fb998a6a32
Fix some bugs on the generic client
2014-05-09 17:54:55 -04:00
b937d5c2dc
More work on fluent interface
2014-05-09 08:37:19 -04:00
86e5948d60
Fluent interface is basically working
2014-05-09 08:32:42 -04:00
e66bd31171
Get fluent client working
2014-05-08 17:52:36 -04:00
2b683b8f02
Get fluent client working
2014-05-08 07:57:11 -04:00
de926434b8
FIx broken compile
2014-05-07 18:15:08 -04:00
5ad9e39d7b
Fluent interface starting up.. A few bit break right now
2014-05-07 18:14:08 -04:00
4b7a4ac794
Lots of bug fixes and documentation tweaks - Several failing unit tests checked in, need to get these passing
2014-05-07 08:18:43 -04:00
9f302937d9
Committing all fixes and changes from Connectathon - Lots of minor fixes, and a DB module
2014-05-05 05:57:43 -07:00
25a40df96e
More work on the tester, and a number of bug fixes
2014-05-02 19:56:26 -07:00
a1aedf2f31
Documentation fixes
2014-05-01 17:53:33 -04:00
862b1bd79d
More work on tester
2014-05-01 08:40:48 -04:00
63c9fb466c
A number of bugfixes around parsing and client implementation
2014-04-30 18:39:33 -04:00
f737797d7a
More tester work
2014-04-30 09:03:02 -04:00
51c95219f6
Tester work
2014-04-30 07:47:05 -04:00
7736e201e2
More qwork on the tester
2014-04-29 17:29:46 -04:00
c20e7e450a
More work on the tester
2014-04-29 09:27:06 -04:00
5615f9b7d7
Adding tester module - not nearly complete though
2014-04-28 18:04:26 -04:00
2287011601
Refactor method outcomes abit
2014-04-28 08:39:22 -04:00
e69464f34d
Lots of documentation (site and javadoc) updates, and make since and count params work for history operation
2014-04-27 22:17:27 -04:00
6877c0628e
Add validate method
2014-04-25 08:23:58 -04:00
15ae763313
Response writing is fixed
2014-04-24 17:27:25 -04:00
6d866b81b6
Get HttpServletRequest and Response working in server params
2014-04-24 12:25:47 -04:00
23a8b12b5e
Removing cruft files
2014-04-24 07:32:10 -04:00
b15462ddca
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
...
Conflicts:
hapi-fhir-base/pom.xml
hapi-fhir-structures-dstu/pom.xml
hapi-tinder-plugin/pom.xml
hapi-tinder-test/pom.xml
pom.xml
2014-04-24 07:31:12 -04:00
ab3173f840
add assembly
2014-04-24 07:24:27 -04:00
9ab7f8facc
Fix unit tests and add changelog
2014-04-23 15:24:31 -04:00
018e780343
Client security working
2014-04-23 14:23:32 -04:00
0b93dcc491
Fix broken unit tests and begin preparing for non-resource specific items
2014-04-22 17:10:25 -04:00
5da4698fab
Some refactoring - Currently does not compile,will fix this afternoon
2014-04-22 08:58:28 -04:00
e9a71d843a
Documentation enhancements
2014-04-17 18:13:23 -04:00
1808896b28
Site fixes
2014-04-15 08:50:42 -04:00
2c52f78eb5
Narrative changes
2014-04-14 16:26:00 -04:00
bdd5297603
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-04-14 13:01:54 -04:00
03ee95c011
Add test
2014-04-14 13:01:42 -04:00
2e5aac29d1
History operation working
2014-04-14 08:40:30 -04:00
84096da74d
Adding history
2014-04-10 15:57:45 -04:00
acb5b02672
Get delete working
2014-04-09 08:23:58 -04:00
7d319fa770
Start to implement delete
2014-04-08 18:30:51 -04:00
ad05d8262e
Remove Java 7 dependency
2014-04-03 17:26:52 -04:00
69461ef10e
Fixing unit tests
2014-04-03 14:30:49 -04:00
eda3995a72
More resources added
2014-04-03 07:45:07 -04:00
7c64466a51
More resource generation
2014-04-02 18:42:16 -04:00
f7a4b48e07
Doc updates
2014-04-02 08:05:16 -04:00
81b2b1cc50
More narrative work
2014-04-01 18:01:52 -04:00
57a3a4881e
Narrative fixes
2014-04-01 13:28:33 -04:00
5a3de7c3dd
Narrative generator docs
2014-04-01 08:12:45 -04:00
12d8e8d19c
Narrative docs
2014-03-31 17:10:05 -04:00
cfdf0bcf27
Website improvements
2014-03-31 08:19:31 -04:00
ea73770433
Documentation updates
2014-03-28 17:11:56 -04:00
b325a5bfb1
Create method almost working
2014-03-28 07:49:01 -04:00
b38be51668
Create methd
2014-03-27 18:38:24 -04:00
ad189d66e2
Starting workon post methods
2014-03-27 08:51:02 -04:00
082ebb64c1
Narrative generator now working
2014-03-26 17:37:08 -04:00
4953c5629c
Narrative enhancements
2014-03-26 08:59:42 -04:00
ece3fab5f8
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-03-25 18:09:23 -04:00
de50244875
Narrative generation continuing
2014-03-25 18:08:57 -04:00
d3fc34a30a
Removed CautionNote fields
2014-03-25 15:29:12 -04:00
21619e5e46
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-03-25 13:43:35 -04:00
fb23e82ee9
Adding AdverseReaction
2014-03-25 13:42:38 -04:00
fbf7305a92
Renamed "setMyCautionNote" method to "setCautionNote"
2014-03-25 13:14:57 -04:00
fe387b564b
Added Caution Note extension as a list of StringDt
2014-03-25 13:10:04 -04:00
fe26ff5515
Fix to generator
2014-03-25 09:04:54 -04:00
1481eb8ae5
More work on narrative gen
2014-03-24 18:33:51 -04:00
b55a4e140e
Lots of bugfixes, and narrative generator is started
2014-03-24 08:32:28 -04:00
46d6387761
JsonParser contained working
2014-03-22 12:33:07 -04:00
cb19b17e59
Many bugfixes
2014-03-21 15:32:37 -04:00
79bdd94f72
Some unit test fixes, still some failures
2014-03-21 08:12:44 -04:00
2c425ca144
Fixing URL detection
2014-03-20 18:29:34 -04:00
80826b62fd
Fix unit tests
2014-03-20 13:49:51 -04:00
1fddb04fb3
Start json parser
2014-03-20 08:02:36 -04:00
31e8584f12
Unit test fixes
2014-03-19 17:38:31 -04:00
f278d9d096
Fix unit tests
2014-03-19 11:40:06 -04:00
eb1df7b36a
Conformance generation
2014-03-19 08:56:37 -04:00
7b7a663748
Get server conformance working
2014-03-18 17:31:32 -04:00
b8dd4fa9f2
Fix unit tests
2014-03-18 11:54:20 -04:00
6b60703a74
Start include params
2014-03-18 08:41:48 -04:00
d6e3750657
Fix unit test bugs
2014-03-17 10:25:00 -04:00
2ca5d57f0d
Profile building complete
2014-03-17 08:57:57 -04:00
5088850e6b
More work on JSON parser, and contained resources
2014-03-16 15:09:30 -04:00
be7a31c4c5
More json parser work
2014-03-14 16:35:43 -04:00
f2ba56af2f
Start JSON parser
2014-03-14 08:57:30 -04:00
f0214399ca
Lots of fixes and docs to tinder
2014-03-13 17:33:12 -04:00
e0b5d224ca
Fix unit tests
2014-03-13 12:43:25 -04:00
561f765d00
Fixing extension building
2014-03-13 10:51:36 -04:00
45c968532d
Client generator now working
2014-03-13 08:00:01 -04:00
360db1d296
More work on documentation
2014-03-12 18:21:17 -04:00
8b6f00bb58
Workingon conformance operation for client
2014-03-12 09:03:17 -04:00
df2675867a
More documentation
2014-03-11 17:39:41 -04:00
fefd0e9a57
More documentation and profile export working
2014-03-11 08:39:55 -04:00
53882b2c23
Fix unit tests
2014-03-10 18:17:30 -04:00
6140e73034
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-03-10 12:44:33 -04:00
c830d5f45d
Getting profile generation working
2014-03-10 12:43:49 -04:00
1adfa2a246
updated AuthenticationException to extend BaseServerResponseException
2014-03-10 10:47:48 -04:00
daa5ed6ea8
updated authenticate method in ISecurityManager to be void and throw an AuthenticationException,
...
updated RestfulServer to return 401 when SecurityManager is present and authenticate throws the exception
2014-03-10 10:43:33 -04:00
e63bb877ac
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-03-07 17:31:38 -05:00
df46f25e7e
Website changes
2014-03-07 17:31:05 -05:00
79670cf172
added the ISecurityManager interface
2014-03-07 17:18:40 -05:00
ff28a821d4
More client work
2014-03-07 16:23:49 -05:00
9751aa15e8
More unit test work
2014-03-07 09:14:50 -05:00
b33d4028ab
Client working
2014-03-06 17:12:05 -05:00
82193017d8
More client work
2014-03-06 08:55:31 -05:00
b05ea01b45
Server is working a bit better still
2014-03-05 17:35:06 -05:00
d94d2719d9
Fix some merge issues
2014-03-05 09:33:29 -05:00
a74766e620
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
...
Conflicts:
hapi-fhir-base/src/main/java/ca/uhn/fhir/server/RestfulServer.java
2014-03-05 09:24:08 -05:00
b15504ab6a
Starting client implementation
2014-03-05 08:26:26 -05:00
3d281217da
Services working now
2014-03-04 18:25:52 -05:00
5828f49029
Server starting to work
2014-03-04 16:41:18 -05:00
ce17e82f9d
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-03-04 09:17:04 -05:00
a2d2b81d7f
Working on service implementation
2014-03-04 08:13:28 -05:00
72ef42680a
Maven plugin now working
2014-03-03 18:22:14 -05:00
0320d40bc1
Building from profiles now almost works
2014-03-03 09:05:55 -05:00
7926387786
ValueSet building
2014-02-28 16:30:34 -05:00
1fab951815
Enumerated types
2014-02-28 13:27:35 -05:00
42d8037a06
Atom parsing now works!
2014-02-27 16:51:43 -05:00
14b795ad68
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
...
Conflicts:
hapi-fhir-base/pom.xml
2014-02-27 13:23:35 -05:00
ff40a4c1e3
Upgrading HTTP client version for unit tests
2014-02-27 13:21:47 -05:00
115fccc622
Merge remote-tracking branch 'origin/master'
2014-02-27 12:07:54 -05:00
f2d530112e
cleaned up getting the return type for the resource method
2014-02-27 12:07:12 -05:00
45c9186dee
More Atom
2014-02-27 12:04:19 -05:00
bec9a51351
More Atom parsing work
2014-02-27 11:57:50 -05:00
b92cc66804
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
2014-02-27 11:49:23 -05:00
7e979449b2
added initial web service implementation under ca.uhn.fhir.ws package
2014-02-27 11:48:46 -05:00
193b181b63
About to try removing namespaces from parser
2014-02-27 10:20:25 -05:00
00411b64f6
More work on Atom
2014-02-27 07:39:36 -05:00
79a48611df
Starting bundle processing
2014-02-26 17:13:49 -05:00
352db3cc75
Sub resource blocks issue fixed
2014-02-26 09:03:43 -05:00
c8f02d5896
Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
...
Conflicts:
hapi-fhir-base/src/test/resources/example-uhn-profile.xml
2014-02-25 21:11:13 -05:00
dd400c683b
Starting Atom parse
2014-02-25 18:49:50 -05:00
e38740ac20
Adding simple setters for primitives
2014-02-25 08:43:55 -05:00
2640ed9feb
Starting works on profiles
2014-02-24 17:28:31 -05:00
e4d58077c8
FIx unit test - Need to deal with unexpected extensions still though..
2014-02-24 13:55:44 -05:00
1322dcfa7b
Code generation coming along
2014-02-24 11:46:08 -05:00
44f6e804b1
Extensions working now
2014-02-23 18:13:59 -05:00
20a705929c
Starting on extensions
2014-02-22 15:33:02 -05:00
668da7b0eb
More work
2014-02-21 21:06:11 -05:00
c878922362
More generator progress
2014-02-21 18:30:08 -05:00
0fff9075f1
More template fixes
2014-02-21 12:38:30 -05:00
f6cd0a0199
Starting autogen code
2014-02-20 16:32:04 -05:00
3717743cef
Parsing observation now works!
2014-02-20 12:13:05 -05:00
d097553f11
XML parser finally almost working
2014-02-19 17:33:46 -05:00
5296e8121c
..and still...
2014-02-19 13:02:51 -05:00
9aa5e52911
Still not passing
2014-02-19 11:59:12 -05:00
5e97109f4c
Still not parsing
2014-02-18 18:10:50 -05:00
87d4eb7c90
Still not working
2014-02-18 08:26:49 -05:00
8d322c373c
Just starting
2014-02-17 17:58:32 -05:00
jamesagnew
b.debeaubien
lmds1
petromykhailyshyn
Joseph Athman
t106uhn
akley
James
jamesagnew
t37622uhn
Yogthos