Rename Configuration to StrategiesSupplier

Author: poutsma

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractor.java

@@ -33,9 +33,9 @@ public interface BodyExtractor<T> {
 	/**
 	 * Extract from the given request.
 	 * @param request the request to extract from
-	 * @param configuration the configuration to use
+	 * @param strategies the strategies to use
 	 * @return the extracted data
 	 */
-	T extract(ServerHttpRequest request, Configuration configuration);
+	T extract(ServerHttpRequest request, StrategiesSupplier strategies);
 
 }

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java

@@ -61,7 +61,7 @@ public static <T> BodyExtractor<Mono<T>> toMono(Class<? extends T> elementClass)
 	 */
 	public static <T> BodyExtractor<Mono<T>> toMono(ResolvableType elementType) {
 		Assert.notNull(elementType, "'elementType' must not be null");
-		return (request, configuration) -> readWithMessageReaders(request, configuration,
+		return (request, strategies) -> readWithMessageReaders(request, strategies,
 				elementType,
 				reader -> reader.readMono(elementType, request, Collections.emptyMap()),
 				Mono::error);
@@ -86,22 +86,21 @@ public static <T> BodyExtractor<Flux<T>> toFlux(Class<? extends T> elementClass)
 	 */
 	public static <T> BodyExtractor<Flux<T>> toFlux(ResolvableType elementType) {
 		Assert.notNull(elementType, "'elementType' must not be null");
-		return (request, configuration) -> readWithMessageReaders(request, configuration,
+		return (request, strategies) -> readWithMessageReaders(request, strategies,
 				elementType,
 				reader -> reader.read(elementType, request, Collections.emptyMap()),
 				Flux::error);
 	}
 
 	private static <T, S extends Publisher<T>> S readWithMessageReaders(
 			ServerHttpRequest request,
-			Configuration configuration,
+			StrategiesSupplier strategies,
 			ResolvableType elementType,
 			Function<HttpMessageReader<T>, S> readerFunction,
 			Function<Throwable, S> unsupportedError) {
 
 		MediaType contentType = contentType(request);
-		Supplier<Stream<HttpMessageReader<?>>> messageReaders =
-				configuration.messageReaders();
+		Supplier<Stream<HttpMessageReader<?>>> messageReaders = strategies.messageReaders();
 		return messageReaders.get()
 				.filter(r -> r.canRead(elementType, contentType, Collections.emptyMap()))
 				.findFirst()

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserter.java

@@ -39,10 +39,10 @@ public interface BodyInserter<T> {
 	/**
 	 * Insert into the given response.
 	 * @param response the response to insert into
-	 * @param configuration the configuration to use
+	 * @param strategies the strategies to use
 	 * @return a {@code Mono} that indicates completion or error
 	 */
-	Mono<Void> insert(ServerHttpResponse response, Configuration configuration);
+	Mono<Void> insert(ServerHttpResponse response, StrategiesSupplier strategies);
 
 	/**
 	 * Return the type contained in the body.
@@ -58,7 +58,7 @@ public interface BodyInserter<T> {
 	 * @param <T> the type supplied and written by the inserter
 	 * @return the new {@code BodyInserter}
 	 */
-	static <T> BodyInserter<T> of(BiFunction<ServerHttpResponse, Configuration, Mono<Void>> writer,
+	static <T> BodyInserter<T> of(BiFunction<ServerHttpResponse, StrategiesSupplier, Mono<Void>> writer,
 			Supplier<T> supplier) {
 
 		Assert.notNull(writer, "'writer' must not be null");

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java

@@ -64,7 +64,7 @@ public abstract class BodyInserters {
 	public static <T> BodyInserter<T> fromObject(T body) {
 		Assert.notNull(body, "'body' must not be null");
 		return BodyInserter.of(
-				(response, configuration) -> writeWithMessageWriters(response, configuration,
+				(response, strategies) -> writeWithMessageWriters(response, strategies,
 						Mono.just(body), ResolvableType.forInstance(body)),
 				() -> body);
 	}
@@ -99,7 +99,7 @@ public static <S extends Publisher<T>, T> BodyInserter<S> fromPublisher(S publis
 		Assert.notNull(publisher, "'publisher' must not be null");
 		Assert.notNull(elementType, "'elementType' must not be null");
 		return BodyInserter.of(
-				(response, configuration) -> writeWithMessageWriters(response, configuration,
+				(response, strategies) -> writeWithMessageWriters(response, strategies,
 						publisher, elementType),
 				() -> publisher
 		);
@@ -117,7 +117,7 @@ public static <S extends Publisher<T>, T> BodyInserter<S> fromPublisher(S publis
 	public static <T extends Resource> BodyInserter<T> fromResource(T resource) {
 		Assert.notNull(resource, "'resource' must not be null");
 		return BodyInserter.of(
-				(response, configuration) -> {
+				(response, strategies) -> {
 					ResourceHttpMessageWriter messageWriter = new ResourceHttpMessageWriter();
 					MediaType contentType = response.getHeaders().getContentType();
 					return messageWriter.write(Mono.just(resource), RESOURCE_TYPE, contentType,
@@ -139,7 +139,7 @@ public static <T, S extends Publisher<ServerSentEvent<T>>> BodyInserter<S> fromS
 
 		Assert.notNull(eventsPublisher, "'eventsPublisher' must not be null");
 		return BodyInserter.of(
-				(response, configuration) -> {
+				(response, strategies) -> {
 					ServerSentEventHttpMessageWriter messageWriter = sseMessageWriter();
 					MediaType contentType = response.getHeaders().getContentType();
 					return messageWriter.write(eventsPublisher, SERVER_SIDE_EVENT_TYPE,
@@ -183,7 +183,7 @@ public static <T, S extends Publisher<T>> BodyInserter<S> fromServerSentEvents(S
 		Assert.notNull(eventsPublisher, "'eventsPublisher' must not be null");
 		Assert.notNull(eventType, "'eventType' must not be null");
 		return BodyInserter.of(
-				(response, configuration) -> {
+				(response, strategies) -> {
 					ServerSentEventHttpMessageWriter messageWriter = sseMessageWriter();
 					MediaType contentType = response.getHeaders().getContentType();
 					return messageWriter.write(eventsPublisher, eventType, contentType, response,
@@ -201,13 +201,13 @@ private static ServerSentEventHttpMessageWriter sseMessageWriter() {
 	}
 
 	private static <T> Mono<Void> writeWithMessageWriters(ServerHttpResponse response,
-			Configuration configuration,
+			StrategiesSupplier strategies,
 			Publisher<T> body,
 			ResolvableType bodyType) {
 
 		// TODO: use ContentNegotiatingResultHandlerSupport
 		MediaType contentType = response.getHeaders().getContentType();
-		return configuration.messageWriters().get()
+		return strategies.messageWriters().get()
 				.filter(messageWriter -> messageWriter.canWrite(bodyType, contentType, Collections
 						.emptyMap()))
 				.findFirst()
@@ -228,20 +228,20 @@ private static <T> HttpMessageWriter<T> cast(HttpMessageWriter<?> messageWriter)
 
 	static class DefaultBodyInserter<T> implements BodyInserter<T> {
 
-		private final BiFunction<ServerHttpResponse, Configuration, Mono<Void>> writer;
+		private final BiFunction<ServerHttpResponse, StrategiesSupplier, Mono<Void>> writer;
 
 		private final Supplier<T> supplier;
 
 		public DefaultBodyInserter(
-				BiFunction<ServerHttpResponse, Configuration, Mono<Void>> writer,
+				BiFunction<ServerHttpResponse, StrategiesSupplier, Mono<Void>> writer,
 				Supplier<T> supplier) {
 			this.writer = writer;
 			this.supplier = supplier;
 		}
 
 		@Override
-		public Mono<Void> insert(ServerHttpResponse response, Configuration configuration) {
-			return this.writer.apply(response, configuration);
+		public Mono<Void> insert(ServerHttpResponse response, StrategiesSupplier strategies) {
+			return this.writer.apply(response, strategies);
 		}
 
 		@Override

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultRequest.java

@@ -42,11 +42,11 @@ class DefaultRequest implements Request {
 
 	private final Headers headers;
 
-	private final Configuration configuration;
+	private final StrategiesSupplier strategies;
 
-	DefaultRequest(ServerWebExchange exchange, Configuration configuration) {
+	DefaultRequest(ServerWebExchange exchange, StrategiesSupplier strategies) {
 		this.exchange = exchange;
-		this.configuration = configuration;
+		this.strategies = strategies;
 		this.headers = new DefaultHeaders();
 	}
 
@@ -67,7 +67,7 @@ public Headers headers() {
 
 	@Override
 	public <T> T body(BodyExtractor<T> extractor) {
-		return extractor.extract(request(), this.configuration);
+		return extractor.extract(request(), this.strategies);
 	}
 
 	@Override

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultResponseBuilder.java

@@ -142,20 +142,20 @@ public Response.BodyBuilder varyBy(String... requestHeaders) {
 	@Override
 	public Response<Void> build() {
 		return body(BodyInserter.of(
-				(response, configuration) -> response.setComplete(),
+				(response, strategies) -> response.setComplete(),
 				() -> null));
 	}
 
 	@Override
 	public <T extends Publisher<Void>> Response<T> build(T voidPublisher) {
 		Assert.notNull(voidPublisher, "'voidPublisher' must not be null");
 		return body(BodyInserter.of(
-				(response, configuration) -> Flux.from(voidPublisher).then(response.setComplete()),
+				(response, strategies) -> Flux.from(voidPublisher).then(response.setComplete()),
 				() -> null));
 	}
 
 	@Override
-	public <T> Response<T> body(BiFunction<ServerHttpResponse, Configuration, Mono<Void>> writer,
+	public <T> Response<T> body(BiFunction<ServerHttpResponse, StrategiesSupplier, Mono<Void>> writer,
 			Supplier<T> supplier) {
 		return body(BodyInserter.of(writer, supplier));
 	}
@@ -250,10 +250,10 @@ public T body() {
 		}
 
 		@Override
-		public Mono<Void> writeTo(ServerWebExchange exchange, Configuration configuration) {
+		public Mono<Void> writeTo(ServerWebExchange exchange, StrategiesSupplier strategies) {
 			ServerHttpResponse response = exchange.getResponse();
 			writeStatusAndHeaders(response);
-			return this.inserter.insert(response, configuration);
+			return this.inserter.insert(response, strategies);
 		}
 
 	}
@@ -281,12 +281,12 @@ public Rendering body() {
 		}
 
 		@Override
-		public Mono<Void> writeTo(ServerWebExchange exchange, Configuration configuration) {
+		public Mono<Void> writeTo(ServerWebExchange exchange, StrategiesSupplier strategies) {
 			ServerHttpResponse response = exchange.getResponse();
 			writeStatusAndHeaders(response);
 			MediaType contentType = exchange.getResponse().getHeaders().getContentType();
 			Locale locale = Locale.ENGLISH; // TODO: resolve locale
-			Stream<ViewResolver> viewResolverStream = configuration.viewResolvers().get();
+			Stream<ViewResolver> viewResolverStream = strategies.viewResolvers().get();
 			return Flux.fromStream(viewResolverStream)
 					.concatMap(viewResolver -> viewResolver.resolveViewName(this.name, locale))
 					.next()

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultConfigurationBuilder.java renamed to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultStrategiesSupplierBuilder.java

@@ -17,7 +17,6 @@
 package org.springframework.web.reactive.function;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;
@@ -41,20 +40,22 @@
 import org.springframework.web.reactive.result.view.ViewResolver;
 
 /**
+ * Default implementation of {@link StrategiesSupplier.Builder}.
+ *
  * @author Arjen Poutsma
  * @since 5.0
  */
-class DefaultConfigurationBuilder implements Configuration.Builder {
+class DefaultStrategiesSupplierBuilder implements StrategiesSupplier.Builder {
 
 	private static final boolean jackson2Present =
 			ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper",
-					DefaultConfigurationBuilder.class.getClassLoader()) &&
+					DefaultStrategiesSupplierBuilder.class.getClassLoader()) &&
 					ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator",
-							DefaultConfigurationBuilder.class.getClassLoader());
+							DefaultStrategiesSupplierBuilder.class.getClassLoader());
 
 	private static final boolean jaxb2Present =
 			ClassUtils.isPresent("javax.xml.bind.Binder",
-					DefaultConfigurationBuilder.class.getClassLoader());
+					DefaultStrategiesSupplierBuilder.class.getClassLoader());
 
 
 	private final List<HttpMessageReader<?>> messageReaders = new ArrayList<>();
@@ -85,41 +86,41 @@ public void applicationContext(ApplicationContext applicationContext) {
 	}
 
 	@Override
-	public Configuration.Builder messageReader(HttpMessageReader<?> messageReader) {
+	public StrategiesSupplier.Builder messageReader(HttpMessageReader<?> messageReader) {
 		Assert.notNull(messageReader, "'messageReader' must not be null");
 		this.messageReaders.add(messageReader);
 		return this;
 	}
 
 	@Override
-	public Configuration.Builder messageWriter(HttpMessageWriter<?> messageWriter) {
+	public StrategiesSupplier.Builder messageWriter(HttpMessageWriter<?> messageWriter) {
 		Assert.notNull(messageWriter, "'messageWriter' must not be null");
 		this.messageWriters.add(messageWriter);
 		return this;
 	}
 
 	@Override
-	public Configuration.Builder viewResolver(ViewResolver viewResolver) {
+	public StrategiesSupplier.Builder viewResolver(ViewResolver viewResolver) {
 		Assert.notNull(viewResolver, "'viewResolver' must not be null");
 		this.viewResolvers.add(viewResolver);
 		return this;
 	}
 
 	@Override
-	public Configuration build() {
-		return new DefaultConfiguration(this.messageReaders, this.messageWriters,
+	public StrategiesSupplier build() {
+		return new DefaultStrategiesSupplier(this.messageReaders, this.messageWriters,
 				this.viewResolvers);
 	}
 
-	private static class DefaultConfiguration implements Configuration {
+	private static class DefaultStrategiesSupplier implements StrategiesSupplier {
 
 		private final List<HttpMessageReader<?>> messageReaders;
 
 		private final List<HttpMessageWriter<?>> messageWriters;
 
 		private final List<ViewResolver> viewResolvers;
 
-		public DefaultConfiguration(
+		public DefaultStrategiesSupplier(
 				List<HttpMessageReader<?>> messageReaders,
 				List<HttpMessageWriter<?>> messageWriters,
 				List<ViewResolver> viewResolvers) {

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/Response.java

@@ -67,9 +67,10 @@ public interface Response<T> {
 	 * Writes this response to the given web exchange.
 	 *
 	 * @param exchange the web exchange to write to
+	 * @param strategies the strategies to use when writing
 	 * @return {@code Mono<Void>} to indicate when request handling is complete
 	 */
-	Mono<Void> writeTo(ServerWebExchange exchange, Configuration configuration);
+	Mono<Void> writeTo(ServerWebExchange exchange, StrategiesSupplier strategies);
 
 	// Static builder methods
 
@@ -315,7 +316,7 @@ interface BodyBuilder extends HeadersBuilder<BodyBuilder> {
 		 * @param <T> the type contained in the body
 		 * @return the built response
 		 */
-		<T> Response<T> body(BiFunction<ServerHttpResponse, Configuration, Mono<Void>> writer,
+		<T> Response<T> body(BiFunction<ServerHttpResponse, StrategiesSupplier, Mono<Void>> writer,
 				Supplier<T> supplier);
 
 		/**