Commit Graph

24 Commits

Author SHA1 Message Date
Ken Stevens cdf5b602c1
Replace hamcrest with assertj (#5911)
* optimize imports

* optimize imports

* Hamcrest replacement

* Hamcrest replacement

* Test failures

* migrate hapi-fhir-base

* docs

* Few more cutovers

* Full rewrite of all assert cases

* Full rewrite of all assert cases

* Partial cutover

* assert library conversion

* wip

* fix imports

* remove equalto

* once-over again

* minor cutover

* wip

* wip

* wip

* wip

* wip

* Remove hamcrest asserts replace with assertj

* wip

* Partial hamcrest rip-out

* More hamcrest stripping

* wip

* Partial completion

* spotless

* it compiles now

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fixing compile issues

* fix compile issues

* fix compile issues

* hapi-fhir now compiles

* fix test

* fix test

* fix test

* fix tests

* fix tests

* fix tests

* fix test

* fix test

* fix tests

* fix tests

* fix tests

* yay all tests pass now!

* revert assertEquals change

* revert assertEquals change

* organize imports

* organize imports

* organize imports

* post merge cleanup

* organize imports

* more cleanup

* more cleanup

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* removing hamcrest stragglers

* organize imports

* organize imports

* remove final hamcrest stuff

* remove final hamcrest usages

* remove final hamcrest usages

* Revert "remove final hamcrest usages"

This reverts commit eaf5107396.

* fix compile issues from a hacky search/replace

* compiles with fixmes

* fix tests

* fix test

* fix test

* fix post merge compile issues

* fix post merge compile issues

* fix post merge compile issues

* fix post merge compile issues

* fix post merge compile issues

* fix post merge test issues

* fix test

* fix test

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* replace hamcrest with assertj

* all but mdm tests

* final hamcrest removed from hapi-fhir yay!

* revert mdm changes. it's too hard for now

* revert cdr breaking change

* revert cdr breaking changes

* revert cdr breaking changes

* revert cdr breaking changes

* revert cdr breaking changes

* revert changes that break cdr

* merge master with compile errors

* review feedback

* review feedback

* review feedback: revert bad regexp change

* fix test

* fix test

* convert new hamcrest entries

* convert new hamcrest entries

---------

Co-authored-by: Tadgh <garygrantgraham@gmail.com>
2024-06-05 16:02:46 -04:00
dotasek 7eb3150644
Update DSTU 3 Validation resources (#5320)
* Update resources with FHIR 3.0.1

* Minimize profiles

* Minimize valuesets

* Restore minimizer

* Changelog

* Remove FIXME, improve specificity of comments
2023-09-19 08:56:01 -07:00
James Agnew aa0301084b
Don't succeed validation on unknown codesystem (#1575)
* Don't succeed validation on unknown codesystem

* Test fixes

* Work on error messages

* Work on code validation API

* work on tests

* Work on validation

* Test fix

* Update DSTU3 validation reources

* Upgrade structures

* Test fixes
2019-11-12 14:35:49 -05:00
patrick-werner b4d2fcfc68 added core-extension validation support 2018-05-16 18:51:55 -04:00
Heinz-Dieter Conradi 8e000749ba Fix questionnaire schematron with enableWhen and hasAnswer
Without this fix, the 'hasAnswer' element of a questionnaire item is ignored.
This in turn allowes it that one can have both an 'answer' and a 'hasAnswer' item.

A fix is applied for both DSTU3 and R4 and tests are provided.

The tests for R4 are currently ignored, since they require a valid schematron,
e.g. by merging #869
2018-02-27 16:31:19 +01:00
James Agnew 9ca85b4cf3 Re-enable errorprone on standard hapi fhir build. woohoo! 2017-10-15 11:27:30 -04:00
James be5c5ebecd Merge in HAPI 3.0.0 working branch!
Squashed commit of the following:

commit 12f89a423a
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 14:38:51 2017 -0400

    Minimize validation resources

commit f6868cce5c
Merge: 3b80779fd3 1e158311d8
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 14:05:34 2017 -0400

    Forward port fix for #710

    Merge branch 'master' into hapi3_refactor

commit 3b80779fd3
Merge: 1f534985e8 356d9acaf7
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 12:31:09 2017 -0400

    Forward port #705, #708, and #710

    Merge branch 'master' into hapi3_refactor

commit 1f534985e8
Merge: 7c39a47852 dedd3d635b
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 10:52:59 2017 -0400

    Forward port #695

    Merge branch 'master' into hapi3_refactor

commit 7c39a47852
Merge: e0ffb84d21 6efafe62f1
Author: James <jamesagnew@gmail.com>
Date:   Sun Aug 13 09:53:17 2017 -0400

    Forward port #688

    Merge branch 'master' into hapi3_refactor

commit e0ffb84d21
Merge: 52388c11c1 d19b00ff09
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 12 14:59:46 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 52388c11c1
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 12 06:21:46 2017 -0400

    Cleanup

commit 209752cd63
Author: James <jamesagnew@gmail.com>
Date:   Thu Aug 10 11:18:19 2017 -0400

    Fix tests

commit 4543408dc8
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 5 06:55:50 2017 -0400

    Fix a potential deadlock

commit ee360f5376
Author: James <jamesagnew@gmail.com>
Date:   Sat Aug 5 06:22:06 2017 -0400

    Add R4 code to CLI

commit 1a95ba3b65
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Aug 3 06:14:01 2017 -0400

    More cleanup

commit f0d8802681
Author: James <jamesagnew@gmail.com>
Date:   Wed Aug 2 11:27:43 2017 -0400

    Tests are working!

commit a4cbda357e
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed Aug 2 10:42:04 2017 -0400

    Connection handling cleanup for new tests

commit 0e2cecfbd0
Author: James Agnew <jamesagnew@gmail.com>
Date:   Wed Aug 2 10:16:28 2017 -0400

    Clean up R4 JPA tests

commit 40317a650d
Author: James <jamesagnew@gmail.com>
Date:   Wed Aug 2 09:12:38 2017 -0400

    Work on R4 for JPA server

commit e7f8f8c30d
Author: James <jamesagnew@gmail.com>
Date:   Tue Aug 1 20:43:47 2017 -0400

    More work on porting tests

commit 43c9003258
Author: James <jamesagnew@gmail.com>
Date:   Tue Aug 1 07:09:29 2017 -0400

    Work on porting DSTU1 tests

commit 602857f1e2
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 31 22:34:08 2017 -0400

    More work on bring unit tests up to date

commit e326a7b0cd
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 31 17:36:38 2017 -0400

    Credit for #686 and forward port the fix to R4 validator

commit 96543c3992
Merge: 3fb75aa61a 9901b802c4
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 31 17:12:33 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 3fb75aa61a
Author: James <jamesagnew@gmail.com>
Date:   Mon Jul 31 15:21:30 2017 -0400

    More work on cleanup

commit b02fbb6804
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 22:11:07 2017 -0400

    Work on porting STU1 tests

commit 1ae37b0db3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 20:56:10 2017 -0400

    Try to get coverage report working

commit 72b88849b3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 20:27:02 2017 -0400

    Fix android tests

commit e5f6c35aea
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 30 19:31:18 2017 -0400

    More work on getting legacy code cleaned up

commit 0b513b0845
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 30 18:41:13 2017 -0400

    Continue work on removing deprecated API

commit defea69aa3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 17:10:01 2017 -0400

    More cleanup of legacy code

commit 9ae7295705
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 30 07:11:45 2017 -0400

    More cleanup of legacy code

commit ebd3eeb5ee
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jul 30 06:43:25 2017 -0400

    More work on removing legacy code

commit 92224c2532
Author: James <jamesagnew@gmail.com>
Date:   Sat Jul 29 18:44:06 2017 -0400

    Remove DSTU1 Bundle

commit c52cacf71b
Author: James <jamesagnew@gmail.com>
Date:   Sat Jul 29 14:27:42 2017 -0400

    Now compiling

commit b405e51773
Merge: c3ddf04e25 cb2cea54d7
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Jul 28 06:21:02 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit c3ddf04e25
Author: James <jamesagnew@gmail.com>
Date:   Thu Jul 27 11:06:06 2017 -0400

    Sync R4 releases in

commit b13333c3c0
Author: James <jamesagnew@gmail.com>
Date:   Fri Jul 14 05:52:33 2017 -0400

    JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions.

commit 2e60ff7521
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 13 20:02:46 2017 -0400

    Fix imports

commit a92ace2e0d
Merge: 3196db96d1 1a6b3ea867
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 13 12:02:27 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 3196db96d1
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 13 11:48:10 2017 -0400

    Don't add false paging link to request

commit bd4e1d3388
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 9 21:32:16 2017 -0400

    Finally building correctly!

commit 6464ce9304
Author: James <jamesagnew@gmail.com>
Date:   Sun Jul 9 16:38:28 2017 -0400

    Work on refactor

commit 0059f2e48e
Author: James <jamesagnew@gmail.com>
Date:   Sat Jul 8 07:16:20 2017 -0400

    Keep working on refactor

commit 6c2e87e8cc
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 22:35:13 2017 -0400

    Lots of work on refactor

commit 11cab97504
Merge: 34ec6b8807 6c47bd4c51
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 21:43:57 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit 34ec6b8807
Merge: f8e647511b c520e60ac1
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 21:43:49 2017 -0400

    Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor

commit f8e647511b
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Jul 6 18:46:55 2017 -0400

    Work on hapi3 changes

commit c520e60ac1
Author: James <jamesagnew@gmail.com>
Date:   Wed Jul 5 08:08:40 2017 -0400

    Keep working on refactor

commit f1d2ee9092
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 3 22:10:59 2017 -0400

    Continue refactor for HAPI 3

commit 9281ccafc3
Merge: ea1264cd8e 294d080bd3
Author: James Agnew <jamesagnew@gmail.com>
Date:   Mon Jul 3 20:34:16 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit ea1264cd8e
Author: James <jamesagnew@gmail.com>
Date:   Wed Jun 28 10:26:01 2017 -0400

    Continue work on refactor

commit fbe2f98a02
Merge: b2bef47100 0a4dcc32ec
Author: James <jamesagnew@gmail.com>
Date:   Wed Jun 28 06:21:22 2017 -0400

    Merge branch 'master' into hapi3_refactor

commit b2bef47100
Author: James <jamesagnew@gmail.com>
Date:   Tue Jun 27 21:13:23 2017 -0400

    Work on refactor

commit 8f76e4e463
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Jun 25 21:55:35 2017 -0400

    Lots of work on refactoring
2017-08-13 14:39:47 -04:00
Joel Schneider (NMDP) dbdebdbcda revise ValueSet/request-intent URL, to resolve CLI upload-definitions problem 2017-05-22 23:39:12 -05:00
James 077676fd03 Bring DSTU3 structs up to FHIR R3
Squashed commit of the following:

commit 65b70d30c9
Author: James <jamesagnew@gmail.com>
Date:   Tue Apr 18 07:44:08 2017 -0400

    More work on bringing structs up to date

commit 1df2de0667
Author: James <jamesagnew@gmail.com>
Date:   Tue Apr 18 07:12:45 2017 -0400

    Working

commit 9a51323e03
Author: James <jamesagnew@gmail.com>
Date:   Mon Apr 17 22:18:24 2017 -0400

    Updates to STU3

commit 40aebba0a7
Author: James <jamesagnew@gmail.com>
Date:   Mon Apr 17 18:30:26 2017 -0400

    Fix regression caused by #610
2017-04-18 07:48:38 -04:00
James 8758b6f3da Updating to 1.9.0 structures
Squashed commit of the following:

commit 81edf46fe02a88851693f958e60855edfe69c04c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Mar 17 21:05:22 2017 -0400

    Work on converter

commit 3342d987008892dd3a75dddd251fe599c31c5a6c
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 08:40:37 2017 -0400

    Site updates

commit 7dcb63904ece1fcb59a09dc268e8382ac0b75535
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 08:36:39 2017 -0400

    STU3 structs working!

commit c5aec809e3f19f3fedf0aaaeab8cdd7924c144a2
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 07:05:54 2017 -0400

    Format test

commit 5033090010e8c93644505bccaa5e41ccbd756485
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 07:03:39 2017 -0400

    Merge tests for STU3

commit de40a516bfa4d2ab7f5e28e2d95815fde68bd10a
Merge: d5a5a60 899ed25
Author: James <jamesagnew@gmail.com>
Date:   Fri Mar 17 06:59:20 2017 -0400

    Merge branch 'master' into dstu3_latest_structs

commit d5a5a601b53d8be6712f0bfe37ba7e6eb4d3ce58
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 14 12:04:37 2017 -0400

    Latest fixes

commit ae46ad53d2075e66e3c58c1e626652b4e144f20c
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 14 06:51:59 2017 -0400

    STU3 structs passing

commit ec3b62d31131d303001f8574c58fb7a8b8194f68
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 22:20:05 2017 -0400

    Fix some tests

commit 933f9b08c32dd8671638f406a0966c5ee07d86a1
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 21:18:03 2017 -0400

    Fix test

commit 2a3ad0b422f58cfffea966a7005c6a3d86d189da
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 21:07:33 2017 -0400

    Resolve compile issues in STU3

commit fe04eba312a42c74b10a3971e4d61d58ba003bf9
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:51:35 2017 -0400

    FIx compilation error

commit 6c63a558c97cf176105967a84a0b32472c6c0fcb
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:48:13 2017 -0400

    Another STU3 struct fix

commit 6acd25458aad89aaff94768c824d4d1fcdac97ba
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:41:16 2017 -0400

    Work on STU3 structs

commit 90a476dba2665a129572ad5cbbd8dd29afd9d4c8
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:28:32 2017 -0400

    Resolve JDK8 dependencies

commit 783bc1519971e977fe7139aa1d3a2e7f37940a63
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Mar 12 20:20:57 2017 -0400

    Fix some tests

commit 60c379175b689495e65278bb6a237af3de379aa8
Author: James <jamesagnew@gmail.com>
Date:   Sun Mar 12 19:56:29 2017 -0400

    Work on STU3 structs

commit e98c2eed6601f7009e199aca3b82399a3377077c
Author: James <jamesagnew@gmail.com>
Date:   Sun Mar 12 19:41:48 2017 -0400

    Work on DSTU3 structures

commit 3ce909212bf0f11561b8342d406cffcf957afeb3
Author: James <jamesagnew@gmail.com>
Date:   Tue Mar 7 21:03:14 2017 -0500

    Work up upgrading structs
2017-03-17 21:06:12 -04:00
James 901a85880c Update STU3 definitions and being in STU2.1 defs too 2016-12-10 19:51:25 -05:00
Jim Steel be973e0182 Fixed typo in valueset constraint 2016-11-10 11:13:06 +10:00
James a5d5d3e031 Bump FHR version 2016-11-06 17:34:13 -05:00
James ddc0abe4ed Update to final STU3 ballot definitions 2016-08-26 07:55:10 -04:00
James Agnew 3e7cd153fd Update DSTU3 definitions to latest 2016-08-05 12:36:41 -04:00
James Agnew c550681aeb Update defs to 1.5.0 versions 2016-07-12 18:29:10 -04:00
jamesagnew 4a49e5b7f9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-01 14:31:25 -04:00
James Agnew 0a2b4290ed Fix #370 - Validation failure when validating certain STU3 resources 2016-06-08 14:21:18 -07:00
James Agnew eb3b656a5f Syn RI - Build still failing :( 2016-05-28 12:53:59 -04:00
James Agnew af2b702aa4 Fixes from Montreal connectathon 2016-05-07 14:24:33 -04:00
jamesagnew 27ec35338a Update to latest structure defs and validator 2016-05-01 21:31:14 -04:00
jamesagnew 18b3d0df65 Update to DSTU3 Montreal definitions 2016-04-03 18:14:31 -04:00
James Agnew 6f79f6c5e2 Keep the complete resource history in the history table, including the
current version
2016-03-09 15:34:49 -05:00
jamesagnew 32daeb6f58 Switch DSTU2.1 to DSTU3 per FMB's decision 2016-02-01 08:55:58 -05:00