spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-20 22:59:01 +00:00
Code Issues Projects Releases Wiki Activity

Add more nullability annotations to core/spring-boot

Browse Source 
See gh-46587
This commit is contained in:
Moritz Halbritter
2025-07-29 17:11:37 +02:00
parent 06e9827125
commit f135a2d6ca
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/json/JsonValueWriter.java
+2 -1
View File
@@ -346,7 +346,8 @@ class JsonValueWriter {
return value;
}
@SuppressWarnings({ "unchecked" })
// Lambda isn't detected with the correct nullability
@SuppressWarnings({ "unchecked", "NullAway" })
private <V> @Nullable V processValue(@Nullable V value, ValueProcessor<?> valueProcessor) {
return (V) LambdaSafe.callback(ValueProcessor.class, valueProcessor, this.path, new Object[] { value })
.invokeAnd((call) -> call.processValue(this.path, value))
core/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java
+11 -3
View File
@@ -155,7 +155,7 @@ public final class LambdaSafe {
return self();
}
protected final <R> InvocationResult<R> invoke(C callbackInstance, Supplier<R> supplier) {
protected final <R> InvocationResult<R> invoke(C callbackInstance, Supplier<@Nullable R> supplier) {
if (this.filter.match(this.callbackType, callbackInstance, this.argument, this.additionalArguments)) {
try {
return InvocationResult.of(supplier.get());
@@ -245,6 +245,8 @@ public final class LambdaSafe {
* Invoke the callback instance where the callback method returns void.
* @param invoker the invoker used to invoke the callback
*/
// Lambda isn't detected with the correct nullability
@SuppressWarnings("NullAway")
public void invoke(Consumer<C> invoker) {
invoke(this.callbackInstance, () -> {
invoker.accept(this.callbackInstance);
@@ -259,7 +261,9 @@ public final class LambdaSafe {
* @return the result of the invocation (may be {@link InvocationResult#noResult}
* if the callback was not invoked)
*/
public <R> InvocationResult<R> invokeAnd(Function<C, R> invoker) {
// Lambda isn't detected with the correct nullability
@SuppressWarnings("NullAway")
public <R> InvocationResult<R> invokeAnd(Function<C, @Nullable R> invoker) {
return invoke(this.callbackInstance, () -> invoker.apply(this.callbackInstance));
}
@@ -285,6 +289,8 @@ public final class LambdaSafe {
* Invoke the callback instances where the callback method returns void.
* @param invoker the invoker used to invoke the callback
*/
// Lambda isn't detected with the correct nullability
@SuppressWarnings("NullAway")
public void invoke(Consumer<C> invoker) {
this.callbackInstances.forEach((callbackInstance) -> invoke(callbackInstance, () -> {
invoker.accept(callbackInstance);
@@ -299,7 +305,9 @@ public final class LambdaSafe {
* @return the results of the invocation (may be an empty stream if no callbacks
* could be called)
*/
public <R> Stream<R> invokeAnd(Function<C, R> invoker) {
// Lambda isn't detected with the correct nullability
@SuppressWarnings("NullAway")
public <R> Stream<R> invokeAnd(Function<C, @Nullable R> invoker) {
Function<C, InvocationResult<R>> mapper = (callbackInstance) -> invoke(callbackInstance,
() -> invoker.apply(callbackInstance));
return this.callbackInstances.stream()