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

Update SNAPSHOT to 2.1.2.RELEASE

Browse Source
This commit is contained in:
buildmaster
2019-06-20 17:44:47 +00:00
committed by Spencer Gibb
parent ec0d906ff3
commit 89420c3318
9 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
</parent>
<artifactId>spring-cloud-gateway-docs</artifactId>
<packaging>pom</packaging>

8
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<packaging>pom</packaging>
<name>Spring Cloud Gateway</name>
@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.1.6.BUILD-SNAPSHOT</version>
<version>2.1.6.RELEASE</version>
<relativePath/>
</parent>
<scm>
@@ -52,8 +52,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud-commons.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-netflix.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-commons.version>2.1.2.RELEASE</spring-cloud-commons.version>
<spring-cloud-netflix.version>2.1.2.RELEASE</spring-cloud-netflix.version>
<embedded-redis.version>0.6</embedded-redis.version>
<maven-checkstyle-plugin.includeTestSourceDirectory>true
</maven-checkstyle-plugin.includeTestSourceDirectory>

2
spring-cloud-gateway-core/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-gateway-core</artifactId>

32
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java
View File

@@ -148,8 +148,9 @@ public final class ServerWebExchangeUtils {
public static final String CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR = "cachedServerHttpRequestDecorator";
/**
* Cached request body key. Used when {@link #cacheRequestBodyAndRequest(ServerWebExchange, Function)}
* or {@link #cacheRequestBody(ServerWebExchange, Function)} are called.
* Cached request body key. Used when
* {@link #cacheRequestBodyAndRequest(ServerWebExchange, Function)} or
* {@link #cacheRequestBody(ServerWebExchange, Function)} are called.
*/
public static final String CACHED_REQUEST_BODY_ATTR = "cachedRequestBody";
@@ -272,9 +273,10 @@ public final class ServerWebExchangeUtils {
/**
* Caches the request body and the created {@link ServerHttpRequestDecorator} in
* ServerWebExchange attributes. Those attributes are {@link #CACHED_REQUEST_BODY_ATTR}
* and {@link #CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR} respectively. This method
* is useful when the {@link ServerWebExchange} can not be modified, such as a
* ServerWebExchange attributes. Those attributes are
* {@link #CACHED_REQUEST_BODY_ATTR} and
* {@link #CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR} respectively. This method is
* useful when the {@link ServerWebExchange} can not be modified, such as a
* {@link RoutePredicateFactory}.
* @param exchange the available ServerWebExchange.
* @param function a function that accepts the created ServerHttpRequestDecorator.
@@ -302,13 +304,13 @@ public final class ServerWebExchangeUtils {
/**
* Caches the request body in a ServerWebExchange attribute. The attribute is
* {@link #CACHED_REQUEST_BODY_ATTR}. If this method is called from a location
* that can not mutate the ServerWebExchange (such as a Predicate), setting
* cacheDecoratedRequest to true will put a {@link ServerHttpRequestDecorator} in
* an attribute {@link #CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR} for adaptation
* later.
* {@link #CACHED_REQUEST_BODY_ATTR}. If this method is called from a location that
* can not mutate the ServerWebExchange (such as a Predicate), setting
* cacheDecoratedRequest to true will put a {@link ServerHttpRequestDecorator} in an
* attribute {@link #CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR} for adaptation later.
* @param exchange the available ServerWebExchange.
* @param cacheDecoratedRequest if true, the ServerHttpRequestDecorator will be cached.
* @param cacheDecoratedRequest if true, the ServerHttpRequestDecorator will be
* cached.
* @param function a function that accepts the created ServerHttpRequestDecorator.
* @param <T> generic type for the return {@link Mono}.
* @return Mono of type T created by the function parameter.
@@ -323,7 +325,8 @@ public final class ServerWebExchangeUtils {
if (log.isTraceEnabled()) {
log.trace("retaining body in exchange attribute");
}
exchange.getAttributes().put(CACHED_REQUEST_BODY_ATTR, dataBuffer);
exchange.getAttributes().put(CACHED_REQUEST_BODY_ATTR,
dataBuffer);
}
ServerHttpRequestDecorator decorator = new ServerHttpRequestDecorator(
@@ -344,10 +347,11 @@ public final class ServerWebExchangeUtils {
}
};
if (cacheDecoratedRequest) {
exchange.getAttributes().put(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR,
decorator);
exchange.getAttributes().put(
CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR, decorator);
}
return function.apply(decorator);
});
}
}

4
spring-cloud-gateway-dependencies/pom.xml
View File

@@ -6,12 +6,12 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>2.1.6.BUILD-SNAPSHOT</version>
<version>2.1.6.RELEASE</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-gateway-dependencies</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<packaging>pom</packaging>
<name>spring-cloud-gateway-dependencies</name>

2
spring-cloud-gateway-mvc/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-gateway-sample/pom.xml
View File

@@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>

2
spring-cloud-gateway-webflux/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-starter-gateway/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.1.2.BUILD-SNAPSHOT</version>
<version>2.1.2.RELEASE</version>
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-starter-gateway</artifactId>