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 mergeback #3927

Merged
merged 47 commits into from
Aug 19, 2022
Merged

Rel 6 1 mergeback #3927

merged 47 commits into from
Aug 19, 2022

Conversation

tadgh
Copy link
Collaborator

@tadgh tadgh commented Aug 16, 2022

Bring in all release branch work back to master

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]>
@lgtm-com
Copy link

lgtm-com bot commented Aug 17, 2022

This pull request fixes 2 alerts when merging b8794d6 into 7f7b7d6 - view on LGTM.com

fixed alerts:

  • 2 for HTTP response splitting

@lgtm-com
Copy link

lgtm-com bot commented Aug 17, 2022

This pull request fixes 2 alerts when merging dfc6b93 into 7f7b7d6 - view on LGTM.com

fixed alerts:

  • 2 for HTTP response splitting

@lgtm-com
Copy link

lgtm-com bot commented Aug 17, 2022

This pull request fixes 2 alerts when merging eb7e643 into 7f7b7d6 - view on LGTM.com

fixed alerts:

  • 2 for HTTP response splitting

@lgtm-com
Copy link

lgtm-com bot commented Aug 17, 2022

This pull request fixes 2 alerts when merging 11eb37b into 7f7b7d6 - view on LGTM.com

fixed alerts:

  • 2 for HTTP response splitting

@lgtm-com
Copy link

lgtm-com bot commented Aug 17, 2022

This pull request fixes 2 alerts when merging b161cf8 into 7f7b7d6 - view on LGTM.com

fixed alerts:

  • 2 for HTTP response splitting

@lgtm-com
Copy link

lgtm-com bot commented Aug 17, 2022

This pull request fixes 2 alerts when merging 8058829 into 7f7b7d6 - view on LGTM.com

fixed alerts:

  • 2 for HTTP response splitting

@codecov
Copy link

codecov bot commented Aug 18, 2022

Codecov Report

Merging #3927 (7de5534) into master (7f7b7d6) will increase coverage by 0.05%.
The diff coverage is 92.33%.

@@             Coverage Diff              @@
##             master    #3927      +/-   ##
============================================
+ Coverage     81.82%   81.87%   +0.05%     
- Complexity    20769    20838      +69     
============================================
  Files          1417     1421       +4     
  Lines         77089    77246     +157     
  Branches      11061    11078      +17     
============================================
+ Hits          63075    63243     +168     
+ Misses         9869     9858      -11     
  Partials       4145     4145              
Impacted Files Coverage Δ
...ain/java/ca/uhn/fhir/interceptor/api/Pointcut.java 100.00% <ø> (ø)
...terceptor/model/ReadPartitionIdRequestDetails.java 71.42% <ø> (ø)
.../interceptor/ForceOffsetSearchModeInterceptor.java 100.00% <ø> (+30.00%) ⬆️
.../java/ca/uhn/fhir/jpa/model/util/JpaConstants.java 100.00% <ø> (ø)
...ache/ResourceChangeListenerCacheRefresherImpl.java 100.00% <ø> (ø)
...che/ResourceChangeListenerRegistryInterceptor.java 60.00% <ø> (ø)
...ava/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java 100.00% <ø> (ø)
...fhir/rest/server/interceptor/auth/RuleBuilder.java 90.39% <ø> (+1.22%) ⬆️
...n/fhir/rest/server/provider/ProviderConstants.java 0.00% <ø> (ø)
...ir/rest/server/servlet/ServletRestfulResponse.java 90.24% <ø> (ø)
... and 37 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@tadgh tadgh merged commit e7a4c49 into master Aug 19, 2022
@tadgh tadgh deleted the rel_6_1_mergeback branch August 19, 2022 00:21
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

8 participants