Use try-with-resources to close BatchHandler #15661
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbee
approved these changes
Nov 13, 2023
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #15661 +/- ##
=============================================
+ Coverage 49.92% 66.21% +16.28%
- Complexity 23372 31276 +7904
=============================================
Files 3483 3483
Lines 129910 129911 +1
Branches 15181 15181
=============================================
+ Hits 64864 86022 +21158
+ Misses 58984 36802 -22182
- Partials 6062 7087 +1025
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 1269 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
jbee
approved these changes
Nov 15, 2023
...nalytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOwnershipAnalyticsTableManager.java
Outdated
Show resolved
Hide resolved
david-mackessy
approved these changes
Nov 15, 2023
|
Kudos, SonarCloud Quality Gate passed! |
jason-p-pickering
added a commit
that referenced
this pull request
Nov 15, 2023
* Use try-with-resources to close BatchHandler * Rework test to deal with multi-threading * Add try-catch to Analytics table manager
jason-p-pickering
added a commit
that referenced
this pull request
Nov 15, 2023
jason-p-pickering
added a commit
that referenced
this pull request
Nov 16, 2023
jason-p-pickering
added a commit
that referenced
this pull request
Nov 16, 2023
jason-p-pickering
added a commit
that referenced
this pull request
Nov 16, 2023
jason-p-pickering
added a commit
that referenced
this pull request
Nov 16, 2023
jason-p-pickering
added a commit
that referenced
this pull request
Nov 16, 2023
* fix: always flush the batch handler for CompleteDataSet import [DHIS2-15362] (2.39) (#15625) * fix: always flush the batch handler for CompleteDataSet import [DHIS2-15362] * fix: test setup * fix: controller imports use interface not impl * Use try-with-resources to close BatchHandler (#15661) (#15704) * Use try-with-resources to close BatchHandler * Rework test to deal with multi-threading * Add try-catch to Analytics table manager --------- Co-authored-by: Jan Bernitt <[email protected]>
jason-p-pickering
added a commit
that referenced
this pull request
Nov 16, 2023
* fix: always flush the batch handler for CompleteDataSet import [DHIS2-15362] (2.39) (#15625) (#15710) * fix: always flush the batch handler for CompleteDataSet import [DHIS2-15362] * fix: test setup * fix: controller imports use interface not impl * Use try-with-resources to close BatchHandler (#15661) (#15704) (#15711) * Use try-with-resources to close BatchHandler * Rework test to deal with multi-threading * Add try-catch to Analytics table manager --------- Co-authored-by: Jan Bernitt <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a continuation of https://dhis2.atlassian.net/browse/DHIS2-15362 which seemed not to fully solve the issue with leaked DB connections. BatchHanlder from the quick package is now
AutoCloseableand can thus be used in a try-with-resources block. This should help to ensure that all DB connections are completely closed.