From b977beffa33829436f975fbc23988ca949a32091 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Wed, 12 Feb 2025 15:15:28 +0000 Subject: [PATCH] Polishing --- .../execution/DefaultExecutionGraphQlService.java | 9 ++------- .../execution/DefaultExecutionGraphQlServiceTests.java | 10 ++++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java index 1a0e48b9..278af14f 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java @@ -26,7 +26,6 @@ import graphql.ExecutionResult; 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 class DefaultExecutionGraphQlService implements ExecutionGraphQlService { 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)); }); } diff --git a/spring-graphql/src/test/java/org/springframework/graphql/execution/DefaultExecutionGraphQlServiceTests.java b/spring-graphql/src/test/java/org/springframework/graphql/execution/DefaultExecutionGraphQlServiceTests.java index 7c404682..6431451f 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/execution/DefaultExecutionGraphQlServiceTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/execution/DefaultExecutionGraphQlServiceTests.java @@ -67,14 +67,12 @@ public class DefaultExecutionGraphQlServiceTests { @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); }