Fix missing @nullable on chainedCtx return type and BiFunction type parameter

dondonz · claude · dondonz · commit dbe17e4f0ed5 · 2026-02-28T17:30:50.000+11:00
chainedCtx can return null in the single-instrumentation case since it passes the mapper result through directly, and the underlying Instrumentation begin* methods are @nullable (null is the opt-out signal). The BiFunction return type also needs @nullable so that mapper.apply() is correctly typed as nullable, allowing the nullability to flow from the underlying instrumentation through the lambda to chainedCtx's return. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/src/main/java/graphql/execution/instrumentation/ChainedInstrumentation.java b/src/main/java/graphql/execution/instrumentation/ChainedInstrumentation.java
@@ -67,7 +67,7 @@ public List<Instrumentation> getInstrumentations() {
         return instrumentations;
     }
 
-    private <T> InstrumentationContext<T> chainedCtx(InstrumentationState state, BiFunction<Instrumentation, InstrumentationState, InstrumentationContext<T>> mapper) {
+    private <T> @Nullable InstrumentationContext<T> chainedCtx(InstrumentationState state, BiFunction<Instrumentation, InstrumentationState, @Nullable InstrumentationContext<T>> mapper) {
         // if we have zero or 1 instrumentations (and 1 is the most common), then we can avoid an object allocation
         // of the ChainedInstrumentationContext since it won't be needed
         if (instrumentations.isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public List<Instrumentation> getInstrumentations() {`
`67`	`67`	`return instrumentations;`
`68`	`68`	`}`
`69`	`69`
`70`		`- private <T> InstrumentationContext<T> chainedCtx(InstrumentationState state, BiFunction<Instrumentation, InstrumentationState, InstrumentationContext<T>> mapper) {`
	`70`	`+ private <T> @Nullable InstrumentationContext<T> chainedCtx(InstrumentationState state, BiFunction<Instrumentation, InstrumentationState, @Nullable InstrumentationContext<T>> mapper) {`
`71`	`71`	`// if we have zero or 1 instrumentations (and 1 is the most common), then we can avoid an object allocation`
`72`	`72`	`// of the ChainedInstrumentationContext since it won't be needed`
`73`	`73`	`if (instrumentations.isEmpty()) {`