Merge branch '5.1.x'

Author: poutsma

spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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,7 +47,7 @@
  */
 public class MockClientHttpResponse implements ClientHttpResponse {
 
-	private final HttpStatus status;
+	private final int status;
 
 	private final HttpHeaders headers = new HttpHeaders();
 
@@ -60,18 +60,23 @@ public class MockClientHttpResponse implements ClientHttpResponse {
 
 	public MockClientHttpResponse(HttpStatus status) {
 		Assert.notNull(status, "HttpStatus is required");
+		this.status = status.value();
+	}
+
+	public MockClientHttpResponse(int status) {
+		Assert.isTrue(status >= 100 && status < 600, "Status must be between 1xx and 5xx");
 		this.status = status;
 	}
 
 
 	@Override
 	public HttpStatus getStatusCode() {
-		return this.status;
+		return HttpStatus.resolve(this.status);
 	}
 
 	@Override
 	public int getRawStatusCode() {
-		return this.status.value();
+		return this.status;
 	}
 
 	@Override

spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -19,6 +19,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ReactiveHttpInputMessage;
 import org.springframework.http.ResponseCookie;
+import org.springframework.lang.Nullable;
 import org.springframework.util.MultiValueMap;
 
 /**
@@ -34,8 +35,9 @@ public interface ClientHttpResponse extends ReactiveHttpInputMessage {
 	 * Return the HTTP status code of the response.
 	 * @return the HTTP status as an HttpStatus enum value
 	 * @throws IllegalArgumentException in case of an unknown HTTP status code
-	 * @see HttpStatus#valueOf(int)
+	 * @see HttpStatus#resolve(int)
 	 */
+	@Nullable
 	HttpStatus getStatusCode();
 
 	/**

spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java

@@ -53,7 +53,7 @@ public JettyClientHttpResponse(ReactiveResponse reactiveResponse, Publisher<Data
 
 	@Override
 	public HttpStatus getStatusCode() {
-		return HttpStatus.valueOf(getRawStatusCode());
+		return HttpStatus.resolve(getRawStatusCode());
 	}
 
 	@Override

spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java

@@ -88,7 +88,7 @@ public HttpHeaders getHeaders() {
 
 	@Override
 	public HttpStatus getStatusCode() {
-		return HttpStatus.valueOf(getRawStatusCode());
+		return HttpStatus.resolve(getRawStatusCode());
 	}
 
 	@Override

spring-web/src/test/java/org/springframework/mock/http/client/reactive/test/MockClientHttpResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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,7 +47,7 @@
  */
 public class MockClientHttpResponse implements ClientHttpResponse {
 
-	private final HttpStatus status;
+	private final int status;
 
 	private final HttpHeaders headers = new HttpHeaders();
 
@@ -60,18 +60,23 @@ public class MockClientHttpResponse implements ClientHttpResponse {
 
 	public MockClientHttpResponse(HttpStatus status) {
 		Assert.notNull(status, "HttpStatus is required");
+		this.status = status.value();
+	}
+
+	public MockClientHttpResponse(int status) {
+		Assert.isTrue(status >= 100 && status < 600, "Status must be between 1xx and 5xx");
 		this.status = status;
 	}
 
 
 	@Override
 	public HttpStatus getStatusCode() {
-		return this.status;
+		return HttpStatus.resolve(this.status);
 	}
 
 	@Override
 	public int getRawStatusCode() {
-		return this.status.value();
+		return this.status;
 	}
 
 	@Override
@@ -120,7 +125,7 @@ public Flux<DataBuffer> getBody() {
 	public Mono<String> getBodyAsString() {
 		Charset charset = getCharset();
 		return Flux.from(getBody())
-				.reduce(bufferFactory.allocateBuffer(), (previous, current) -> {
+				.reduce(this.bufferFactory.allocateBuffer(), (previous, current) -> {
 					previous.write(current);
 					DataBufferUtils.release(current);
 					return previous;

spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java

@@ -36,6 +36,7 @@
 import org.springframework.http.client.reactive.ClientHttpResponse;
 import org.springframework.http.codec.HttpMessageReader;
 import org.springframework.http.codec.HttpMessageWriter;
+import org.springframework.lang.Nullable;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.reactive.function.BodyExtractor;
 
@@ -63,8 +64,9 @@ public interface ClientResponse {
 	 * Return the status code of this response.
 	 * @return the status as an HttpStatus enum value
 	 * @throws IllegalArgumentException in case of an unknown HTTP status code
-	 * @see HttpStatus#valueOf(int)
+	 * @see HttpStatus#resolve(int)
 	 */
+	@Nullable
 	HttpStatus statusCode();
 
 	/**
@@ -203,6 +205,17 @@ static Builder create(HttpStatus statusCode, ExchangeStrategies strategies) {
 		return new DefaultClientResponseBuilder(strategies).statusCode(statusCode);
 	}
 
+	/**
+	 * Create a response builder with the given raw status code and strategies for reading the body.
+	 * @param statusCode the status code
+	 * @param strategies the strategies
+	 * @return the created builder
+	 * @since 5.1.9
+	 */
+	static Builder create(int statusCode, ExchangeStrategies strategies) {
+		return new DefaultClientResponseBuilder(strategies).rawStatusCode(statusCode);
+	}
+
 	/**
 	 * Create a response builder with the given status code and message body readers.
 	 * @param statusCode the status code
@@ -268,6 +281,14 @@ interface Builder {
 		 */
 		Builder statusCode(HttpStatus statusCode);
 
+		/**
+		 * Set the raw status code of the response.
+		 * @param statusCode the new status code.
+		 * @return this builder
+		 * @since 5.1.9
+		 */
+		Builder rawStatusCode(int statusCode);
+
 		/**
 		 * Add the given header value(s) under the given name.
 		 * @param headerName  the header name

spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java

@@ -67,7 +67,7 @@ public HttpHeaders getHeaders() {
 
 	private ExchangeStrategies strategies;
 
-	private HttpStatus statusCode = HttpStatus.OK;
+	private int statusCode = 200;
 
 	private final HttpHeaders headers = new HttpHeaders();
 
@@ -87,7 +87,7 @@ public DefaultClientResponseBuilder(ExchangeStrategies strategies) {
 	public DefaultClientResponseBuilder(ClientResponse other) {
 		Assert.notNull(other, "ClientResponse must not be null");
 		this.strategies = other.strategies();
-		statusCode(other.statusCode());
+		this.statusCode = other.rawStatusCode();
 		headers(headers -> headers.addAll(other.headers().asHttpHeaders()));
 		cookies(cookies -> cookies.addAll(other.cookies()));
 		if (other instanceof DefaultClientResponse) {
@@ -101,7 +101,12 @@ public DefaultClientResponseBuilder(ClientResponse other) {
 
 	@Override
 	public DefaultClientResponseBuilder statusCode(HttpStatus statusCode) {
-		Assert.notNull(statusCode, "HttpStatus must not be null");
+		return rawStatusCode(statusCode.value());
+	}
+
+	@Override
+	public DefaultClientResponseBuilder rawStatusCode(int statusCode) {
+		Assert.isTrue(statusCode >= 100 && statusCode < 600, "StatusCode must be between 1xx and 5xx");
 		this.statusCode = statusCode;
 		return this;
 	}
@@ -179,15 +184,15 @@ public ClientResponse build() {
 
 	private static class BuiltClientHttpResponse implements ClientHttpResponse {
 
-		private final HttpStatus statusCode;
+		private final int statusCode;
 
 		private final HttpHeaders headers;
 
 		private final MultiValueMap<String, ResponseCookie> cookies;
 
 		private final Flux<DataBuffer> body;
 
-		public BuiltClientHttpResponse(HttpStatus statusCode, HttpHeaders headers,
+		public BuiltClientHttpResponse(int statusCode, HttpHeaders headers,
 				MultiValueMap<String, ResponseCookie> cookies, Flux<DataBuffer> body) {
 
 			this.statusCode = statusCode;
@@ -198,12 +203,12 @@ public BuiltClientHttpResponse(HttpStatus statusCode, HttpHeaders headers,
 
 		@Override
 		public HttpStatus getStatusCode() {
-			return this.statusCode;
+			return HttpStatus.resolve(this.statusCode);
 		}
 
 		@Override
 		public int getRawStatusCode() {
-			return this.statusCode.value();
+			return this.statusCode;
 		}
 
 		@Override

spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java

@@ -100,5 +100,18 @@ public void from() {
 				.verifyComplete();
 	}
 
+	@Test
+	public void fromCustomStatus() {
+
+		ClientResponse other = ClientResponse.create(499, ExchangeStrategies.withDefaults())
+				.build();
+
+		ClientResponse result = ClientResponse.from(other)
+				.build();
+
+		assertThat(result.rawStatusCode()).isEqualTo(499);
+		assertThat(result.statusCode()).isNull();
+	}
+
 
 }