Merge branch '3.2.x'

Closes gh-40601
This commit is contained in:
Phillip Webb 2024-05-01 22:57:08 -07:00
commit ad7ab41742
2 changed files with 6 additions and 6 deletions

View File

@ -112,14 +112,14 @@ public class GraphQlWebFluxAutoConfiguration {
RouterFunctions.Builder builder = RouterFunctions.route(); RouterFunctions.Builder builder = RouterFunctions.route();
builder.route(GraphQlRequestPredicates.graphQlHttp(path), httpHandler::handleRequest); builder.route(GraphQlRequestPredicates.graphQlHttp(path), httpHandler::handleRequest);
builder.route(GraphQlRequestPredicates.graphQlSse(path), sseHandler::handleRequest); builder.route(GraphQlRequestPredicates.graphQlSse(path), sseHandler::handleRequest);
builder = builder.GET(path, this::onlyAllowPost); builder.GET(path, this::onlyAllowPost);
if (properties.getGraphiql().isEnabled()) { if (properties.getGraphiql().isEnabled()) {
GraphiQlHandler graphQlHandler = new GraphiQlHandler(path, properties.getWebsocket().getPath()); GraphiQlHandler graphQlHandler = new GraphiQlHandler(path, properties.getWebsocket().getPath());
builder = builder.GET(properties.getGraphiql().getPath(), graphQlHandler::handleRequest); builder.GET(properties.getGraphiql().getPath(), graphQlHandler::handleRequest);
} }
if (properties.getSchema().getPrinter().isEnabled()) { if (properties.getSchema().getPrinter().isEnabled()) {
SchemaHandler schemaHandler = new SchemaHandler(graphQlSource); SchemaHandler schemaHandler = new SchemaHandler(graphQlSource);
builder = builder.GET(path + "/schema", schemaHandler::handleRequest); builder.GET(path + "/schema", schemaHandler::handleRequest);
} }
return builder.build(); return builder.build();
} }

View File

@ -117,14 +117,14 @@ public class GraphQlWebMvcAutoConfiguration {
RouterFunctions.Builder builder = RouterFunctions.route(); RouterFunctions.Builder builder = RouterFunctions.route();
builder.route(GraphQlRequestPredicates.graphQlHttp(path), httpHandler::handleRequest); builder.route(GraphQlRequestPredicates.graphQlHttp(path), httpHandler::handleRequest);
builder.route(GraphQlRequestPredicates.graphQlSse(path), sseHandler::handleRequest); builder.route(GraphQlRequestPredicates.graphQlSse(path), sseHandler::handleRequest);
builder = builder.GET(path, this::onlyAllowPost); builder.GET(path, this::onlyAllowPost);
if (properties.getGraphiql().isEnabled()) { if (properties.getGraphiql().isEnabled()) {
GraphiQlHandler graphiQLHandler = new GraphiQlHandler(path, properties.getWebsocket().getPath()); GraphiQlHandler graphiQLHandler = new GraphiQlHandler(path, properties.getWebsocket().getPath());
builder = builder.GET(properties.getGraphiql().getPath(), graphiQLHandler::handleRequest); builder.GET(properties.getGraphiql().getPath(), graphiQLHandler::handleRequest);
} }
if (properties.getSchema().getPrinter().isEnabled()) { if (properties.getSchema().getPrinter().isEnabled()) {
SchemaHandler schemaHandler = new SchemaHandler(graphQlSource); SchemaHandler schemaHandler = new SchemaHandler(graphQlSource);
builder = builder.GET(path + "/schema", schemaHandler::handleRequest); builder.GET(path + "/schema", schemaHandler::handleRequest);
} }
return builder.build(); return builder.build();
} }