Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rel 6 1 2 mergeback #4033

Merged
merged 63 commits into from
Sep 15, 2022
Merged

Rel 6 1 2 mergeback #4033

merged 63 commits into from
Sep 15, 2022

Conversation

tadgh
Copy link
Collaborator

@tadgh tadgh commented Sep 15, 2022

No description provided.

tadgh and others added 30 commits August 3, 2022 10:55
* Bump for CVE

* Bump spring-data version

* Fix compile

* Cut over to spring bom
…esponse (#3882)

* Finish up changelog, minor refactor

* reset buffer only

* Hack for some replacements

* Failure handling

* wip
* Fixed the issue

* Changelog modification

* Changelog modification
#3709)

* Implemented seventh character extended code and the corresponding display

* Modifications

* Changes on previous test according to modifications made in ICD10-CM XML file
* fixed bug and added test

* refactor
* updated pointcuts to work as intended

* added changelog

* review fixes

Co-authored-by: leif stawnyczy <[email protected]>
…e left orphaned (#3905)

* Add test and implementation

* Add changelog
* Add implementation, changelog, test

* Update hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java

Co-authored-by: Ken Stevens <[email protected]>

Co-authored-by: Ken Stevens <[email protected]>
* Applying all changes from previous dev branch to current one pointing to rel_6_1

* Fixing merge conflict related to Msg.code value.

* Fixing Msg.code value.

* Making checkstyle happy.

* Making sure that all tests are passing.

* Passing all tests after fixing Msg.code

* Passing all tests.

Co-authored-by: peartree <[email protected]>
#3746)

* 3745 - fixed NPE for bundle with duplicate conditional create resources and a conditional delete

* created unit test for skip of delete operation while processing duplicating create entries

* moved unit test to FhirSystemDaoR4Test
* added MdmLinkCreateSvcimplTest

* fixed creating mdm-link not setting the resource type correctly

* fixed a bug where ResourcePersistenceId was being duplicated instead of passed on

* Update hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImplTest.java

Change order of tests such that assertEquals takes expected value then actual value

Co-authored-by: jdar8 <[email protected]>

* added changelog, also changed a setup function in test to beforeeach

Co-authored-by: Long Ma <[email protected]>
Co-authored-by: jdar8 <[email protected]>
* Fix to the issue

* Progress

* fixed the issue

* Addressing suggestions

* add response status code to MethodOutcome

* Addressing suggestions

Co-authored-by: Ken Stevens <[email protected]>
* Respect caching in bullk export, fix bug with completed date on empty jobs

* add changelog

* Add impl

* Add breaking test

* Complete failing test

* more broken tests

* Fix more tests'

* Fix paging bug

* Fix another brittle test
* do not attempt to merge compartment permissions with filters

* changelog

* Rename to IT for concurrency problems

Co-authored-by: Tadgh <[email protected]>
* begin with failing test

* fixed

* change log

* rollback default count change and corresponding comments

Co-authored-by: Ken Stevens <[email protected]>
* lower batchsize of delete requests so that we do not get sql exceptions

* blah

* fix test

* updated tests to not fail

Co-authored-by: leif stawnyczy <[email protected]>
@tadgh tadgh enabled auto-merge (squash) September 15, 2022 21:27
@tadgh tadgh merged commit c3339f3 into master Sep 15, 2022
@tadgh tadgh deleted the rel_6_1_2_mergeback branch September 15, 2022 22:18
michaelabuckley added a commit that referenced this pull request Sep 20, 2022
…site-sp-hsearch

* commit '14253dd0e3112721692fb98a94a54922a4177ac4': (41 commits)
  3960 when creating a resource patient where patientmetasource is provided with a hash the hash value is overwritten (#3965)
  Rel 6 1 2 mergeback (#4033)
  change search method for missing parameter names (#3982)
  removed library immunizationCQLLibrary (#4024)
  #3738 renamed patient parameter to subject (#4019)
  Avoid NPE when run in IJ (#4018)
  Add disabled test reproducing open bug (#3994)
  ForcedOffsetSearchModeInterceptor should not modify the search when it is already manually marked as synchronous (#4016)
  Iam opensearch auth (#4011)
  Broken bulk export (#4012)
  Handling unexpected response status code of import-poll-status operation (#3939)
  Rel 6 1 1 mergeback (#4004)
  3984 rework immunization cql unit test (#4005)
  Issue 3419 elastic search exception while pre expanding valueset with more than 10 000 concepts (#3991)
  :nickname Qualifier Support for Custom SearchParameters (#3969)
  Ensure HS before attempting fulltext reindex.   (#3995)
  Everything operation with type param code review fixes (#3926)
  update azure-pipelines.yml to match projects that have tests (#3993)
  Fixed the issue of bulk export returning the wrong path if "Fixed Value for Endpoint Base URL" is set (#3958)
  Add support for ICD-10 International Version (Fixes #3734) (#3849)
  ...

# Conflicts:
#	hapi-fhir-jpaserver-elastic-test-utilities/src/test/resources/logback-test.xml
michaelabuckley added a commit that referenced this pull request Sep 23, 2022
* commit '6f80206776bf1f3bf46576d8c457c7e9d2009f29':
  Fix transactional issue in everything operation (#4063)
  changed the comment in Msg class (#4061)
  Revert "changed the comment in Msg class, and added changelog (#4049)" (#4059)
  changed the comment in Msg class, and added changelog (#4049)
  Add test and changelog (#4039)
  Add changelog, test, and implementation (#4055)
  changing fetch depth to 1 (#4056)
  Change hsearch to consider unquoted parameter strings as prefix match (#4045)
  Fix content negotiation on binary streaming (#4053)
  fix-matchers-not-contains-in-asserts (#3913)
  3929 batch2 jobs file fetching step strict policy for response header content type (#3945)
  4030 bulk export to support fhir basepatientid$export endpoint (#4032)
  SMILE-3459 Implemented -l parameter in validator. (#3983)
  Skip resource updating completely if found in package load.  (#4036)
  Add :text handling to StringParam (#4047)
  3960 when creating a resource patient where patientmetasource is provided with a hash the hash value is overwritten (#3965)
  Rel 6 1 2 mergeback (#4033)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants