Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
f9633674
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f9633674
编写于
4月 11, 2017
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1362 from romeara/SPR-15367
上级
95e78b16
49ac6d54
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
124 addition
and
30 deletion
+124
-30
spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
...work/web/accept/ContentNegotiationManagerFactoryBean.java
+10
-0
spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java
...framework/web/accept/FixedContentNegotiationStrategy.java
+27
-6
spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java
...web/accept/ContentNegotiationManagerFactoryBeanTests.java
+17
-5
spring-webflux/src/main/java/org/springframework/web/reactive/accept/FixedContentTypeResolver.java
...amework/web/reactive/accept/FixedContentTypeResolver.java
+33
-5
spring-webflux/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilder.java
.../reactive/accept/RequestedContentTypeResolverBuilder.java
+10
-3
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
...rvlet/config/annotation/ContentNegotiationConfigurer.java
+11
-3
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurerTests.java
.../config/annotation/ContentNegotiationConfigurerTests.java
+16
-8
未找到文件。
spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
浏览文件 @
f9633674
...
...
@@ -237,6 +237,16 @@ public class ContentNegotiationManagerFactoryBean
this
.
defaultNegotiationStrategy
=
new
FixedContentNegotiationStrategy
(
contentType
);
}
/**
* Set the default content types to use when no content type is requested.
* <p>By default this is not set.
* @see #setDefaultContentTypeStrategy
* @since 5.0
*/
public
void
setDefaultContentTypes
(
List
<
MediaType
>
contentTypes
)
{
this
.
defaultNegotiationStrategy
=
new
FixedContentNegotiationStrategy
(
contentTypes
);
}
/**
* Set a custom {@link ContentNegotiationStrategy} to use to determine
* the content type to use when no content type is requested.
...
...
spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java
浏览文件 @
f9633674
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.http.MediaType
;
import
org.springframework.util.Assert
;
import
org.springframework.web.context.request.NativeWebRequest
;
/**
...
...
@@ -35,23 +36,43 @@ public class FixedContentNegotiationStrategy implements ContentNegotiationStrate
private
static
final
Log
logger
=
LogFactory
.
getLog
(
FixedContentNegotiationStrategy
.
class
);
private
final
List
<
MediaType
>
contentType
;
private
final
List
<
MediaType
>
contentType
s
;
/**
* C
reate an instance with the given content type
.
* C
onstructor with a single default {@code MediaType}
.
*/
public
FixedContentNegotiationStrategy
(
MediaType
contentType
)
{
this
.
contentType
=
Collections
.
singletonList
(
contentType
);
this
(
Collections
.
singletonList
(
contentType
));
}
/**
* Constructor with an ordered List of default {@code MediaType}'s to return
* for use in applications that support a variety of content types.
* <p>Consider appending {@link MediaType#ALL} at the end if destinations
* are present which do not support any of the other default media types.
* @since 5.0
*/
public
FixedContentNegotiationStrategy
(
List
<
MediaType
>
contentTypes
)
{
Assert
.
notNull
(
contentTypes
,
"'contentTypes' must not be null"
);
this
.
contentTypes
=
Collections
.
unmodifiableList
(
contentTypes
);
}
/**
* Return the configured list of media types.
*/
public
List
<
MediaType
>
getContentTypes
()
{
return
this
.
contentTypes
;
}
@Override
public
List
<
MediaType
>
resolveMediaTypes
(
NativeWebRequest
request
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"Requested media types: "
+
this
.
contentType
);
logger
.
debug
(
"Requested media types: "
+
this
.
contentType
s
);
}
return
this
.
contentType
;
return
this
.
contentType
s
;
}
}
spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java
浏览文件 @
f9633674
...
...
@@ -16,13 +16,14 @@
package
org.springframework.web.accept
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.springframework.http.MediaType
;
import
org.springframework.mock.web.test.MockHttpServletRequest
;
import
org.springframework.mock.web.test.MockServletContext
;
...
...
@@ -168,13 +169,24 @@ public class ContentNegotiationManagerFactoryBeanTests {
this
.
factoryBean
.
afterPropertiesSet
();
ContentNegotiationManager
manager
=
this
.
factoryBean
.
getObject
();
assertEquals
(
Collections
.
singletonList
(
MediaType
.
APPLICATION_JSON
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
assertEquals
(
MediaType
.
APPLICATION_JSON
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
// SPR-10513
this
.
servletRequest
.
addHeader
(
"Accept"
,
MediaType
.
ALL_VALUE
);
assertEquals
(
Collections
.
singletonList
(
MediaType
.
APPLICATION_JSON
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
assertEquals
(
MediaType
.
APPLICATION_JSON
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
}
@Test
// SPR-15367
public
void
setDefaultContentTypes
()
throws
Exception
{
List
<
MediaType
>
mediaTypes
=
Arrays
.
asList
(
MediaType
.
APPLICATION_JSON
,
MediaType
.
ALL
);
this
.
factoryBean
.
setDefaultContentTypes
(
mediaTypes
);
this
.
factoryBean
.
afterPropertiesSet
();
ContentNegotiationManager
manager
=
this
.
factoryBean
.
getObject
();
assertEquals
(
mediaTypes
,
manager
.
resolveMediaTypes
(
this
.
webRequest
));
this
.
servletRequest
.
addHeader
(
"Accept"
,
MediaType
.
ALL_VALUE
);
assertEquals
(
mediaTypes
,
manager
.
resolveMediaTypes
(
this
.
webRequest
));
}
@Test
// SPR-12286
...
...
spring-webflux/src/main/java/org/springframework/web/reactive/accept/FixedContentTypeResolver.java
浏览文件 @
f9633674
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -19,30 +19,58 @@ package org.springframework.web.reactive.accept;
import
java.util.Collections
;
import
java.util.List
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.server.ServerWebExchange
;
/**
*
A {@link RequestedContentTypeResolver} that resolves to
a fixed list of media types.
*
{@code RequestedContentTypeResolver} with
a fixed list of media types.
*
* @author Rossen Stoyanchev
* @since 5.0
*/
public
class
FixedContentTypeResolver
implements
RequestedContentTypeResolver
{
private
static
final
Log
logger
=
LogFactory
.
getLog
(
FixedContentTypeResolver
.
class
);
private
final
List
<
MediaType
>
mediaTypes
;
/**
* Create an instance with the given content type.
* Constructor with a single default {@code MediaType}.
*/
public
FixedContentTypeResolver
(
MediaType
mediaType
)
{
this
(
Collections
.
singletonList
(
mediaType
));
}
/**
* Constructor with an ordered List of default {@code MediaType}'s to return
* for use in applications that support a variety of content types.
* <p>Consider appending {@link MediaType#ALL} at the end if destinations
* are present which do not support any of the other default media types.
*/
public
FixedContentTypeResolver
(
List
<
MediaType
>
mediaTypes
)
{
this
.
mediaTypes
=
Collections
.
unmodifiableList
(
mediaTypes
);
}
/**
* Return the configured list of media types.
*/
public
FixedContentTypeResolver
(
MediaType
mediaTypes
)
{
this
.
mediaTypes
=
Collections
.
singletonList
(
mediaTypes
)
;
public
List
<
MediaType
>
getContentTypes
(
)
{
return
this
.
mediaTypes
;
}
@Override
public
List
<
MediaType
>
resolveMediaTypes
(
ServerWebExchange
exchange
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"Requested media types: "
+
this
.
mediaTypes
);
}
return
this
.
mediaTypes
;
}
...
...
spring-webflux/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilder.java
浏览文件 @
f9633674
...
...
@@ -16,6 +16,7 @@
package
org.springframework.web.reactive.accept
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Locale
;
...
...
@@ -198,12 +199,18 @@ public class RequestedContentTypeResolverBuilder {
}
/**
* Set the default content type to use when no content type is requested.
* Set the default content type(s) to use when no content type is requested
* in order of priority.
*
* <p>If destinations are present that do not support any of the given media
* types, consider appending {@link MediaType#ALL} at the end.
*
* <p>By default this is not set.
*
* @see #defaultContentTypeResolver
*/
public
RequestedContentTypeResolverBuilder
defaultContentType
(
MediaType
contentType
)
{
this
.
contentTypeResolver
=
new
FixedContentTypeResolver
(
contentType
);
public
RequestedContentTypeResolverBuilder
defaultContentType
(
MediaType
...
contentTypes
)
{
this
.
contentTypeResolver
=
new
FixedContentTypeResolver
(
Arrays
.
asList
(
contentTypes
)
);
return
this
;
}
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
浏览文件 @
f9633674
...
...
@@ -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
;
...
...
@@ -217,12 +219,18 @@ public class ContentNegotiationConfigurer {
}
/**
* Set the default content type to use when no content type is requested.
* Set the default content type(s) to use when no content type is requested
* in order of priority.
*
* <p>If destinations are present that do not support any of the given media
* types, consider appending {@link MediaType#ALL} at the end.
*
* <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
s
(
Arrays
.
asList
(
defaultContentTypes
)
);
return
this
;
}
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurerTests.java
浏览文件 @
f9633674
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -28,7 +28,7 @@ import org.springframework.web.accept.FixedContentNegotiationStrategy;
import
org.springframework.web.context.request.NativeWebRequest
;
import
org.springframework.web.context.request.ServletWebRequest
;
import
static
org
.
junit
.
Assert
.
*
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
/**
* Test fixture for {@link ContentNegotiationConfigurer} tests.
...
...
@@ -56,7 +56,7 @@ public class ContentNegotiationConfigurerTests {
this
.
servletRequest
.
setRequestURI
(
"/flower.gif"
);
assertEquals
(
"Should be able to resolve file extensions by default"
,
Arrays
.
asList
(
MediaType
.
IMAGE_GIF
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
MediaType
.
IMAGE_GIF
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
this
.
servletRequest
.
setRequestURI
(
"/flower?format=gif"
);
this
.
servletRequest
.
addParameter
(
"format"
,
"gif"
);
...
...
@@ -68,7 +68,7 @@ public class ContentNegotiationConfigurerTests {
this
.
servletRequest
.
addHeader
(
"Accept"
,
MediaType
.
IMAGE_GIF_VALUE
);
assertEquals
(
"Should resolve Accept header by default"
,
Arrays
.
asList
(
MediaType
.
IMAGE_GIF
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
MediaType
.
IMAGE_GIF
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
}
@Test
...
...
@@ -77,7 +77,7 @@ public class ContentNegotiationConfigurerTests {
ContentNegotiationManager
manager
=
this
.
configurer
.
getContentNegotiationManager
();
this
.
servletRequest
.
setRequestURI
(
"/flower.json"
);
assertEquals
(
Arrays
.
asList
(
MediaType
.
APPLICATION_JSON
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
assertEquals
(
MediaType
.
APPLICATION_JSON
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
}
@Test
...
...
@@ -90,7 +90,7 @@ public class ContentNegotiationConfigurerTests {
this
.
servletRequest
.
setRequestURI
(
"/flower"
);
this
.
servletRequest
.
addParameter
(
"f"
,
"json"
);
assertEquals
(
Arrays
.
asList
(
MediaType
.
APPLICATION_JSON
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
assertEquals
(
MediaType
.
APPLICATION_JSON
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
}
@Test
...
...
@@ -109,7 +109,15 @@ public class ContentNegotiationConfigurerTests {
this
.
configurer
.
defaultContentType
(
MediaType
.
APPLICATION_JSON
);
ContentNegotiationManager
manager
=
this
.
configurer
.
getContentNegotiationManager
();
assertEquals
(
Arrays
.
asList
(
MediaType
.
APPLICATION_JSON
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
assertEquals
(
MediaType
.
APPLICATION_JSON
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
}
@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
...
...
@@ -117,6 +125,6 @@ public class ContentNegotiationConfigurerTests {
this
.
configurer
.
defaultContentTypeStrategy
(
new
FixedContentNegotiationStrategy
(
MediaType
.
APPLICATION_JSON
));
ContentNegotiationManager
manager
=
this
.
configurer
.
getContentNegotiationManager
();
assertEquals
(
Arrays
.
asList
(
MediaType
.
APPLICATION_JSON
),
manager
.
resolveMediaTypes
(
this
.
webRequest
));
assertEquals
(
MediaType
.
APPLICATION_JSON
,
manager
.
resolveMediaTypes
(
this
.
webRequest
).
get
(
0
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录