diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java index 49945a04..ea5ea2f9 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java @@ -21,12 +21,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import org.springframework.web.server.ServerWebExchange; /** @@ -129,7 +129,7 @@ public class XForwardedRemoteAddressResolver implements RemoteAddressResolver { return Collections.emptyList(); } List values = Arrays.asList(xForwardedValues.get(0).split(", ")); - if (values.size() == 1 && Strings.isBlank(values.get(0))) { + if (values.size() == 1 && !StringUtils.hasText(values.get(0))) { return Collections.emptyList(); } return values; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java index d0c48368..998734ba 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java @@ -49,7 +49,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen public class RequestHeaderSizeGatewayFilterFactoryTest extends BaseWebClientTests { private static final String responseMesssage = "Request Header/s size is larger than " - + "permissible limit. Request Header/s size is \\d*B where permissible limit is 46B"; + + "permissible limit. Request Header/s size is \\d*B where permissible limit is \\d*B"; @Test public void setRequestSizeFilterWorks() {