From f0fcc92b4951a66c86ee41470b84897aa8442c3b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 1 May 2024 23:44:12 +0900 Subject: [PATCH] Remove reassignments for builders in GraphQL auto-configurations See gh-40590 --- .../reactive/GraphQlWebFluxAutoConfiguration.java | 10 +++++----- .../servlet/GraphQlWebMvcAutoConfiguration.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java index af590733e2b..67677b20dda 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -112,15 +112,15 @@ public class GraphQlWebFluxAutoConfiguration { String path = properties.getPath(); logger.info(LogMessage.format("GraphQL endpoint HTTP POST %s", path)); RouterFunctions.Builder builder = RouterFunctions.route(); - builder = builder.GET(path, this::onlyAllowPost); - builder = builder.POST(path, SUPPORTS_MEDIATYPES, httpHandler::handleRequest); + builder.GET(path, this::onlyAllowPost); + builder.POST(path, SUPPORTS_MEDIATYPES, httpHandler::handleRequest); if (properties.getGraphiql().isEnabled()) { 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()) { SchemaHandler schemaHandler = new SchemaHandler(graphQlSource); - builder = builder.GET(path + "/schema", schemaHandler::handleRequest); + builder.GET(path + "/schema", schemaHandler::handleRequest); } return builder.build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java index 29d0c53c248..6e3c55844eb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -112,16 +112,16 @@ public class GraphQlWebMvcAutoConfiguration { String path = properties.getPath(); logger.info(LogMessage.format("GraphQL endpoint HTTP POST %s", path)); RouterFunctions.Builder builder = RouterFunctions.route(); - builder = builder.GET(path, this::onlyAllowPost); - builder = builder.POST(path, RequestPredicates.contentType(MediaType.APPLICATION_JSON) + builder.GET(path, this::onlyAllowPost); + builder.POST(path, RequestPredicates.contentType(MediaType.APPLICATION_JSON) .and(RequestPredicates.accept(SUPPORTED_MEDIA_TYPES)), httpHandler::handleRequest); if (properties.getGraphiql().isEnabled()) { 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()) { SchemaHandler schemaHandler = new SchemaHandler(graphQlSource); - builder = builder.GET(path + "/schema", schemaHandler::handleRequest); + builder.GET(path + "/schema", schemaHandler::handleRequest); } return builder.build(); }