Skip to content

Commit

Permalink
Rel 6 1 1 mergeback (#4004)
Browse files Browse the repository at this point in the history
* Bump for CVE (#3856)

* Bump for CVE

* Bump spring-data version

* Fix compile

* Cut over to spring bom

* Bump to RC1

* remove RC

* do not contrain reindex for common SP updates (#3876)

* only fast-track jobs with exactly one chunk (#3879)

* Fix illegalstateexception when an exception is thrown during stream response (#3882)

* Finish up changelog, minor refactor

* reset buffer only

* Hack for some replacements

* Failure handling

* wip

* Fixed the issue (#3845)

* Fixed the issue

* Changelog modification

* Changelog modification

* Implemented seventh character extended code and the corresponding dis… (#3709)

* Implemented seventh character extended code and the corresponding display

* Modifications

* Changes on previous test according to modifications made in ICD10-CM XML file

* Subscription sending delete events being skipped (#3888)

* fixed bug and added test

* refactor

* Update for CVE (#3895)

* updated pointcuts to work as intended (#3903)

* updated pointcuts to work as intended

* added changelog

* review fixes

Co-authored-by: leif stawnyczy <[email protected]>

* 3904 during $delete expunge job hibernate search indexed documents are left orphaned (#3905)

* Add test and implementation

* Add changelog

* 3899 code in limits (#3901)

* 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]>

* 3884 overlapping searchparameter undetected rel 6 1 (#3909)

* 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]>

* 3745 - fixed NPE for bundle with duplicate conditional create resourc… (#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

* 3379 mdm fixes (#3906)

* 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 (#3855)

* 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]>

* Fix for caching appearing broken in batch2 for bulkexport jobs (#3912)

* 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

* 3915 do not collapse rules with filters (#3916)

* do not attempt to merge compartment permissions with filters

* changelog

* Rename to IT for concurrency problems

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

* Version bump

* fix $mdm-submit output (#3917)

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

* Gl3407 bundle offset size (#3918)

* begin with failing test

* fixed

* change log

* rollback default count change and corresponding comments

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

* Offset interceptor now only works for external calls

* Initialize some beans (esp interceptors) later in the boot process so they don't slow down startup.

* do not reindex searchparam jobs on startup

* Fix oracle non-enterprise attempting online index add (#3925)

* 3922 delete expunge large dataset (#3923)

* 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]>

* add index

* Fix up colun grab

* Revert offset mode change

* Revert fix for null/system request details checks for reindex purposes

* Fix bug and add test for SP Validating Interceptor (#3930)

* wip

* Fix uptests

* Fix index online test

* Fix SP validating interceptor logic

* Updating version to: 6.1.1 post release.

* fix compile error

* Deploy to sonatype (#3934)

* adding sonatype profile to checkstyle module

* adding sonatype profile to tinder module

* adding sonatype profile to base pom

* adding final deployToSonatype profile

* wip

* Revert version enum

* Updating version to: 6.1.1 post release.

* Add test, changelog, and implementation

* Add backport info

* Create failing test

* Implemented the fix, fixed existing unit tests

* added changelog

* added test case for no filter, exclude 1 patient

* wip

* Add backport info

* Add info of new version

* Fix bad mergback

* Added a couple of missing imports to a unit test.

Co-authored-by: JasonRoberts-smile <[email protected]>
Co-authored-by: Qingyixia <[email protected]>
Co-authored-by: TipzCM <[email protected]>
Co-authored-by: leif stawnyczy <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Etienne Poirier <[email protected]>
Co-authored-by: peartree <[email protected]>
Co-authored-by: kateryna-mironova <[email protected]>
Co-authored-by: longma1 <[email protected]>
Co-authored-by: Long Ma <[email protected]>
Co-authored-by: jdar8 <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: markiantorno <[email protected]>
Co-authored-by: Steven Li <[email protected]>
Co-authored-by: Kevin SmileCDR <[email protected]>
  • Loading branch information
16 people authored Sep 8, 2022
1 parent d22651a commit 6d9a199
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public enum VersionEnum {
V6_0_4,
V6_0_5,
V6_1_0,
V6_1_1,
V6_2_0
;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
release-date: "2022-08-18"
codename: "TBD"
codename: "Unicorn"
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
release-date: "2022-09-02"
codename: "Unicorn"
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
type: fix
issue: 3980
jira: SMILE-5053
backport: 6.1.1
title: "A regression was introduced in 6.1.0 which caused bulk export jobs to not default to the correct output format when the `_outputFormat` parameter was omitted.
This behaviour has been fixed, and if omitted, will now default to the only legal value `application/fhir+ndjson`."
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
type: fix
issue: 3987
jira: SMILE-4921
backport: 6.1.1
title: "Previously, bulk export for Group type with _typeFilter did not apply the filter if it was for the patients, and returned all members of the group.
This has now been fixed, and the filter will apply."
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
import org.hl7.fhir.instance.model.api.IIdType;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
Expand Down