Merge branch '1.3.x'

Author: rstoyanchev

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

@@ -177,7 +177,12 @@ public ErrorClassification getErrorType() {
 				return graphql.ErrorType.valueOf(classification);
 			}
 			catch (IllegalArgumentException ex) {
-				return org.springframework.graphql.execution.ErrorType.valueOf(classification);
+				try {
+					return org.springframework.graphql.execution.ErrorType.valueOf(classification);
+				}
+				catch (IllegalArgumentException ex2) {
+					return ErrorClassification.errorClassification(classification);
+				}
 			}
 		}
 

spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java

@@ -26,7 +26,6 @@
 import graphql.GraphQL;
 import graphql.GraphQLContext;
 import graphql.GraphQLError;
-import graphql.GraphQLException;
 import graphql.execution.ExecutionIdProvider;
 import graphql.execution.instrumentation.dataloader.EmptyDataLoaderRegistryInstance;
 import io.micrometer.context.ContextSnapshotFactory;
@@ -105,12 +104,8 @@ public final Mono<ExecutionGraphQlResponse> execute(ExecutionGraphQlRequest requ
 			ExecutionInput executionInputToUse = registerDataLoaders(executionInput);
 
 			return Mono.fromFuture(this.graphQlSource.graphQl().executeAsync(executionInputToUse))
-					.onErrorResume(GraphQLException.class, (exception) -> {
-						if (exception instanceof GraphQLError graphQLError) {
-							return Mono.just(ExecutionResult.newExecutionResult().addError(graphQLError).build());
-						}
-						return Mono.error(exception);
-					})
+					.onErrorResume((ex) -> ex instanceof GraphQLError, (ex) ->
+							Mono.just(ExecutionResult.newExecutionResult().addError((GraphQLError) ex).build()))
 					.map((result) -> new DefaultExecutionGraphQlResponse(executionInputToUse, result));
 		});
 	}

spring-graphql/src/test/java/org/springframework/graphql/execution/DefaultExecutionGraphQlServiceTests.java

@@ -67,14 +67,12 @@ void customDataLoaderRegistry() {
 
 	@Test
 	void shouldHandleGraphQlErrors() {
-		GraphQlSource graphQlSource = GraphQlSetup.schemaContent("type Query { greeting: String }")
+		ExecutionGraphQlResponse response = GraphQlSetup.schemaContent("type Query { greeting: String }")
 				.queryFetcher("greeting", (env) -> "hi")
-				.toGraphQlSource();
-		DefaultExecutionGraphQlService graphQlService = new DefaultExecutionGraphQlService(graphQlSource);
+				.toGraphQlService()
+				.execute(new DefaultExecutionGraphQlRequest("{ greeting }", "unknown", null, null, "uniqueId", null))
+				.block();
 
-		ExecutionGraphQlRequest request = new DefaultExecutionGraphQlRequest("{ greeting }", "unknown",
-				null, null, "uniqueId", null);
-		ExecutionGraphQlResponse response = graphQlService.execute(request).block();
 		assertThat(response.getExecutionResult().getErrors()).singleElement()
 				.hasFieldOrPropertyWithValue("errorType", ErrorType.ValidationError);
 	}