From 5f260d12f6e159b536542e6279cbf3d5bd0731b0 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 25 Nov 2021 10:44:33 +0000
Subject: [PATCH] Polishing

---
 .../annotation/support/DataFetcherHandlerMethod.java     | 9 ++++-----
 .../org/springframework/graphql/GraphQlResponse.java     | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/DataFetcherHandlerMethod.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/DataFetcherHandlerMethod.java
index d33f65f6..e3457934 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/DataFetcherHandlerMethod.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/DataFetcherHandlerMethod.java
@@ -84,13 +84,12 @@ public class DataFetcherHandlerMethod extends InvocableHandlerMethodSupport {
 	 * @param environment the GraphQL {@link DataFetchingEnvironment} to use to
 	 * resolve arguments.
 	 *
-	 * @return the raw value returned by the invoked method, which may also be
-	 * wrapped as a {@code Mono} in case of method arguments that require
-	 * asynchronous resolution, e.g. {@code Principal} in WebFlux; this method
-	 * may also return a {@code Mono<Throwable>} if the invocation fails.
+	 * @return the raw value returned by the invoked method, possibly a
+	 * {@code Mono} in case a method argument requires asynchronous resolution;
+	 * {@code Mono<Throwable} is returned if invocation fails.
 	 */
 	@Nullable
-	public Object invoke(DataFetchingEnvironment environment) throws Exception {
+	public Object invoke(DataFetchingEnvironment environment) {
 		Object[] args;
 		try {
 			args = getMethodArgumentValues(environment);
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlResponse.java b/spring-graphql/src/test/java/org/springframework/graphql/GraphQlResponse.java
index bc5a58b3..611b3885 100644
--- a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlResponse.java
+++ b/spring-graphql/src/test/java/org/springframework/graphql/GraphQlResponse.java
@@ -16,6 +16,7 @@
 package org.springframework.graphql;
 
 import java.lang.reflect.Type;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 
@@ -136,7 +137,7 @@ public class GraphQlResponse {
 	}
 
 	public static GraphQlResponse from(Mono<? extends ExecutionResult> resultMono) {
-		ExecutionResult result = resultMono.block();
+		ExecutionResult result = resultMono.block(Duration.ofSeconds(5));
 		assertThat(result).isNotNull();
 		return from(result);
 	}
@@ -149,7 +150,7 @@ public class GraphQlResponse {
 
 	@SuppressWarnings("BlockingMethodInNonBlockingContext")
 	public static Flux<GraphQlResponse> forSubscription(Mono<ExecutionResult> resultMono) {
-		ExecutionResult result = resultMono.block();
+		ExecutionResult result = resultMono.block(Duration.ofSeconds(5));
 		assertThat(result).isNotNull();
 		return forSubscription(result);
 	}