SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2021-07-29 02:30:48 +00:00
parent ec34a99f34
commit eda92db12a
3 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactory.java
View File

@@ -37,8 +37,8 @@ import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.C
/**
* @author weizibin
*/
public class CacheRequestBodyGatewayFilterFactory extends
AbstractGatewayFilterFactory<CacheRequestBodyGatewayFilterFactory.Config> {
public class CacheRequestBodyGatewayFilterFactory
extends AbstractGatewayFilterFactory<CacheRequestBodyGatewayFilterFactory.Config> {
private final List<HttpMessageReader<?>> messageReaders;
@@ -51,8 +51,7 @@ public class CacheRequestBodyGatewayFilterFactory extends
public GatewayFilter apply(CacheRequestBodyGatewayFilterFactory.Config config) {
return new GatewayFilter() {
@Override
public Mono<Void> filter(ServerWebExchange exchange,
GatewayFilterChain chain) {
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
ServerHttpRequest request = exchange.getRequest();
URI requestUri = request.getURI();
String scheme = requestUri.getScheme();
@@ -68,27 +67,24 @@ public class CacheRequestBodyGatewayFilterFactory extends
}
return ServerWebExchangeUtils.cacheRequestBodyAndRequest(exchange, (serverHttpRequest) -> {
final ServerRequest serverRequest = ServerRequest.create(exchange.mutate()
.request(serverHttpRequest).build(), messageReaders);
return serverRequest.bodyToMono((config.getBodyClass()))
.doOnNext(objectValue -> {
exchange.getAttributes()
.put(ServerWebExchangeUtils.CACHED_REQUEST_BODY_ATTR, objectValue);
}).then(Mono.defer(() -> {
ServerHttpRequest cachedRequest =
exchange.getAttribute(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
Assert.notNull(cachedRequest, "cache request shouldn't be null");
exchange.getAttributes().remove(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
return chain.filter(exchange.mutate().request(cachedRequest).build());
}));
final ServerRequest serverRequest = ServerRequest
.create(exchange.mutate().request(serverHttpRequest).build(), messageReaders);
return serverRequest.bodyToMono((config.getBodyClass())).doOnNext(objectValue -> {
exchange.getAttributes().put(ServerWebExchangeUtils.CACHED_REQUEST_BODY_ATTR, objectValue);
}).then(Mono.defer(() -> {
ServerHttpRequest cachedRequest = exchange
.getAttribute(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
Assert.notNull(cachedRequest, "cache request shouldn't be null");
exchange.getAttributes().remove(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
return chain.filter(exchange.mutate().request(cachedRequest).build());
}));
});
}
@Override
public String toString() {
return filterToStringCreator(CacheRequestBodyGatewayFilterFactory.this)
.append("Body class", config.getBodyClass())
.toString();
.append("Body class", config.getBodyClass()).toString();
}
};
}
@@ -104,5 +100,7 @@ public class CacheRequestBodyGatewayFilterFactory extends
public void setBodyClass(Class<?> bodyClass) {
this.bodyClass = bodyClass;
}
}
}

6
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/builder/GatewayFilterSpec.java
View File

@@ -255,12 +255,12 @@ public class GatewayFilterSpec extends UriSpec {
/**
* A filter that can cache the request body.
* @param bodyClass the class to convert the incoming request body to the original request body class
* @param bodyClass the class to convert the incoming request body to the original
* request body class
* @return a {@link GatewayFilterSpec} that can be used to apply additional filters
*/
public GatewayFilterSpec cacheRequestBody(Class<?> bodyClass) {
return filter(getBean(CacheRequestBodyGatewayFilterFactory.class)
.apply(c -> c.setBodyClass(bodyClass)));
return filter(getBean(CacheRequestBodyGatewayFilterFactory.class).apply(c -> c.setBodyClass(bodyClass)));
}
/**

78
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactoryTests.java
View File

@@ -45,46 +45,41 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = RANDOM_PORT)
@DirtiesContext
public class CacheRequestBodyGatewayFilterFactoryTests
extends BaseWebClientTests {
public class CacheRequestBodyGatewayFilterFactoryTests extends BaseWebClientTests {
private static final String BODY_VALUE = "here is request body";
private static final String BODY_EMPTY = "";
private static final String BODY_CACHED_EXISTS = "BODY_CACHED_EXISTS";
@Test
public void cacheRequestBodyWorks() {
testClient.post().uri("/post")
.header("Host", "www.cacherequestbody.org").bodyValue(BODY_VALUE)
.exchange()
testClient.post().uri("/post").header("Host", "www.cacherequestbody.org").bodyValue(BODY_VALUE).exchange()
.expectStatus().isOk().expectBody(Map.class).consumeWith(result -> {
Map<?, ?> response = result.getResponseBody();
assertThat(response).isNotNull();
Map<?, ?> response = result.getResponseBody();
assertThat(response).isNotNull();
String responseBody = (String) response.get("data");
assertThat(responseBody).isEqualTo(BODY_VALUE);
});
String responseBody = (String) response.get("data");
assertThat(responseBody).isEqualTo(BODY_VALUE);
});
}
@Test
public void cacheRequestBodyEmpty() {
testClient.post().uri("/post")
.header("Host", "www.cacherequestbodyempty.org")
.exchange()
.expectStatus().isOk().expectBody(Map.class).consumeWith(result -> {
Map<?, ?> response = result.getResponseBody();
assertThat(response).isNotNull();
testClient.post().uri("/post").header("Host", "www.cacherequestbodyempty.org").exchange().expectStatus().isOk()
.expectBody(Map.class).consumeWith(result -> {
Map<?, ?> response = result.getResponseBody();
assertThat(response).isNotNull();
assertThat(response.get("data")).isNull();
});
assertThat(response.get("data")).isNull();
});
}
@Test
public void cacheRequestBodyExists() {
testClient.post().uri("/post")
.header("Host", "www.cacherequestbodyexists.org")
.exchange()
.expectStatus().isOk();
testClient.post().uri("/post").header("Host", "www.cacherequestbodyexists.org").exchange().expectStatus()
.isOk();
}
@Test
@@ -106,30 +101,32 @@ public class CacheRequestBodyGatewayFilterFactoryTests
@Bean
public RouteLocator testRouteLocator(RouteLocatorBuilder builder) {
return builder.routes()
.route("cache_request_body_java_test", r -> r
.path("/post").and().host("**.cacherequestbody.org")
.filters(f -> f.prefixPath("/httpbin").cacheRequestBody(String.class)
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_VALUE)))
.uri(uri))
.route("cache_request_body_empty_java_test", r -> r
.path("/post").and().host("**.cacherequestbodyempty.org")
.filters(f -> f.prefixPath("/httpbin").cacheRequestBody(String.class)
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_EMPTY)))
.uri(uri))
.route("cache_request_body_exists_java_test", r -> r
.path("/post").and().host("**.cacherequestbodyexists.org")
.filters(f -> f.prefixPath("/httpbin")
.filter(new SetExchangeCachedRequestBodyGatewayFilter(BODY_CACHED_EXISTS))
.cacheRequestBody(String.class)
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_CACHED_EXISTS)))
.uri(uri))
.route("cache_request_body_java_test",
r -> r.path("/post").and().host("**.cacherequestbody.org")
.filters(f -> f.prefixPath("/httpbin").cacheRequestBody(String.class)
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_VALUE)))
.uri(uri))
.route("cache_request_body_empty_java_test",
r -> r.path("/post").and().host("**.cacherequestbodyempty.org")
.filters(f -> f.prefixPath("/httpbin").cacheRequestBody(String.class)
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_EMPTY)))
.uri(uri))
.route("cache_request_body_exists_java_test",
r -> r.path("/post").and().host("**.cacherequestbodyexists.org")
.filters(f -> f.prefixPath("/httpbin")
.filter(new SetExchangeCachedRequestBodyGatewayFilter(BODY_CACHED_EXISTS))
.cacheRequestBody(String.class)
.filter(new AssertCachedRequestBodyGatewayFilter(BODY_CACHED_EXISTS)))
.uri(uri))
.build();
}
}
private static class AssertCachedRequestBodyGatewayFilter implements GatewayFilter {
private boolean exceptNullBody;
private String bodyExcepted;
AssertCachedRequestBodyGatewayFilter(String body) {
@@ -148,9 +145,11 @@ public class CacheRequestBodyGatewayFilterFactoryTests
}
return chain.filter(exchange);
}
}
private static class SetExchangeCachedRequestBodyGatewayFilter implements GatewayFilter {
private String bodyToSetCache;
SetExchangeCachedRequestBodyGatewayFilter(String toSet) {
@@ -162,6 +161,7 @@ public class CacheRequestBodyGatewayFilterFactoryTests
exchange.getAttributes().put(ServerWebExchangeUtils.CACHED_REQUEST_BODY_ATTR, bodyToSetCache);
return chain.filter(exchange);
}
}
}