Introduce RenderingResponse

This commit introduces the RenderingResponse, a template
rendering-specific subtype of ServerResponse that exposes model and
template data.

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2002-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.reactive.function.server;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
+import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
+import org.springframework.web.reactive.result.view.View;
+import org.springframework.web.reactive.result.view.ViewResolver;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.adapter.DefaultServerWebExchange;
+import org.springframework.web.server.session.MockWebSessionManager;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class DefaultRenderingResponseTests {
+
+	@Test
+	public void create() throws Exception {
+		String name = "foo";
+		Mono<RenderingResponse> result = RenderingResponse.create(name).build();
+		StepVerifier.create(result)
+				.expectNextMatches(response -> name.equals(response.name()))
+				.expectComplete()
+				.verify();
+	}
+
+	@Test
+	public void headers() throws Exception {
+		HttpHeaders headers = new HttpHeaders();
+		Mono<RenderingResponse> result = RenderingResponse.create("foo").headers(headers).build();
+		StepVerifier.create(result)
+				.expectNextMatches(response -> headers.equals(response.headers()))
+				.expectComplete()
+				.verify();
+
+	}
+
+	@Test
+	public void modelAttribute() throws Exception {
+		Mono<RenderingResponse> result = RenderingResponse.create("foo")
+				.modelAttribute("foo", "bar").build();
+		StepVerifier.create(result)
+				.expectNextMatches(response -> "bar".equals(response.model().get("foo")))
+				.expectComplete()
+				.verify();
+	}
+
+	@Test
+	public void modelAttributeConventions() throws Exception {
+		Mono<RenderingResponse> result = RenderingResponse.create("foo")
+				.modelAttribute("bar").build();
+		StepVerifier.create(result)
+				.expectNextMatches(response -> "bar".equals(response.model().get("string")))
+				.expectComplete()
+				.verify();
+	}
+
+	@Test
+	public void modelAttributes() throws Exception {
+		Map<String, String> model = Collections.singletonMap("foo", "bar");
+		Mono<RenderingResponse> result = RenderingResponse.create("foo")
+				.modelAttributes(model).build();
+		StepVerifier.create(result)
+				.expectNextMatches(response -> "bar".equals(response.model().get("foo")))
+				.expectComplete()
+				.verify();
+	}
+
+	@Test
+	public void modelAttributesConventions() throws Exception {
+		Set<String> model = Collections.singleton("bar");
+		Mono<RenderingResponse> result = RenderingResponse.create("foo")
+				.modelAttributes(model).build();
+		StepVerifier.create(result)
+				.expectNextMatches(response -> "bar".equals(response.model().get("string")))
+				.expectComplete()
+				.verify();
+	}
+
+	@Test
+	public void render() throws Exception {
+		Map<String, Object> model = Collections.singletonMap("foo", "bar");
+		Mono<RenderingResponse> result = RenderingResponse.create("view").modelAttributes(model).build();
+
+		MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost").build();
+		MockServerHttpResponse mockResponse = new MockServerHttpResponse();
+		ServerWebExchange exchange =
+				new DefaultServerWebExchange(request, mockResponse, new MockWebSessionManager());
+		ViewResolver viewResolver = mock(ViewResolver.class);
+		View view = mock(View.class);
+		when(viewResolver.resolveViewName("view", Locale.ENGLISH)).thenReturn(Mono.just(view));
+		when(view.render(model, null, exchange)).thenReturn(Mono.empty());
+
+		List<ViewResolver> viewResolvers = new ArrayList<>();
+		viewResolvers.add(viewResolver);
+
+		HandlerStrategies mockConfig = mock(HandlerStrategies.class);
+		when(mockConfig.viewResolvers()).thenReturn(viewResolvers::stream);
+
+		StepVerifier.create(result)
+				.expectNextMatches(response -> "view".equals(response.name()) &&
+						model.equals(response.model()))
+				.expectComplete()
+				.verify();
+	}
+
+}

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java

@@ -309,59 +309,5 @@ TODO: enable when ServerEntityResponse is reintroduced
 	}
 */
 
-/*
-TODO: enable when ServerEntityResponse is reintroduced
-	@Test
-	public void render() throws Exception {
-		Map<String, Object> model = Collections.singletonMap("foo", "bar");
-		Mono<ServerResponse> result = ServerResponse.ok().render("view", model);
-
-
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, URI.create("http://localhost"));
-		MockServerHttpResponse mockResponse = new MockServerHttpResponse();
-		ServerWebExchange exchange = new DefaultServerWebExchange(request, mockResponse, new MockWebSessionManager());
-		ViewResolver viewResolver = mock(ViewResolver.class);
-		View view = mock(View.class);
-		when(viewResolver.resolveViewName("view", Locale.ENGLISH)).thenReturn(Mono.just(view));
-		when(view.render(model, null, exchange)).thenReturn(Mono.empty());
-
-		List<ViewResolver> viewResolvers = new ArrayList<>();
-		viewResolvers.add(viewResolver);
-
-		HandlerStrategies mockConfig = mock(HandlerStrategies.class);
-		when(mockConfig.viewResolvers()).thenReturn(viewResolvers::stream);
-
-		StepVerifier.create(result)
-				.consumeNextWith(response -> {
-					StepVerifier.create(response.body())
-							.expectNextMatches(rendering -> "view".equals(rendering.name())
-									&& model.equals(rendering.model()))
-							.expectComplete()
-							.verify();
-				})
-				.expectComplete()
-				.verify();
-	}
-*/
-
-/*
-TODO: enable when ServerEntityResponse is reintroduced
-
-	@Test
-	public void renderObjectArray() throws Exception {
-		Mono<ServerResponse> result =
-				ServerResponse.ok().render("name", this, Collections.emptyList(), "foo");
-		Flux<Rendering> map = result.flatMap(ServerResponse::body);
-
-		Map<String, Object> expected = new HashMap<>(2);
-		expected.put("defaultServerResponseBuilderTests", this);
-		expected.put("string", "foo");
-
-		StepVerifier.create(map)
-				.expectNextMatches(rendering -> expected.equals(rendering.model()))
-				.expectComplete()
-				.verify();
-	}
-*/
 
 }

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java

@@ -17,6 +17,9 @@
 package org.springframework.web.reactive.function.server;
 
 import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
@@ -136,6 +139,11 @@ public class DispatcherHandlerIntegrationTests extends AbstractHttpHandlerIntegr
 						public Supplier<Stream<ViewResolver>> viewResolvers() {
 							return Stream::empty;
 						}
+
+						@Override
+						public Function<ServerRequest, Optional<Locale>> localeResolver() {
+							return DefaultHandlerStrategiesBuilder.DEFAULT_LOCALE_RESOLVER;
+						}
 					});
 		}
 

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HandlerStrategiesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -20,8 +20,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
@@ -57,15 +55,15 @@ public class HandlerStrategiesTests {
 		HttpMessageReader<?> messageReader = new DummyMessageReader();
 		HttpMessageWriter<?> messageWriter = new DummyMessageWriter();
 
-		HandlerStrategies strategies = HandlerStrategies.of(
-				() -> Stream.of(messageReader),
-				() -> Stream.of(messageWriter),
-				null);
+		HandlerStrategies strategies = HandlerStrategies.empty()
+				.messageReader(messageReader)
+				.messageWriter(messageWriter)
+				.build();
 
-		assertEquals(1L, strategies.messageReaders().get().collect(Collectors.counting()).longValue());
+		assertEquals(1L, ((Long) strategies.messageReaders().get().count()).longValue());
 		assertEquals(Optional.of(messageReader), strategies.messageReaders().get().findFirst());
 
-		assertEquals(1L, strategies.messageWriters().get().collect(Collectors.counting()).longValue());
+		assertEquals(1L, ((Long) strategies.messageWriters().get().count()).longValue());
 		assertEquals(Optional.of(messageWriter), strategies.messageWriters().get().findFirst());
 
 		assertEquals(Optional.empty(), strategies.viewResolvers().get().findFirst());

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java

@@ -25,6 +25,7 @@ import java.time.ZonedDateTime;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalLong;
@@ -312,6 +313,11 @@ public class MockServerRequest implements ServerRequest {
 			return delegate().getAcceptCharset();
 		}
 
+		@Override
+		public List<Locale.LanguageRange> acceptLanguage() {
+			return delegate().getAcceptLanguage();
+		}
+
 		@Override
 		public OptionalLong contentLength() {
 			return toOptionalLong(delegate().getContentLength());