Avoid touching the database layer if no changes are necessary for a user #43683
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
423c507 to
89839b0
Compare
Closes keycloak#43682 Signed-off-by: Alexander Schwartz <[email protected]>
89839b0 to
b6d5cf4
Compare
Signed-off-by: Alexander Schwartz <[email protected]>
358f400 to
261b7f5
Compare
pruivo
reviewed
Oct 24, 2025
Comment on lines
252
to
286
| @Override | ||
| public void addRequiredAction(RequiredAction action) { | ||
| if (updated == null && getRequiredActionsStream().anyMatch(s -> Objects.equals(s, action.name()))) { | ||
| return; | ||
| } | ||
| getDelegateForUpdate(); | ||
| updated.addRequiredAction(action); | ||
| } | ||
|
|
||
| @Override | ||
| public void removeRequiredAction(RequiredAction action) { | ||
| if (getRequiredActionsStream().anyMatch(s -> Objects.equals(s, action.name()))) { | ||
| getDelegateForUpdate(); | ||
| updated.removeRequiredAction(action); | ||
| if (updated == null && getRequiredActionsStream().noneMatch(s -> Objects.equals(s, action.name()))) { | ||
| return; | ||
| } | ||
| getDelegateForUpdate(); | ||
| updated.removeRequiredAction(action); | ||
| } | ||
|
|
||
| @Override | ||
| public void addRequiredAction(String action) { | ||
| if (updated == null && getRequiredActionsStream().anyMatch(s -> Objects.equals(s, action))) { | ||
| return; | ||
| } | ||
| getDelegateForUpdate(); | ||
| updated.addRequiredAction(action); | ||
| } | ||
|
|
||
| @Override | ||
| public void removeRequiredAction(String action) { | ||
| if (getRequiredActionsStream().anyMatch(s -> Objects.equals(s, action))) { | ||
| getDelegateForUpdate(); | ||
| updated.removeRequiredAction(action); | ||
| if (updated == null && getRequiredActionsStream().noneMatch(s -> Objects.equals(s, action))) { | ||
| return; | ||
| } | ||
| getDelegateForUpdate(); | ||
| updated.removeRequiredAction(action); | ||
| } |
There was a problem hiding this comment.
Avoid creating and iterating over streams
@Override
public void addRequiredAction(RequiredAction action) {
if (action == null || updated == null && getCachedRequiredActions().contains(action.name())) {
return;
}
getDelegateForUpdate();
updated.addRequiredAction(action);
}
@Override
public void removeRequiredAction(RequiredAction action) {
if (action == null || updated == null && !getCachedRequiredActions().contains(action.name())) {
return;
}
getDelegateForUpdate();
updated.removeRequiredAction(action);
}
@Override
public void addRequiredAction(String action) {
if (updated == null && getCachedRequiredActions().contains(action)) {
return;
}
getDelegateForUpdate();
updated.addRequiredAction(action);
}
@Override
public void removeRequiredAction(String action) {
if (updated == null && !getCachedRequiredActions().contains(action)) {
return;
}
getDelegateForUpdate();
updated.removeRequiredAction(action);
}
private Set<String> getCachedRequiredActions() {
return cached.getRequiredActions(keycloakSession, modelSupplier);
}There was a problem hiding this comment.
@pruivo - please re-review. Thanks!
Signed-off-by: Alexander Schwartz <[email protected]>
pruivo
previously approved these changes
Oct 24, 2025
|
Let's keep this draft until the backports also work in other branches. In #43697, this run makes me think... |
pedroigor
previously approved these changes
Oct 24, 2025
Signed-off-by: Alexander Schwartz <[email protected]>
pedroigor
approved these changes
Oct 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Closes #43682