Consistent use of WebFlux terminology over Web Reactive

spring-webflux/src/main/java/org/springframework/web/reactive/config/EnableWebFlux.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.
@@ -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.
  *
@@ -73,8 +73,8 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
 	static final boolean jackson2Present =
 			ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper",
 					WebFluxConfigurationSupport.class.getClassLoader()) &&
-					ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator",
-							WebFluxConfigurationSupport.class.getClassLoader());
+			ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator",
+					WebFluxConfigurationSupport.class.getClassLoader());
 
 
 	private Map<String, CorsConfiguration> corsConfigurations;
@@ -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

@@ -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.
@@ -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

@@ -1,4 +1,4 @@
 /**
- * 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

@@ -1,4 +1,4 @@
 /**
- * Support classes for Spring Web Reactive.
+ * Support classes for Spring WebFlux setup.
  */
 package org.springframework.web.reactive.support;