root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Copy cookies to ServerResponse builders 

See gh-22351
This commit is contained in:
Arjen Poutsma 2019-03-26 16:32:02 +01:00
parent 771d436680
commit 4ca27db0cc
7 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
View File

@ -126,8 +126,8 @@ final class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T>
}
@Override
public EntityResponse.Builder<T> headers(HttpHeaders headers) {
this.headers.putAll(headers);
public EntityResponse.Builder<T> headers(Consumer<HttpHeaders> headersConsumer) {
headersConsumer.accept(this.headers);
return this;
}

4
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultRenderingResponseBuilder.java
View File

@ -138,8 +138,8 @@ final class DefaultRenderingResponseBuilder implements RenderingResponse.Builder
}
@Override
public RenderingResponse.Builder headers(HttpHeaders headers) {
this.headers.putAll(headers);
public RenderingResponse.Builder headers(Consumer<HttpHeaders> headersConsumer) {
headersConsumer.accept(this.headers);
return this;
}

12
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java
View File

@ -189,24 +189,27 @@ class DefaultServerResponseBuilder implements ServerResponse.BodyBuilder {
@Override
public ServerResponse body(Object body) {
return DefaultEntityResponseBuilder.fromObject(body)
.headers(this.headers)
.status(this.statusCode)
.headers(headers -> headers.putAll(this.headers))
.cookies(cookies -> cookies.addAll(this.cookies))
.build();
}
@Override
public <T> ServerResponse body(T body, ParameterizedTypeReference<T> bodyType) {
return DefaultEntityResponseBuilder.fromObject(body, bodyType)
.headers(this.headers)
.status(this.statusCode)
.headers(headers -> headers.putAll(this.headers))
.cookies(cookies -> cookies.addAll(this.cookies))
.build();
}
@Override
public ServerResponse render(String name, Object... modelAttributes) {
return new DefaultRenderingResponseBuilder(name)
.headers(this.headers)
.status(this.statusCode)
.headers(headers -> headers.putAll(this.headers))
.cookies(cookies -> cookies.addAll(this.cookies))
.modelAttributes(modelAttributes)
.build();
}
@ -214,8 +217,9 @@ class DefaultServerResponseBuilder implements ServerResponse.BodyBuilder {
@Override
public ServerResponse render(String name, Map<String, ?> model) {
return new DefaultRenderingResponseBuilder(name)
.headers(this.headers)
.status(this.statusCode)
.headers(headers -> headers.putAll(this.headers))
.cookies(cookies -> cookies.addAll(this.cookies))
.modelAttributes(model)
.build();
}

11
spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java
View File

@ -86,12 +86,15 @@ public interface EntityResponse<T> extends ServerResponse {
Builder<T> header(String headerName, String... headerValues);
/**
* Copy the given headers into the entity's headers map.
* @param headers the existing HttpHeaders to copy from
* Manipulate this response's headers with the given consumer. The
* headers provided to the consumer are "live", so that the consumer can be used to
* {@linkplain HttpHeaders#set(String, String) overwrite} existing header values,
* {@linkplain HttpHeaders#remove(Object) remove} values, or use any of the other
* {@link HttpHeaders} methods.
* @param headersConsumer a function that consumes the {@code HttpHeaders}
* @return this builder
* @see HttpHeaders#add(String, String)
*/
Builder<T> headers(HttpHeaders headers);
Builder<T> headers(Consumer<HttpHeaders> headersConsumer);
/**
* Set the HTTP status.

11
spring-webmvc/src/main/java/org/springframework/web/servlet/function/RenderingResponse.java
View File

@ -119,12 +119,15 @@ public interface RenderingResponse extends ServerResponse {
Builder header(String headerName, String... headerValues);
/**
* Copy the given headers into the entity's headers map.
* @param headers the existing HttpHeaders to copy from
* Manipulate this response's headers with the given consumer. The
* headers provided to the consumer are "live", so that the consumer can be used to
* {@linkplain HttpHeaders#set(String, String) overwrite} existing header values,
* {@linkplain HttpHeaders#remove(Object) remove} values, or use any of the other
* {@link HttpHeaders} methods.
* @param headersConsumer a function that consumes the {@code HttpHeaders}
* @return this builder
* @see HttpHeaders#add(String, String)
*/
Builder headers(HttpHeaders headers);
Builder headers(Consumer<HttpHeaders> headersConsumer);
/**
* Set the HTTP status.

4
spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
View File

@ -154,7 +154,9 @@ public class DefaultEntityResponseBuilderTests {
String body = "foo";
HttpHeaders headers = new HttpHeaders();
headers.set("foo", "bar");
EntityResponse<String> result = EntityResponse.fromObject(body).headers(headers).build();
EntityResponse<String> result = EntityResponse.fromObject(body)
.headers(h -> h.addAll(headers))
.build();
assertEquals(headers, result.headers());
}

4
spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
View File

@ -78,7 +78,9 @@ public class DefaultRenderingResponseTests {
public void headers() throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.set("foo", "bar");
RenderingResponse result = RenderingResponse.create("foo").headers(headers).build();
RenderingResponse result = RenderingResponse.create("foo")
.headers(h -> h.addAll(headers))
.build();
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();