diff --git a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java index e5cfb97ef1..b035b079ac 100644 --- a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java @@ -40,29 +40,34 @@ import org.springframework.web.context.ServletContextAware; * * * - * - * - * + * + * + * + * + * + * + * + * * * * - * - * + * + * * * * - * - * + * + * * * * - * - * + * + * * * * * - * + * * *
{@link #setFavorPathExtension favorPathExtension}{@link PathExtensionContentNegotiationStrategy}YesProperty SetterUnderlying StrategyDefault Setting
{@link #setFavorPathExtension}{@link PathExtensionContentNegotiationStrategy Path Extension strategy}On
{@link #setFavorParameter favorParameter}{@link ParameterContentNegotiationStrategy}-{@link ParameterContentNegotiationStrategy Parameter strategy}Off
{@link #setIgnoreAcceptHeader ignoreAcceptHeader}{@link HeaderContentNegotiationStrategy}Yes{@link HeaderContentNegotiationStrategy Header strategy}On
{@link #setDefaultContentType defaultContentType}{@link FixedContentNegotiationStrategy}-{@link FixedContentNegotiationStrategy Fixed content strategy}Not set
{@link #setDefaultContentTypeStrategy defaultContentTypeStrategy}{@link ContentNegotiationStrategy}-Not set
* @@ -226,6 +231,7 @@ public class ContentNegotiationManagerFactoryBean /** * Set a custom {@link ContentNegotiationStrategy} to use to determine * the content type to use when no content type is requested. + *

By default this is not set. * @see #setDefaultContentType * @since 4.1.2 */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java index 1c6b911af8..c22dda7312 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java @@ -36,29 +36,34 @@ import org.springframework.web.accept.PathExtensionContentNegotiationStrategy; * * * + * + * + * + * + * * - * - * + * + * * * * - * - * + * + * * * * - * - * + * + * * * * - * - * + * + * * * * * - * + * * *
Configurer PropertyUnderlying StrategyDefault Setting
{@link #favorPathExtension}{@link PathExtensionContentNegotiationStrategy}Yes{@link PathExtensionContentNegotiationStrategy Path Extension strategy}On
{@link #favorParameter}{@link ParameterContentNegotiationStrategy}-{@link ParameterContentNegotiationStrategy Parameter strategy}Off
{@link #ignoreAcceptHeader}{@link HeaderContentNegotiationStrategy}Yes{@link HeaderContentNegotiationStrategy Header strategy}On
{@link #defaultContentType}{@link FixedContentNegotiationStrategy}-{@link FixedContentNegotiationStrategy Fixed content strategy}Not set
{@link #defaultContentTypeStrategy}{@link ContentNegotiationStrategy}-Not set
* @@ -215,6 +220,7 @@ public class ContentNegotiationConfigurer { /** * Set a custom {@link ContentNegotiationStrategy} to use to determine * the content type to use when no content type is requested. + *

By default this is not set. * @see #defaultContentType * @since 4.1.2 */