Skip to content

Commit c78fd20

Browse files
committed
Explicitly mention DelegatingWebMvcConfiguration in @EnableWebMvc Javadoc
1 parent da04362 commit c78fd20

File tree

1 file changed

+5
-2
lines changed
  • spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
*
6060
* <p>If {@link WebMvcConfigurer} does not expose some advanced setting that
6161
* needs to be configured, consider removing the {@code @EnableWebMvc}
62-
* annotation and extending directly from {@link WebMvcConfigurationSupport}, e.g.:
62+
* annotation and extending directly from {@link WebMvcConfigurationSupport}
63+
* or {@link DelegatingWebMvcConfiguration}, e.g.:
6364
*
6465
* <pre class="code">
6566
* &#064;Configuration
@@ -84,10 +85,12 @@
8485
* @since 3.1
8586
* @see org.springframework.web.servlet.config.annotation.WebMvcConfigurer
8687
* @see org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
88+
* @see org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
89+
* @see org.springframework.web.servlet.config.annotation.DelegatingWebMvcConfiguration
8790
*/
8891
@Retention(RetentionPolicy.RUNTIME)
8992
@Target(ElementType.TYPE)
9093
@Documented
91-
@Import({DelegatingWebMvcConfiguration.class})
94+
@Import(DelegatingWebMvcConfiguration.class)
9295
public @interface EnableWebMvc {
9396
}

0 commit comments

Comments
 (0)