From 22bbc860dbab4eebaf1aad872aa95ae2bd40458f Mon Sep 17 00:00:00 2001
From: rstoyanchev <rossen.stoyanchev@broadcom.com>
Date: Thu, 6 Jun 2024 15:07:11 +0100
Subject: [PATCH] Minor refactoring in ContextValueMethodArgumentResolver

See gh-988
---
 .../support/ContextValueMethodArgumentResolver.java    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/ContextValueMethodArgumentResolver.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/ContextValueMethodArgumentResolver.java
index 1537dff9..e06c566e 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/ContextValueMethodArgumentResolver.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/ContextValueMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,13 +83,7 @@ public class ContextValueMethodArgumentResolver implements HandlerMethodArgument
 		}
 
 		if (isMono) {
-			if (value == null) {
-				value = Mono.empty();
-			}
-			else if (!(value instanceof Mono)) {
-				value = Mono.just(value);
-			}
-			return Mono.just(value);
+			return Mono.just((value instanceof Mono<?> mono) ? mono : Mono.justOrEmpty(value));
 		}
 
 		if (isOptional) {