refactoring

spring-projects · Sep 14, 2020 · 5741e3f · 5741e3f
1 parent 7bc8cea
commit 5741e3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -34,18 +34,19 @@ public Mono<GraphQLHttpResponse> graphqlPOST(GraphQLHttpRequest graphQLHttpReque
         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
@@ -20,10 +20,10 @@ default Mono<ExecutionResult> postHandle(ExecutionResult result,
         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);
     }