From d22d9c41a95956ca8b2ecac3b86a02c208ee48cc Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Sun, 11 Oct 2020 18:02:35 +1100 Subject: [PATCH] Restrict content to application json Closes gh-8 --- .../boot/graphql/WebFluxGraphQLAutoConfiguration.java | 7 +++++-- .../boot/graphql/WebMvcGraphQLAutoConfiguration.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java index ea43f3c3..0cca90ee 100644 --- a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java +++ b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebFluxGraphQLAutoConfiguration.java @@ -15,6 +15,8 @@ */ package org.springframework.boot.graphql; +import java.util.Collections; + import graphql.GraphQL; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -25,11 +27,12 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.graphql.WebFluxGraphQLHandler; +import org.springframework.http.MediaType; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; import org.springframework.web.reactive.function.server.ServerResponse; -import java.util.Collections; +import static org.springframework.web.reactive.function.server.RequestPredicates.accept; @Configuration @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @@ -46,7 +49,7 @@ public class WebFluxGraphQLAutoConfiguration { @Bean public RouterFunction graphQLQueryEndpoint(WebFluxGraphQLHandler handler, GraphQLProperties graphQLProperties) { - return RouterFunctions.route().POST(graphQLProperties.getUrl(), handler).build(); + return RouterFunctions.route().POST(graphQLProperties.getUrl(), accept(MediaType.APPLICATION_JSON), handler).build(); } } diff --git a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java index bc2e0191..4f0101cd 100644 --- a/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java +++ b/spring-graphql-web/src/main/java/org/springframework/boot/graphql/WebMvcGraphQLAutoConfiguration.java @@ -15,6 +15,8 @@ */ package org.springframework.boot.graphql; +import java.util.Collections; + import graphql.GraphQL; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -30,8 +32,6 @@ import org.springframework.web.servlet.function.RouterFunction; import org.springframework.web.servlet.function.RouterFunctions; import org.springframework.web.servlet.function.ServerResponse; -import java.util.Collections; - import static org.springframework.web.servlet.function.RequestPredicates.accept; @Configuration