Functional response builders allow for non-standard HTTP status codes

Issue: SPR-16366

Author: jhoeller

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
  * Base class for {@link ServerHttpResponse} implementations.
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @author Sebastien Deleuze
  * @since 5.0
  */
@@ -112,7 +113,7 @@ public HttpStatus getStatusCode() {
 	 * @param statusCode the HTTP status as an integer value
 	 * @since 5.0.1
 	 */
-	public void setStatusCodeValue(Integer statusCode) {
+	public void setStatusCodeValue(@Nullable Integer statusCode) {
 		this.statusCode = statusCode;
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@
  * Default {@link EntityResponse.Builder} implementation.
  *
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  * @since 5.0
  */
 class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T> {
@@ -58,7 +59,7 @@ class DefaultEntityResponseBuilder<T> implements EntityResponse.Builder<T> {
 
 	private final BodyInserter<T, ? super ServerHttpResponse> inserter;
 
-	private HttpStatus status = HttpStatus.OK;
+	private int status = HttpStatus.OK.value();
 
 	private final HttpHeaders headers = new HttpHeaders();
 
@@ -75,22 +76,27 @@ public DefaultEntityResponseBuilder(T entity, BodyInserter<T, ? super ServerHttp
 
 	@Override
 	public EntityResponse.Builder<T> status(HttpStatus status) {
-		Assert.notNull(status, "'status' must not be null");
+		Assert.notNull(status, "HttpStatus must not be null");
+		this.status = status.value();
+		return this;
+	}
+
+	@Override
+	public EntityResponse.Builder<T> status(int status) {
 		this.status = status;
 		return this;
 	}
 
 	@Override
 	public EntityResponse.Builder<T> cookie(ResponseCookie cookie) {
-		Assert.notNull(cookie, "'cookie' must not be null");
+		Assert.notNull(cookie, "ResponseCookie must not be null");
 		this.cookies.add(cookie.getName(), cookie);
 		return this;
 	}
 
 	@Override
-	public EntityResponse.Builder<T> cookies(
-			Consumer<MultiValueMap<String, ResponseCookie>> cookiesConsumer) {
-		Assert.notNull(cookiesConsumer, "'cookiesConsumer' must not be null");
+	public EntityResponse.Builder<T> cookies(Consumer<MultiValueMap<String, ResponseCookie>> cookiesConsumer) {
+		Assert.notNull(cookiesConsumer, "Consumer must not be null");
 		cookiesConsumer.accept(this.cookies);
 		return this;
 	}
@@ -182,8 +188,8 @@ public EntityResponse.Builder<T> varyBy(String... requestHeaders) {
 
 	@Override
 	public Mono<EntityResponse<T>> build() {
-		return Mono.just(new DefaultEntityResponse<T>(this.status, this.headers, this.cookies,
-				this.entity, this.inserter, this.hints));
+		return Mono.just(new DefaultEntityResponse<T>(
+				this.status, this.headers, this.cookies, this.entity, this.inserter, this.hints));
 	}
 
 
@@ -197,8 +203,7 @@ private final static class DefaultEntityResponse<T>
 
 		private final Map<String, Object> hints;
 
-
-		public DefaultEntityResponse(HttpStatus statusCode, HttpHeaders headers,
+		public DefaultEntityResponse(int statusCode, HttpHeaders headers,
 				MultiValueMap<String, ResponseCookie> cookies, T entity,
 				BodyInserter<T, ? super ServerHttpResponse> inserter, Map<String, Object> hints) {
 
@@ -208,7 +213,6 @@ public DefaultEntityResponse(HttpStatus statusCode, HttpHeaders headers,
 			this.hints = hints;
 		}
 
-
 		@Override
 		public T entity() {
 			return this.entity;
@@ -228,12 +232,10 @@ public Mono<Void> writeTo(ServerWebExchange exchange, Context context) {
 				public List<HttpMessageWriter<?>> messageWriters() {
 					return context.messageWriters();
 				}
-
 				@Override
 				public Optional<ServerHttpRequest> serverRequest() {
 					return Optional.of(exchange.getRequest());
 				}
-
 				@Override
 				public Map<String, Object> hints() {
 					return hints;

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,13 +47,14 @@
  * Default {@link RenderingResponse.Builder} implementation.
  *
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  * @since 5.0
  */
 class DefaultRenderingResponseBuilder implements RenderingResponse.Builder {
 
 	private final String name;
 
-	private HttpStatus status = HttpStatus.OK;
+	private int status = HttpStatus.OK.value();
 
 	private final HttpHeaders headers = new HttpHeaders();
 
@@ -62,35 +63,49 @@ class DefaultRenderingResponseBuilder implements RenderingResponse.Builder {
 	private final Map<String, Object> model = new LinkedHashMap<>();
 
 
+	public DefaultRenderingResponseBuilder(RenderingResponse other) {
+		this.name = other.name();
+		this.status = (other instanceof DefaultRenderingResponse ?
+				((DefaultRenderingResponse) other).statusCode : other.statusCode().value());
+		this.headers.putAll(other.headers());
+		this.model.putAll(other.model());
+	}
+
 	public DefaultRenderingResponseBuilder(String name) {
 		this.name = name;
 	}
 
 
 	@Override
 	public RenderingResponse.Builder status(HttpStatus status) {
-		Assert.notNull(status, "'status' must not be null");
+		Assert.notNull(status, "HttpStatus must not be null");
+		this.status = status.value();
+		return this;
+	}
+
+	@Override
+	public RenderingResponse.Builder status(int status) {
 		this.status = status;
 		return this;
 	}
 
 	@Override
 	public RenderingResponse.Builder cookie(ResponseCookie cookie) {
-		Assert.notNull(cookie, "'cookie' must not be null");
+		Assert.notNull(cookie, "ResponseCookie must not be null");
 		this.cookies.add(cookie.getName(), cookie);
 		return this;
 	}
 
 	@Override
 	public RenderingResponse.Builder cookies(Consumer<MultiValueMap<String, ResponseCookie>> cookiesConsumer) {
-		Assert.notNull(cookiesConsumer, "'cookiesConsumer' must not be null");
+		Assert.notNull(cookiesConsumer, "Consumer must not be null");
 		cookiesConsumer.accept(this.cookies);
 		return this;
 	}
 
 	@Override
 	public RenderingResponse.Builder modelAttribute(Object attribute) {
-		Assert.notNull(attribute, "'value' must not be null");
+		Assert.notNull(attribute, "Attribute must not be null");
 		if (attribute instanceof Collection && ((Collection<?>) attribute).isEmpty()) {
 			return this;
 		}
@@ -99,7 +114,7 @@ public RenderingResponse.Builder modelAttribute(Object attribute) {
 
 	@Override
 	public RenderingResponse.Builder modelAttribute(String name, @Nullable Object value) {
-		Assert.notNull(name, "'name' must not be null");
+		Assert.notNull(name, "Name must not be null");
 		this.model.put(name, value);
 		return this;
 	}
@@ -138,32 +153,26 @@ public RenderingResponse.Builder headers(HttpHeaders headers) {
 
 	@Override
 	public Mono<RenderingResponse> build() {
-		return Mono.just(new DefaultRenderingResponse(this.status, this.headers, this.cookies,
-				this.name, this.model));
+		return Mono.just(
+				new DefaultRenderingResponse(this.status, this.headers, this.cookies, this.name, this.model));
 	}
 
 
-	private final static class DefaultRenderingResponse
-			extends DefaultServerResponseBuilder.AbstractServerResponse
+	private static final class DefaultRenderingResponse extends DefaultServerResponseBuilder.AbstractServerResponse
 			implements RenderingResponse {
 
 		private final String name;
 
 		private final Map<String, Object> model;
 
-		public DefaultRenderingResponse(HttpStatus statusCode, HttpHeaders headers,
-				MultiValueMap<String, ResponseCookie> cookies,
-				String name, Map<String, Object> model) {
+		public DefaultRenderingResponse(int statusCode, HttpHeaders headers,
+				MultiValueMap<String, ResponseCookie> cookies, String name, Map<String, Object> model) {
+
 			super(statusCode, headers, cookies);
 			this.name = name;
-			this.model = unmodifiableCopy(model);
+			this.model = Collections.unmodifiableMap(new LinkedHashMap<>(model));
 		}
 
-		private static <K, V> Map<K, V> unmodifiableCopy(Map<? extends K, ? extends V> m) {
-			return Collections.unmodifiableMap(new LinkedHashMap<>(m));
-		}
-
-
 		@Override
 		public String name() {
 			return this.name;