From 5741e3f4bc6e768eb58686ce632bc95c1ca0cb62 Mon Sep 17 00:00:00 2001
From: Andreas Marek <andimarek@fastmail.fm>
Date: Tue, 15 Sep 2020 03:32:48 +1000
Subject: [PATCH] refactoring

---
 .../java/org/springframework/graphql/GraphQLHandler.java | 9 +++++----
 .../org/springframework/graphql/GraphQLInterceptor.java  | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
index 349eb15e..b83f32b4 100644
--- a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
@@ -34,18 +34,19 @@ public class GraphQLHandler {
         return executionInput
                 .flatMap(this::execute)
                 .flatMap(result -> interceptor.postHandle(result, graphQLHttpRequest.getHttpHeaders(), requestParams))
-                .flatMap(result -> toResponseBody(result, graphQLHttpRequest.getHttpHeaders(), requestParams));
+                .flatMap(result -> toResponseBody(result, graphQLHttpRequest));
     }
 
-    private Mono<GraphQLHttpResponse> toResponseBody(ExecutionResult executionResult, HttpHeaders httpHeaders, MultiValueMap<String, String> requestParams) {
+    private Mono<GraphQLHttpResponse> toResponseBody(ExecutionResult executionResult, GraphQLHttpRequest graphQLHttpRequest) {
         Map<String, Object> responseBodyRaw = executionResult.toSpecification();
         Object data = responseBodyRaw.get("data");
         List<Map<String, Object>> errors = (List<Map<String, Object>>) responseBodyRaw.get("errors");
         Map<String, Object> extensions = (Map<String, Object>) responseBodyRaw.get("extensions");
         GraphQLHttpResponse responseBody = new GraphQLHttpResponse(data,
                 errors,
-                extensions, httpHeaders);
-        Mono<GraphQLHttpResponse> graphQLResponseBodyMono = interceptor.customizeResponseBody(responseBody, executionResult, httpHeaders, requestParams);
+                extensions,
+                new HttpHeaders());
+        Mono<GraphQLHttpResponse> graphQLResponseBodyMono = interceptor.customizeGraphQLHttpResponse(responseBody, executionResult, graphQLHttpRequest);
         return graphQLResponseBodyMono;
     }
 
diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
index 496a594d..cb427fd4 100644
--- a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
@@ -20,10 +20,10 @@ public interface GraphQLInterceptor {
         return Mono.just(result);
     }
 
-    default Mono<GraphQLHttpResponse> customizeResponseBody(GraphQLHttpResponse graphQLHttpResponse,
-                                                            ExecutionResult executionResult,
-                                                            HttpHeaders httpHeader,
-                                                            MultiValueMap<String, String> requestParams) {
+    default Mono<GraphQLHttpResponse> customizeGraphQLHttpResponse(GraphQLHttpResponse graphQLHttpResponse,
+                                                                   ExecutionResult executionResult,
+                                                                   GraphQLHttpRequest graphQLHttpRequest) {
+
         return Mono.just(graphQLHttpResponse);
     }