From 22536f27023f656d5030eda597c6073f5ff31049 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 24 Jan 2023 15:13:38 -0500 Subject: [PATCH] Formatting for 3.1.x --- .../cloud/gateway/filter/GatewayFilterChain.java | 1 + .../springframework/cloud/gateway/filter/GlobalFilter.java | 7 ++++--- .../factory/CacheRequestBodyGatewayFilterFactory.java | 4 ++-- .../factory/CacheRequestBodyGatewayFilterFactoryTests.java | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayFilterChain.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayFilterChain.java index 168af59f..9af1507e 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayFilterChain.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayFilterChain.java @@ -24,6 +24,7 @@ import org.springframework.web.server.ServerWebExchange; * Contract to allow a {@link GatewayFilter} to delegate to the next in the chain. * * Copied from framework WebFilterChain + * * @author Rossen Stoyanchev * @since 5.0 */ diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GlobalFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GlobalFilter.java index dde4ea8e..c1db2c68 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GlobalFilter.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GlobalFilter.java @@ -21,13 +21,14 @@ import reactor.core.publisher.Mono; import org.springframework.web.server.ServerWebExchange; /** - * Contract for interception-style, chained processing of gateway requests that may be used to - * implement cross-cutting, application-agnostic requirements such as security, timeouts, - * and others. + * Contract for interception-style, chained processing of gateway requests that may be + * used to implement cross-cutting, application-agnostic requirements such as security, + * timeouts, and others. * * Only applies to matched gateway routes. * * Copied from framework WebFilter + * * @author Rossen Stoyanchev * @since 5.0 */ diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactory.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactory.java index b57ad3ba..7e85f145 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactory.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactory.java @@ -89,8 +89,8 @@ public class CacheRequestBodyGatewayFilterFactory // Object backupCachedBody = exchange.getAttributes() .get(CACHED_ORIGINAL_REQUEST_BODY_BACKUP_ATTR); - if (backupCachedBody instanceof DataBuffer backupCachedDataBuffer) { - DataBufferUtils.release(backupCachedDataBuffer); + if (backupCachedBody instanceof DataBuffer) { + DataBufferUtils.release((DataBuffer) backupCachedBody); } }); })); diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactoryTests.java index 33f0ba43..da14adee 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactoryTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactoryTests.java @@ -174,8 +174,9 @@ public class CacheRequestBodyGatewayFilterFactoryTests extends BaseWebClientTest public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { return chain.filter(exchange).doAfterTerminate(() -> { Object o = exchange.getAttributes() - .get(CacheRequestBodyGatewayFilterFactory.CACHED_ORIGIN_REQUEST_BODY_BACKUP_ATTR); - if (o instanceof PooledDataBuffer dataBuffer) { + .get(CacheRequestBodyGatewayFilterFactory.CACHED_ORIGINAL_REQUEST_BODY_BACKUP_ATTR); + if (o instanceof PooledDataBuffer) { + PooledDataBuffer dataBuffer = (PooledDataBuffer) o; if (dataBuffer.isAllocated()) { exchange.getResponse().setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR); fail("DataBuffer is not released");