From 95b57cfb42e835ce848b674f5822856374ef6da6 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 28 Feb 2026 11:05:38 +0800 Subject: [PATCH] Fix ReadBody predicate evaluation for empty request body --- .../ReadBodyRoutePredicateFactory.java | 3 +- ...eadBodyRoutePredicateFactoryUnitTests.java | 47 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactoryUnitTests.java diff --git a/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactory.java b/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactory.java index d138b48ce0..ce27f655e1 100644 --- a/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactory.java +++ b/spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactory.java @@ -98,7 +98,8 @@ public Publisher apply(ServerWebExchange exchange) { .doOnNext(objectValue -> exchange.getAttributes() .put(CACHE_REQUEST_BODY_OBJECT_KEY, objectValue)) .map(objectValue -> config.getPredicate() != null - && config.getPredicate().test(objectValue))); + && config.getPredicate().test(objectValue)) + .defaultIfEmpty(config.getPredicate() != null && config.getPredicate().test(null))); } } diff --git a/spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactoryUnitTests.java b/spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactoryUnitTests.java new file mode 100644 index 0000000000..0aac40e899 --- /dev/null +++ b/spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/handler/predicate/ReadBodyRoutePredicateFactoryUnitTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2013-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.gateway.handler.predicate; + +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; + +import org.springframework.cloud.gateway.handler.predicate.ReadBodyRoutePredicateFactory.Config; +import org.springframework.mock.http.server.reactive.MockServerHttpRequest; +import org.springframework.mock.web.server.MockServerWebExchange; + +class ReadBodyRoutePredicateFactoryUnitTests { + + private final ReadBodyRoutePredicateFactory factory = new ReadBodyRoutePredicateFactory(); + + @Test + void emptyBodyShouldStillEvaluatePredicate() { + Config config = new Config().setPredicate(String.class, body -> body == null); + MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post("/test").build()); + + StepVerifier.create(Mono.from(factory.applyAsync(config).apply(exchange))).expectNext(true).verifyComplete(); + } + + @Test + void emptyBodyShouldReturnFalseWhenPredicateRejectsNull() { + Config config = new Config().setPredicate(String.class, body -> body != null); + MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post("/test").build()); + + StepVerifier.create(Mono.from(factory.applyAsync(config).apply(exchange))).expectNext(false).verifyComplete(); + } + +}