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

Support for multiple default content types

Browse Source 
Enhance FixedContentNegotiationStrategy and places where it is exposed
to also accept a list of media types.

Issue: SPR-15367
This commit is contained in:
Ryan O'Meara
2017-03-21 00:53:26 -04:00
committed by Rossen Stoyanchev
parent 95e78b16f7
commit 4a890226ea
5 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,10 @@
*/
package org.springframework.web.servlet.config.annotation;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
import org.springframework.http.MediaType;
@@ -218,11 +220,18 @@ public class ContentNegotiationConfigurer {
/**
* Set the default content type to use when no content type is requested.
* <p>By default this is not set.
* <p>
* Media types are ordered in the same manner as a "quality" parameter on incoming
* requests. If destinations which do not support any of the media types provided are
* present, end the list with {@link MediaType#ALL} to allow standard media type
* determination
* <p>
* By default this is not set.
*
* @see #defaultContentTypeStrategy
*/
public ContentNegotiationConfigurer defaultContentType(MediaType defaultContentType) {
this.factory.setDefaultContentType(defaultContentType);
public ContentNegotiationConfigurer defaultContentType(MediaType... defaultContentTypes) {
this.factory.setDefaultContentType(Arrays.asList(defaultContentTypes));
return this;
}

11
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 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.
@@ -20,7 +20,6 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.MediaType;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.web.accept.ContentNegotiationManager;
@@ -111,6 +110,14 @@ public class ContentNegotiationConfigurerTests {
assertEquals(Arrays.asList(MediaType.APPLICATION_JSON), manager.resolveMediaTypes(this.webRequest));
}
@Test
public void setMultipleDefaultContentTypes() throws Exception {
this.configurer.defaultContentType(MediaType.APPLICATION_JSON, MediaType.ALL);
ContentNegotiationManager manager = this.configurer.getContentNegotiationManager();
assertEquals(Arrays.asList(MediaType.APPLICATION_JSON, MediaType.ALL), manager.resolveMediaTypes(this.webRequest));
}
@Test
public void setDefaultContentTypeStrategy() throws Exception {