Merge branch '5.3.x'

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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;
  * @EnableWebMvc
  * @ComponentScan(basePackageClasses = MyConfiguration.class)
  * public class MyConfiguration {
- *
  * }
  * </pre>
  *
@@ -46,15 +45,15 @@ import org.springframework.context.annotation.Import;
  * &#064;ComponentScan(basePackageClasses = MyConfiguration.class)
  * public class MyConfiguration implements WebMvcConfigurer {
  *
- * 	   &#064;Override
+ *     &#064;Override
- * 	   public void addFormatters(FormatterRegistry formatterRegistry) {
+ *     public void addFormatters(FormatterRegistry formatterRegistry) {
  *         formatterRegistry.addConverter(new MyConverter());
- * 	   }
+ *     }
  *
- * 	   &#064;Override
+ *     &#064;Override
- * 	   public void configureMessageConverters(List&lt;HttpMessageConverter&lt;?&gt;&gt; converters) {
+ *     public void configureMessageConverters(List&lt;HttpMessageConverter&lt;?&gt;&gt; converters) {
  *         converters.add(new MyHttpMessageConverter());
- * 	   }
+ *     }
  *
  * }
  * </pre>
@@ -66,7 +65,7 @@ import org.springframework.context.annotation.Import;
  * configuration.
  *
  * <p>If {@link WebMvcConfigurer} does not expose some more advanced setting that
- * needs to be configured consider removing the {@code @EnableWebMvc}
+ * needs to be configured, consider removing the {@code @EnableWebMvc}
  * annotation and extending directly from {@link WebMvcConfigurationSupport}
  * or {@link DelegatingWebMvcConfiguration}, e.g.:
  *
@@ -75,16 +74,16 @@ import org.springframework.context.annotation.Import;
  * &#064;ComponentScan(basePackageClasses = { MyConfiguration.class })
  * public class MyConfiguration extends WebMvcConfigurationSupport {
  *
- * 	   &#064;Override
+ *     &#064;Override
- *	   public void addFormatters(FormatterRegistry formatterRegistry) {
+ *     public void addFormatters(FormatterRegistry formatterRegistry) {
  *         formatterRegistry.addConverter(new MyConverter());
- *	   }
+ *     }
  *
- *	   &#064;Bean
+ *     &#064;Bean
- *	   public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
+ *     public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
  *         // Create or delegate to "super" to create and
  *         // customize properties of RequestMappingHandlerAdapter
- *	   }
+ *     }
  * }
  * </pre>
  *