Merge branch '1.3.x'

spring-graphql/src/main/java/org/springframework/graphql/client/WebSocketGraphQlTransport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -339,7 +339,7 @@ final class WebSocketGraphQlTransport implements GraphQlTransport {
 						if (logger.isDebugEnabled()) {
 							logger.debug(closeStatusMessage);
 						}
-						graphQlSession.terminateRequests(closeStatusMessage, closeStatus);
+						terminateGraphQlSession(graphQlSession, closeStatus, closeStatusMessage, null);
 					})
 					.doOnError((cause) -> {
 						CloseStatus closeStatus = CloseStatus.NO_STATUS_CODE;
@@ -347,11 +347,21 @@ final class WebSocketGraphQlTransport implements GraphQlTransport {
 						if (logger.isErrorEnabled()) {
 							logger.error(closeStatusMessage);
 						}
-						graphQlSession.terminateRequests(closeStatusMessage, closeStatus);
+						terminateGraphQlSession(graphQlSession, closeStatus, closeStatusMessage, cause);
 					})
 					.subscribe();
 		}
 
+		private void terminateGraphQlSession(
+				GraphQlSession session, CloseStatus closeStatus, String closeStatusMessage, @Nullable Throwable cause) {
+
+			if (sessionNotInitialized()) {
+				this.graphQlSessionSink.tryEmitError(new IllegalStateException(closeStatusMessage, cause));
+				this.graphQlSessionSink = Sinks.unsafe().one();
+			}
+			session.terminateRequests(closeStatusMessage, closeStatus);
+		}
+
 		private String initCloseStatusMessage(CloseStatus status, @Nullable Throwable ex, GraphQlSession session) {
 			String reason = session + " disconnected";
 			if (isStopped()) {

spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerExceptionResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -356,7 +356,16 @@ final class AnnotatedControllerExceptionResolver implements HandlerDataFetcherEx
 			return this.method;
 		}
 
+		@SuppressWarnings("unchecked")
 		Mono<List<GraphQLError>> adapt(@Nullable Object result, Throwable ex) {
+			if (result instanceof Mono<?> errorMono && this.adapter != ReturnValueAdapter.forMono) {
+				return (Mono<List<GraphQLError>>) errorMono.onErrorMap((ex2) -> {
+					if (logger.isWarnEnabled()) {
+						logger.warn("Failure in @GraphQlExceptionHandler " + this.method, ex2);
+					}
+					return ex; // fall back to original exception
+				});
+			}
 			return this.adapter.adapt(result, this.returnType, ex);
 		}
 

spring-graphql/src/test/java/org/springframework/graphql/client/WebSocketGraphQlTransportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -317,7 +317,7 @@ public class WebSocketGraphQlTransportTests {
 	}
 
 	@Test
-	void errorBeforeConnectionAck() {
+	void errorBeforeConnectionAckWithStart() {
 
 		// Errors before GraphQL session initialized should be routed, no hanging on start
 
@@ -325,9 +325,26 @@ public class WebSocketGraphQlTransportTests {
 		handler.connectionInitHandler(initPayload -> Mono.error(new IllegalStateException("boo")));
 
 		TestWebSocketClient client = new TestWebSocketClient(handler);
+		String expectedMessage = "disconnected with CloseStatus[code=1002, reason=null]";
 
 		StepVerifier.create(createTransport(client).start())
-				.expectErrorMessage("boo")
+				.expectErrorSatisfies(ex -> assertThat(ex).hasMessageEndingWith(expectedMessage))
+				.verify(TIMEOUT);
+	}
+
+	@Test // gh-1098
+	void errorBeforeConnectionAckWithRequest() {
+
+		// Errors before GraphQL session initialized should be routed, no hanging on start
+
+		MockGraphQlWebSocketServer handler = new MockGraphQlWebSocketServer();
+		handler.connectionInitHandler(initPayload -> Mono.error(new IllegalStateException("boo")));
+
+		TestWebSocketClient client = new TestWebSocketClient(session -> session.close(CloseStatus.POLICY_VIOLATION));
+		String expectedMessage = "disconnected with CloseStatus[code=1008, reason=null]";
+
+		StepVerifier.create(createTransport(client).execute(new DefaultGraphQlRequest("{Query1}")))
+				.expectErrorSatisfies(ex -> assertThat(ex).hasMessageEndingWith(expectedMessage))
 				.verify(TIMEOUT);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerExceptionResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -111,6 +111,19 @@ public class AnnotatedControllerExceptionResolverTests {
 		StepVerifier.create(resolver.resolveException(ex, this.environment, controller)).verifyComplete();
 	}
 
+	@Test // gh-1090
+	void failureFromResolver() {
+		ExceptionThrowingController controller = new ExceptionThrowingController();
+
+		Exception ex = new IllegalArgumentException("Bad input");
+		AnnotatedControllerExceptionResolver resolver = exceptionResolver();
+		resolver.registerController(controller.getClass());
+
+		StepVerifier.create(resolver.resolveException(ex, this.environment, controller))
+				.expectErrorSatisfies(actual -> assertThat(actual).isSameAs(ex))
+				.verify();
+	}
+
 	@Test
 	void resolveWithControllerAdvice() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -304,4 +317,14 @@ public class AnnotatedControllerExceptionResolverTests {
 
 	}
 
+
+	private static class ExceptionThrowingController {
+
+		@GraphQlExceptionHandler
+		GraphQLError handle(IllegalArgumentException ex) {
+			throw new IllegalStateException("failure in exception handler");
+		}
+
+	}
+
 }