Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Sam Brannen
2021-10-08 21:31:03 +02:00
parent 56eefe2a13 bdfd983bb4
commit 22f0f9f3df
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
* public void addFormatters(FormatterRegistry formatterRegistry) {
* &#064;Override
* public void addFormatters(FormatterRegistry formatterRegistry) {
* formatterRegistry.addConverter(new MyConverter());
* }
* }
*
* &#064;Override
* public void configureMessageConverters(List&lt;HttpMessageConverter&lt;?&gt;&gt; converters) {
* &#064;Override
* 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
* public void addFormatters(FormatterRegistry formatterRegistry) {
* &#064;Override
* public void addFormatters(FormatterRegistry formatterRegistry) {
* formatterRegistry.addConverter(new MyConverter());
* }
* }
*
* &#064;Bean
* public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
* &#064;Bean
* public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
* // Create or delegate to "super" to create and
* // customize properties of RequestMappingHandlerAdapter
* }
* }
* }
* </pre>
*