Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
6f11d4f0
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 搜索 >>
提交
6f11d4f0
编写于
12月 02, 2015
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Backported fix for lower-case media type lookups
Issue: SPR-13747
上级
f53d01b0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
28 deletion
+43
-28
spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
...ork/web/accept/MappingMediaTypeFileExtensionResolver.java
+28
-27
spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java
...eb/accept/MappingMediaTypeFileExtensionResolverTests.java
+15
-1
未找到文件。
spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
浏览文件 @
6f11d4f0
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -31,24 +31,28 @@ import org.springframework.util.LinkedMultiValueMap;
import
org.springframework.util.MultiValueMap
;
/**
* An implementation of {@link MediaTypeFileExtensionResolver} that maintains a lookup
* from extension to MediaType.
* An implementation of {@code MediaTypeFileExtensionResolver} that maintains
* lookups between file extensions and MediaTypes in both directions.
*
* <p>Initially created with a map of file extensions and media types.
* Subsequently sub-classes can use {@link #addMapping} to add more mappings.
*
* @author Rossen Stoyanchev
* @since 3.2
*/
public
class
MappingMediaTypeFileExtensionResolver
implements
MediaTypeFileExtensionResolver
{
private
final
ConcurrentMap
<
String
,
MediaType
>
mediaTypes
=
new
ConcurrentHashMap
<
String
,
MediaType
>(
64
);
private
final
ConcurrentMap
<
String
,
MediaType
>
mediaTypes
=
new
ConcurrentHashMap
<
String
,
MediaType
>(
64
);
private
final
MultiValueMap
<
MediaType
,
String
>
fileExtensions
=
new
LinkedMultiValueMap
<
MediaType
,
String
>();
private
final
MultiValueMap
<
MediaType
,
String
>
fileExtensions
=
new
LinkedMultiValueMap
<
MediaType
,
String
>();
private
final
List
<
String
>
allFileExtensions
=
new
LinkedList
<
String
>();
/**
* Create an instance with the given mappings between extensions and media types.
* @throws IllegalArgumentException if a media type string cannot be parsed
* Create an instance with the given map of file extensions and media types.
*/
public
MappingMediaTypeFileExtensionResolver
(
Map
<
String
,
MediaType
>
mediaTypes
)
{
if
(
mediaTypes
!=
null
)
{
...
...
@@ -61,10 +65,22 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten
}
protected
List
<
MediaType
>
getAllMediaTypes
()
{
return
new
ArrayList
<
MediaType
>(
this
.
mediaTypes
.
values
());
}
/**
* Find the file extensions mapped to the given MediaType.
* @return 0 or more extensions, never {@code null}
* Map an extension to a MediaType. Ignore if extension already mapped.
*/
protected
void
addMapping
(
String
extension
,
MediaType
mediaType
)
{
MediaType
previous
=
this
.
mediaTypes
.
putIfAbsent
(
extension
,
mediaType
);
if
(
previous
==
null
)
{
this
.
fileExtensions
.
add
(
mediaType
,
extension
);
this
.
allFileExtensions
.
add
(
extension
);
}
}
@Override
public
List
<
String
>
resolveFileExtensions
(
MediaType
mediaType
)
{
List
<
String
>
fileExtensions
=
this
.
fileExtensions
.
get
(
mediaType
);
...
...
@@ -76,27 +92,12 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten
return
Collections
.
unmodifiableList
(
this
.
allFileExtensions
);
}
protected
List
<
MediaType
>
getAllMediaTypes
()
{
return
new
ArrayList
<
MediaType
>(
this
.
mediaTypes
.
values
());
}
/**
*
Return the MediaType mapped to the given extension
.
* @return a MediaType for the key
or {@code null}
*
Use this method for a reverse lookup from extension to MediaType
.
* @return a MediaType for the key
, or {@code null} if none found
*/
protected
MediaType
lookupMediaType
(
String
extension
)
{
return
this
.
mediaTypes
.
get
(
extension
);
}
/**
* Map a MediaType to an extension or ignore if the extensions is already mapped.
*/
protected
void
addMapping
(
String
extension
,
MediaType
mediaType
)
{
MediaType
previous
=
this
.
mediaTypes
.
putIfAbsent
(
extension
,
mediaType
);
if
(
previous
==
null
)
{
this
.
fileExtensions
.
add
(
mediaType
,
extension
);
this
.
allFileExtensions
.
add
(
extension
);
}
return
this
.
mediaTypes
.
get
(
extension
.
toLowerCase
(
Locale
.
ENGLISH
));
}
}
spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java
浏览文件 @
6f11d4f0
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -29,6 +29,7 @@ import static org.junit.Assert.*;
* Test fixture for {@link MappingMediaTypeFileExtensionResolver}.
*
* @author Rossen Stoyanchev
* @author Melissa Hartsock
*/
public
class
MappingMediaTypeFileExtensionResolverTests
{
...
...
@@ -51,4 +52,17 @@ public class MappingMediaTypeFileExtensionResolverTests {
assertTrue
(
extensions
.
isEmpty
());
}
/**
* Unit test for SPR-13747 - ensures that reverse lookup of media type from media
* type key is case-insensitive.
*/
@Test
public
void
lookupMediaTypeCaseInsensitive
()
{
Map
<
String
,
MediaType
>
mapping
=
Collections
.
singletonMap
(
"json"
,
MediaType
.
APPLICATION_JSON
);
MappingMediaTypeFileExtensionResolver
resolver
=
new
MappingMediaTypeFileExtensionResolver
(
mapping
);
MediaType
mediaType
=
resolver
.
lookupMediaType
(
"JSON"
);
assertEquals
(
mediaType
,
MediaType
.
APPLICATION_JSON
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录