Commit Graph

1692 Commits

Author SHA1 Message Date
jamesagnew b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml
2015-04-21 13:30:58 -04:00
James Agnew 02070affbf Merge pull request #153 from mochaholic/master
Read server interceptors from the spring context.
2015-04-20 14:47:24 -04:00
James Agnew 3db46c2db2 More work on hl7org strfucts 2015-04-15 16:37:24 -04:00
jamesagnew 8c873ef023 Remove hard coded persistence context name 2015-04-09 21:44:18 -04:00
mochaholic 3003b5e17b Update to the latest upstream. 2015-04-09 07:25:09 -06:00
jamesagnew 1f51c69126 Fix #139 - ContactPointDt fields don't index in JPA module 2015-04-05 16:18:14 -04:00
jamesagnew 11507ef97c Fix #148 - Add _count support to everything operation 2015-04-05 14:53:15 -04:00
jamesagnew 8c37973a78 Fix #147 - no duplicates in 'everything' operation 2015-04-04 23:36:04 -04:00
James Agnew 1bdd2daa8e One last synchronization to DSTU2 2015-04-02 11:37:40 -04:00
James Agnew c484425c78 Update license file generation and gitignores 2015-03-26 11:57:07 -04:00
jamesagnew 986094617a Fix #135 - Remove Eclipse and IntelliJ artifacts from version control 2015-03-26 07:56:24 -04:00
jamesagnew 3d6c54a47e Add license and notice files 2015-03-25 22:32:32 -04:00
jamesagnew 92c0859eaa Fix broken unit test 2015-03-24 20:59:34 -04:00
James Agnew f9b8432d65 Searching in JPA server with no search parameters returns deleted
resources when it should exclude them
2015-03-24 18:39:19 -04:00
James Agnew 0c8f50737f Sync to latest version of DSTU2 2015-03-24 17:19:34 -04:00
James Agnew cffda7539f Work on support for $everything operation 2015-03-23 19:06:14 -04:00
James Agnew c8a70c1904 Fix #124 - Resource references shouldn't include version when they are
encoded
2015-03-23 07:55:32 +01:00
James Agnew ef88eb9a97 Get reverse includes working 2015-03-22 17:26:25 +01:00
James Agnew e84fdb33b0 Fix up some regressions caused by move to DSTU2 style include paths and
work on revincludes
2015-03-22 16:59:10 +01:00
James Agnew 596dd664f9 Switch JPA server to use new include style 2015-03-22 13:04:52 +01:00
James Agnew 7adf48a38a Add support for meta operations in JPA server 2015-03-21 13:09:36 +01:00
James Agnew 1598e7ec5a Fix #129 - Resources in JPA server could not be undeleted 2015-03-19 13:40:40 +01:00
James Agnew 6020368162 Add setEncoding and setPrettyPrint methods to generic client, and add
documentation for #113
2015-03-19 12:16:04 +01:00
jamesagnew 43e2cd1653 Version bump to 1.0-SNAPSHOT 2015-03-16 09:06:53 -04:00
jamesagnew 46ec5799ae License update 2015-03-14 17:21:48 -04:00
jamesagnew faf7c410e1 Fix transaction parsing bug for DSTU2 using old Bundle format. Finalize documentation for 0.9 2015-03-14 15:06:32 -04:00
jamesagnew 3c6febb668 Preparing for 0.9 release 2015-03-13 08:34:52 -04:00
James Agnew a2e562de64 Implement sorting on _id and clean up create/update semantics for DSTU2 2015-03-11 12:49:47 -04:00
James Agnew 9a9501c53f JPA demo enhancements and site work 2015-03-10 17:56:55 -04:00
jamesagnew d083bfbc65 Sort improvements 2015-03-09 08:25:51 -04:00
jamesagnew 5fd987c497 Work on sort support in JPA 2015-03-09 08:01:13 -04:00
jamesagnew da1d49a108 Correctly index Observation.applies[x] in JPA server 2015-03-08 16:55:42 -04:00
jamesagnew 32ad3ab22c Complete Extended Operations support 2015-03-08 15:40:04 -04:00
jamesagnew 06ea9a1453 More work on operation support for DSTU2 2015-03-06 17:55:35 -05:00
jamesagnew 7905e9d918 Add support for quantity search params in tester UI 2015-03-06 09:53:50 -05:00
James Agnew 47c98ffe4e Fix broken build 2015-03-05 09:39:29 -05:00
jamesagnew b68d07b546 Work on operation support in client 2015-03-04 08:44:31 -05:00
James Agnew fc4fb07562 Work on history suport for fluent client 2015-03-03 18:31:01 -05:00
jamesagnew 27e126254c More work on operations in client 2015-03-03 08:22:26 -05:00
James Agnew dae2a810d6 Update resource definitions for DSSTU2 2015-03-02 22:39:53 -05:00
James Agnew 748efc4a97 Site updates 2015-03-02 06:56:16 -05:00
jamesagnew a81e081798 Work on transaction support for DSTU2 2015-03-01 18:00:06 -05:00
James Agnew db65d5db59 Work on support for new bundle format in DSTU2 2015-02-27 18:09:24 -05:00
jamesagnew 6580abe5f2 Add some new tests for JPA DSTU2 operations 2015-02-27 08:45:34 -05:00
James Agnew 0a8c7c4960 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-26 17:28:05 -05:00
James Agnew 0f2eb230e7 More work on getting conditional updates working 2015-02-26 17:17:22 -05:00
jamesagnew 4dce8a0152 Site updates 2015-02-26 09:12:35 -05:00
James Agnew ecd3620e27 Add configurable default response encoding to server, and serve Binary
resources as FHIR resources instead of blobs if the user has explicitly
requested an encoding
2015-02-25 11:18:37 -05:00
James Agnew 2c4b37e5f0 Just eclipse settings 2015-02-24 16:40:38 -05:00
jamesagnew 3812260a55 Fix #110 - Support DSTU2 Security Labels, merging in Pull Request from Mohammad Jafari - Merge branch 'master' of https://github.com/mochaholic/hapi-fhir into mochaholic-master
Conflicts:
	hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java
2015-02-24 07:49:31 -05:00
mochaholic 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
jamesagnew 315ad439e4 Work on adding conditional HTTP operations to client and JPA server 2015-02-23 09:08:59 -05:00
jamesagnew e2c49d08fe Merge in changes for JPA updates 2015-02-19 08:39:01 -05:00
jamesagnew 471c80fdd3 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-18 22:24:05 -05:00
jamesagnew 4f93ab9313 Work on JPA Transaction for DSTU2 2015-02-18 22:23:46 -05:00
James Agnew 1127b1a9d5 Revert bad commit 2015-02-18 10:45:43 -05:00
jamesagnew 7beb265142 Start working on new transaction in DSTU2 JPA server 2015-02-18 09:16:48 -05:00
James Agnew 7d62951f71 Fix the build for real! 2015-02-17 16:06:28 -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 35a2f852fe Start work on decoupling dstu1 structures 2015-02-12 17:32:00 -05:00
James Agnew ec5f7afa5e More site work 2015-02-11 17:00:49 -05:00
jamesagnew ab28a99d82 Doc updates 2015-02-09 22:26:04 -05:00
jamesagnew 5600ba6763 Implement DSTU2 transaction semantics in JPA 2015-02-08 19:21:29 -05:00
jamesagnew 1f958221a7 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-02-07 12:28:07 -05:00
jamesagnew 1a8bd21517 Just more tests 2015-02-07 12:27:59 -05:00
James Agnew 0b726c3564 Fix compile issues 2015-02-06 16:41:34 -05:00
James Agnew f4805f83d1 Create DSTU2 project 2015-02-06 15:50:29 -05:00
James Agnew 64944d6d81 JPA Documentation updates 2015-02-05 10:25:18 -05:00
James Agnew a474870a1e Work on JPA example 2015-02-03 17:53:22 -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 9d7796f0be Implement JPA transaction deletion operation 2015-01-29 10:17:46 -05:00
jamesagnew 18acda7be2 Get all of the unit tests passing for DSTU1/DSTU2 split 2015-01-24 01:07:09 +05:30
jamesagnew 96fe70de59 Clean up metadata parsing in XML parser 2015-01-10 13:44:40 -05:00
jamesagnew 51f58f6165 Fix #79 - Support _include=* in JPA 2015-01-10 11:39:41 -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 837f21ba8e Use Hibernate 4.2 instead of 4.3 2015-01-08 10:46:16 -05:00
jamesagnew f1c151b2f5 Documentation 2015-01-05 21:19:47 -05:00
James Agnew 6b3d92fde1 Cleaning up JavaDocs to allow building in Java 8 2014-12-30 16:39:38 -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 c8adab5452 Better logging in JPA 2014-12-23 09:42:16 -05:00
jamesagnew 994e49057d Lots of work on DSTU2 server 2014-12-21 18:13:37 -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
James Agnew 2d5293c2ef Merge pull request #63 from wdebeau1/master
Fix for #59
2014-12-17 12:25:07 -05:00
James Agnew 8e6bb6333f Unit tests 2014-12-16 16:27:00 -05:00
b.debeaubien 4599ec1544 #59 - Even more sorting out profile vs id problem 2014-12-16 13:48:59 -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
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
James Agnew c10f501fdc Fix #62 - JPA server failed to correctly process _include when included
resources have a non-numeric ID
2014-12-16 10:38:18 -05:00
jamesagnew 59ba1c9f7b Almost have unit tests passing 2014-12-14 22:29:15 -05:00
James Agnew f632d119b4 Fix #55: Transaction in JPA should replace "cid:" IDs with server
assigned IDs
2014-11-20 10:52:16 -05:00
jamesagnew 9d4a56bf47 More work on #52 2014-11-19 08:17:48 -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
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
James Agnew 103b1ba99f Hopefully fix Windows build issue 2014-10-31 14:30:33 -04:00
James Agnew 135ba9d9e6 Moving site generation into root project 2014-10-30 13:57:29 -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 c26602f0c8 Versions now builds completely! 2014-10-24 15:43:35 -04:00
jamesagnew 818177f70f Bunp to 0.7 for release 2014-10-23 08:12:58 -04:00
James Agnew bb0b39627d Unit tests almost all passing 2014-10-16 17:19:27 -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
t106uhn 686237f970 bump to 0.8-SNAPSHOT 2014-09-26 20:50:36 -04:00
James Agnew 0d6eca70a9 Work on #30, still not working though... 2014-09-26 17:16:37 -04:00
jamesagnew 1fecb8ad76 Parameter type cleanup from connectathon 2014-09-17 08:32:15 -04:00
jamesagnew 1f0f9176fe Work on base server URL determination code 2014-09-13 12:05: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
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 0ff847ac21 Fix failing unit tests 2014-08-12 12:27:51 -04:00
James Agnew cbd79d66ad Fix #8- Can't read version history of resource with non-numeric ID 2014-08-08 14:16:40 -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
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
James Agnew ef10560c76 Version bump to 0.6-SNAPSHOT 2014-07-30 11:58:06 -04:00
jamesagnew 67fb593146 Finalize 0.5 2014-07-29 22:26:19 -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 622e528f43 Lots of documentation updates 2014-07-22 18:12:01 -04:00
jamesagnew af3c35cbc0 More API cleanup and documentation 2014-07-22 09:14:02 -04:00
James Agnew 4713639713 Fix unit tests 2014-07-21 10:17:07 -04:00
jamesagnew 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
jamesagnew 6aa3560564 Starting work on consolidating params 2014-07-19 12:10:43 -04:00
James Agnew d15dbd4317 Add interceptor framework 2014-07-18 17:49:14 -04:00
jamesagnew 84af486d51 Tester now suports chained parameters 2014-07-17 08:32:01 -04:00
James Agnew 41f160ed67 Documentation updates and bump to 0.5-SNAPSHOT 2014-07-15 18:36:13 -04:00
jamesagnew 568972b098 Release 0.4 2014-07-13 21:59:41 -04:00
jamesagnew 0a7f7d0390 Start with sample code in tester UI 2014-07-11 09:15:38 -04:00
James Agnew 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
James Agnew 28ebda71e1 Let IdDt clone without being heavyweight 2014-07-10 08:50:51 -04:00
jamesagnew 4d517aa76f Add ability for IDs to be client specified in JPA 2014-07-10 08:17:55 -04:00
jamesagnew 1b7b141396 Tester improvements 2014-07-08 08:44:13 -04:00
James Agnew d3b4a3ad60 Add searching by code text 2014-07-07 18:34:49 -04:00
James Agnew b1a602d88b Fix a few unit tests 2014-07-07 12:42:37 -04:00
James 46828030db Deal with max lenghts in search params 2014-07-07 12:15:20 -04:00
jamesagnew cb2b54cb09 Move searches with required parameters to unnamed queries 2014-07-07 09:23:23 -04:00
James ca0929df07 Work on narrative generator 2014-07-03 18:02:14 -04:00
James c811c164b5 Fix unit test 2014-07-03 10:34:55 -04:00
jamesagnew ab9e681ed2 Start adding transaction to tester 2014-07-03 08:51:42 -04:00
James 0ece666c88 FIx a bunch more unit tests 2014-07-02 18:01:29 -04:00
James 1c05bcb29c Fix a number of unit tests 2014-07-02 15:24:29 -04:00
jamesagnew 14befcd091 Lots of tester enhancements 2014-07-02 08:57:07 -04:00
jamesagnew f87c50b4b4 Lots of tester work 2014-06-27 18:28:27 -04:00
jamesagnew acbffecd15 Still trying to get this working with Jenkins 2014-06-25 17:01:32 -04:00
jamesagnew 68ea31495c More enhancements for the tester, and merge read/vread methods 2014-06-25 09:07:14 -04:00
jamesagnew ba09da38b6 Start adding paging support 2014-06-23 09:04:48 -04:00
jamesagnew 5152f0ba9b Lots more work getting the JPA tester working 2014-06-17 07:48:50 -04:00
jamesagnew e0ae780ff2 Fix issue with JPA search params 2014-06-16 18:07:55 -04:00
jamesagnew bba62b2972 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-06-12 22:21:45 -04:00
jamesagnew 00f7a76ee9 Lots more work on the tester servlet 2014-06-12 22:20:23 -04:00
jamesagnew 1c6bcfee4c FIx problem with non-code having token search params 2014-06-12 17:38:28 -04:00
jamesagnew ab3d656249 Fix some encoding issue for token params 2014-06-12 17:13:49 -04:00
jamesagnew d241df9868 Fix broken test cases 2014-06-12 13:00:31 -04:00
jamesagnew 96986f8829 Lots of cleanup and try to speed up transacitons in JPA 2014-06-12 11:42:28 -04:00
jamesagnew 04fc0827ef Clean up transactions in JPA 2014-06-06 17:10:31 -04:00
jamesagnew ee4ca9c934 Performance enhancements on JPA history 2014-06-05 17:06:49 -04:00
jamesagnew 54078be6e0 Fox a bunch of JPA bugs 2014-06-05 16:01:00 -04:00
jamesagnew dfa88a442c Get history and tags working properly on JPA 2014-06-02 09:07:10 -04:00
jamesagnew be44a2bca2 More work on JPA 2014-05-29 19:00:16 -04:00
jamesagnew a0b120f70e Add history to JPA 2014-05-29 09:17:12 -04:00
jamesagnew 2720e7d273 Lots more JPA improvementsa 2014-05-28 16:07:53 -04:00
jamesagnew 0ad18c0b77 JPA server is almost working 2014-05-27 18:52:46 -04:00
jamesagnew 245533773f More work to get transactions working 2014-05-26 09:09:54 -04:00
jamesagnew de3fbc9023 Get transaction working in server 2014-05-23 18:29:32 -04:00
jamesagnew 03bf040ef9 More JPA work 2014-05-23 08:37:40 -04:00
jamesagnew 62b909ff22 Starting work on transaction interaction 2014-05-22 07:46:24 -04:00
jamesagnew 1b44e7282d Fix a few issues with JPA 2014-05-21 16:17:45 -04:00
jamesagnew 8053967032 Fix last unit tests failing 2014-05-21 08:46:36 -04:00
jamesagnew 75205c5d75 Get JPA working with single table 2014-05-21 08:04:00 -04:00
jamesagnew f52ed02fa4 Get all of the tests passing again 2014-05-20 18:28:13 -04:00
jamesagnew 5675237f40 Lots more JPA work, and getting sorting in` 2014-05-20 08:44:55 -04:00
jamesagnew 27dab8a442 More JPA work 2014-05-18 09:40:52 -04:00
jamesagnew 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
jamesagnew 54ab77d51a More JPA work 2014-05-15 17:52:56 -04:00
jamesagnew ca5927880f More work on JPA 2014-05-15 08:08:07 -04:00
jamesagnew ed0902e40f More JPA work 2014-05-14 18:03:17 -04:00
jamesagnew 10dc8b39aa More work on JPA server 2014-05-14 08:55:27 -04:00
jamesagnew 4d0b7ba84c Add QuantityDt and work on JPA server 2014-05-13 18:59:18 -04:00
jamesagnew e3bb0fa3be More work on JPA server 2014-05-13 09:01:52 -04:00
jamesagnew a269d257d3 Bump 0.3 and get all tests passing 2014-05-11 21:46:36 -04:00
jamesagnew b937d5c2dc More work on fluent interface 2014-05-09 08:37:19 -04:00
jamesagnew 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
jamesagnew 9f302937d9 Committing all fixes and changes from Connectathon - Lots of minor fixes, and a DB module 2014-05-05 05:57:43 -07:00