Consistent use of WebFlux terminology over Web Reactive

spring-context/src/main/java/org/springframework/ui/ConcurrentModel.java

 /*
- * 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ui;
 
 import java.util.Collection;
@@ -23,12 +24,13 @@ import org.springframework.core.Conventions;
 import org.springframework.util.Assert;
 
 /**
- * Implementation of {@link Model} based on a {@link ConcurrentHashMap} for use
- * in concurrent scenarios. Exposed to handler methods by Spring Web Reactive
- * typically via a declaration of the {@link Model} interface. There is typically
- * no need to create it within user code. If necessary a controller method can
- * return a regular {@code java.util.Map}, or more likely a
- * {@code java.util.ConcurrentMap}.
+ * Implementation of the {@link Model} interface based on a {@link ConcurrentHashMap}
+ * for use in concurrent scenarios.
+ *
+ * <p>Exposed to handler methods by Spring WebFlux, typically via a declaration of the
+ * {@link Model} interface. There is typically no need to create it within user code.
+ * If necessary a handler method can return a regular {@code java.util.Map},
+ * likely a {@code java.util.ConcurrentMap}, for a pre-determined model.
  *
  * @author Rossen Stoyanchev
  * @since 5.0

spring-context/src/main/java/org/springframework/validation/support/BindingAwareConcurrentModel.java

 /*
- * Copyright 2002-2015 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.
@@ -22,16 +22,16 @@ import org.springframework.ui.ConcurrentModel;
 import org.springframework.validation.BindingResult;
 
 /**
- * Sub-class of {@link ConcurrentModel} that automatically removes
+ * Subclass of {@link ConcurrentModel} that automatically removes
  * the {@link BindingResult} object when its corresponding
  * target attribute is replaced through regular {@link Map} operations.
  *
- * <p>This is the class exposed to controller methods by Spring Web Reactive,
+ * <p>This is the class exposed to handler methods by Spring WebFlux,
  * typically consumed through a declaration of the
- * {@link org.springframework.ui.Model} interface. There is typically
- * no need to create it within user code. If necessary a controller method can
- * return a regular {@code java.util.Map}, or more likely a
- * {@code java.util.ConcurrentMap}.
+ * {@link org.springframework.ui.Model} interface as a parameter type.
+ * There is typically no need to create it within user code.
+ * If necessary a handler method can return a regular {@code java.util.Map},
+ * likely a {@code java.util.ConcurrentMap}, for a pre-determined model.
  *
  * @author Rossen Stoyanchev
  * @since 5.0

spring-webflux/src/main/java/org/springframework/web/reactive/config/EnableWebFlux.java

 /*
- * 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.
@@ -33,7 +33,6 @@ import org.springframework.context.annotation.Import;
  * @EnableWebFlux
  * @ComponentScan(basePackageClasses = MyConfiguration.class)
  * public class MyConfiguration {
- *
  * }
  * </pre>
  *
@@ -55,15 +54,13 @@ import org.springframework.context.annotation.Import;
  * 	   public void configureMessageWriters(List&lt;HttpMessageWriter&lt;?&gt&gt messageWriters) {
  *         messageWriters.add(new MyHttpMessageWriter());
  * 	   }
- *
  * }
  * </pre>
  *
  * <p><strong>Note:</strong> only one {@code @Configuration} class may have the
- * {@code @EnableWebFlux} annotation to import the Spring Web Reactive
- * configuration. There can however be multiple {@code @Configuration} classes
- * implementing {@code WebFluxConfigurer} in order to customize the provided
- * configuration.
+ * {@code @EnableWebFlux} annotation to import the Spring WebFlux configuration.
+ * There can however be multiple {@code @Configuration} classes implementing
+ * {@code WebFluxConfigurer} in order to customize the provided configuration.
  *
  * <p>If {@link WebFluxConfigurer} does not expose some more advanced setting
  * that needs to be configured consider removing the {@code @EnableWebFlux}

spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java

@@ -61,7 +61,7 @@ import org.springframework.web.server.WebExceptionHandler;
 import org.springframework.web.server.handler.ResponseStatusExceptionHandler;
 
 /**
- * The main class for Spring Web Reactive configuration.
+ * The main class for Spring WebFlux configuration.
  *
  * <p>Import directly or extend and override protected methods to customize.
  *
@@ -408,6 +408,7 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
 		}
 	}
 
+
 	private static final class NoOpValidator implements Validator {
 
 		@Override

spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java

 /*
- * 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.web.reactive.config;
 
-import java.util.List;
 import java.util.Optional;
 
 import org.springframework.core.convert.converter.Converter;
@@ -28,11 +27,10 @@ import org.springframework.validation.Validator;
 import org.springframework.web.reactive.accept.CompositeContentTypeResolver;
 import org.springframework.web.reactive.accept.RequestedContentTypeResolver;
 import org.springframework.web.reactive.accept.RequestedContentTypeResolverBuilder;
-import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver;
 import org.springframework.web.reactive.result.method.annotation.ArgumentResolverConfigurer;
 
 /**
- * Defines callback methods to customize the configuration for Web Reactive
+ * Defines callback methods to customize the configuration for WebFlux
  * applications enabled via {@code @EnableWebFlux}.
  *
  * <p>{@code @EnableWebFlux}-annotated configuration classes may implement

spring-webflux/src/main/java/org/springframework/web/reactive/config/package-info.java

 /**
- * Defines Spring Web Reactive configuration.
+ * Spring WebFlux configuration infrastructure.
  */
 package org.springframework.web.reactive.config;

spring-webflux/src/main/java/org/springframework/web/reactive/support/package-info.java

 /**
- * Support classes for Spring Web Reactive.
+ * Support classes for Spring WebFlux setup.
  */
 package org.springframework.web.reactive.support;
\ No newline at end of file