Optimize Optional usage and improve code consistency in gateway-ha module #712
Conversation
This file contains hidden or 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
|
@ebyhr please help to review. I want to contribute this project starting with refactoring |
ebyhr
reviewed
Jun 27, 2025
| Optional.ofNullable(dao.findFirstById(resourceGroup.getResourceGroupId())) | ||
| .ifPresentOrElse( | ||
| _ -> dao.update(resourceGroup), | ||
| () -> dao.create(resourceGroup)); |
There was a problem hiding this comment.
I prefer the original code. The new code has redundant indentations.
| @@ -263,8 +253,9 @@ public List<ExactSelectorsDetail> readExactMatchSourceSelector() | |||
| public ExactSelectorsDetail getExactMatchSourceSelector( | |||
| ExactSelectorsDetail exactSelectorDetail) | |||
| { | |||
| ExactMatchSourceSelectors exactSelector = exactMatchSourceSelectorsDao.findFirst(exactSelectorDetail); | |||
| return upcastExactSelectors(exactSelector); | |||
| return Optional.ofNullable(exactMatchSourceSelectorsDao.findFirst(exactSelectorDetail)) | |||
There was a problem hiding this comment.
We should change the return type of findFirst() method instead.
There was a problem hiding this comment.
#716 removed this code block. Could you rebase on main to resolve conflicts?
|
This close & push 0 commit is not by mistake i assume? |
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.
Description
This commit introduces several optimizations to improve code quality, readability, and consistency in the gateway-ha module. The changes focus on standardizing Optional usage patterns, improving method naming consistency, and applying functional programming patterns where appropriate.
These optimizations maintain the existing functionality while making the code more maintainable and aligned with modern Java practices. The changes are non-invasive and preserve the overall structure of the codebase.
Files Changed
gateway-ha/src/main/java/io/trino/gateway/ha/router/HaResourceGroupsManager.java
updateSelectormethod to use Optional.ofNullable() with ifPresentOrElse() for consistent null handlingupcastmethod to use stream API for consistency with other similar methodsgetExactMatchSourceSelectorto use Optional for null safetygateway-ha/src/main/java/io/trino/gateway/ha/router/QueryCountBasedRouter.java
gateway-ha/src/main/java/io/trino/gateway/ha/handler/RoutingTargetHandler.java, LbFilter.java
Additional context and related issues
Release notes
( ) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required, with the following suggested text:
* Fix some things.