Skip to content

perf: avoid Optional.ofNullable wrapping on hook.before() return value #1955

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.

Sign up for GitHub

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

Merged
toddbaert merged 2 commits into from
Jun 8, 2026
+4 −4
Merged

perf: avoid Optional.ofNullable wrapping on hook.before() return value #1955

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d902c
perf: avoid Optional.ofNullable wrapping on hook.before() return value
tobias-ibounig-dt Jun 5, 2026
65aeafa
chore: suppress sonar S2789 on defensive null-check
toddbaert Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/dev/openfeature/sdk/HookSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public void setHookContexts(
}
}

// S2789: Hook is user-implemented; defensive null check against non-conforming impls returning null.
@SuppressWarnings("java:S2789")
public void executeBeforeHooks(HookSupportData data) {
// These traverse backwards from normal.
List<Pair<Hook, HookContext>> hooks = data.getHooks();
Expand All @@ -56,10 +58,8 @@ public void executeBeforeHooks(HookSupportData data) {
var hook = hookContextPair.getKey();
var hookContext = hookContextPair.getValue();

Optional<EvaluationContext> returnedEvalContext = Optional.ofNullable(
hook.before(hookContext, data.getHints()))
.orElse(Optional.empty());
if (returnedEvalContext.isPresent()) {
Optional<EvaluationContext> returnedEvalContext = hook.before(hookContext, data.getHints());
if (returnedEvalContext != null && returnedEvalContext.isPresent()) {
Comment thread
toddbaert marked this conversation as resolved.
var returnedContext = returnedEvalContext.get();
// yes, we want to check for reference equality here, this prevents recursive layered contexts
if (returnedContext != hookContext.getCtx() && !returnedContext.isEmpty()) {
Expand Down
Loading