Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
a9e5e9ec
S
spring-framework
项目概览
sesemomo
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
a9e5e9ec
编写于
12月 02, 2015
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
747863d5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
17 deletion
+21
-17
spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
...ork/web/accept/MappingMediaTypeFileExtensionResolver.java
+3
-5
spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java
...eb/accept/MappingMediaTypeFileExtensionResolverTests.java
+6
-2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractVersionStrategy.java
...amework/web/servlet/resource/AbstractVersionStrategy.java
+6
-5
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java
...ework/web/servlet/resource/FixedVersionStrategyTests.java
+6
-5
未找到文件。
spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
浏览文件 @
a9e5e9ec
...
...
@@ -95,13 +95,11 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten
}
/**
* Use this method for a reverse, case-insensitive MediaType lookup.
* @param extension the extension to look up
* @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
)
{
extension
=
extension
.
toLowerCase
(
Locale
.
ENGLISH
);
return
this
.
mediaTypes
.
get
(
extension
);
return
this
.
mediaTypes
.
get
(
extension
.
toLowerCase
(
Locale
.
ENGLISH
));
}
}
spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java
浏览文件 @
a9e5e9ec
...
...
@@ -29,6 +29,7 @@ import static org.junit.Assert.*;
* Test fixture for {@link MappingMediaTypeFileExtensionResolver}.
*
* @author Rossen Stoyanchev
* @author Melissa Hartsock
*/
public
class
MappingMediaTypeFileExtensionResolverTests
{
...
...
@@ -51,8 +52,10 @@ public class MappingMediaTypeFileExtensionResolverTests {
assertTrue
(
extensions
.
isEmpty
());
}
// SPR-13747
/**
* 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
);
...
...
@@ -61,4 +64,5 @@ public class MappingMediaTypeFileExtensionResolverTests {
assertEquals
(
mediaType
,
MediaType
.
APPLICATION_JSON
);
}
}
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractVersionStrategy.java
浏览文件 @
a9e5e9ec
/*
* 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.
...
...
@@ -100,11 +100,12 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
@Override
public
String
addVersion
(
String
path
,
String
version
)
{
if
(
path
.
startsWith
(
"."
))
{
if
(
path
.
startsWith
(
"."
))
{
return
path
;
}
else
{
return
(
this
.
prefix
.
endsWith
(
"/"
)
||
path
.
startsWith
(
"/"
)
?
this
.
prefix
+
path
:
this
.
prefix
+
"/"
+
path
);
return
(
this
.
prefix
.
endsWith
(
"/"
)
||
path
.
startsWith
(
"/"
)
?
this
.
prefix
+
path
:
this
.
prefix
+
"/"
+
path
);
}
}
}
...
...
@@ -123,7 +124,7 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
Matcher
matcher
=
pattern
.
matcher
(
requestPath
);
if
(
matcher
.
find
())
{
String
match
=
matcher
.
group
(
1
);
return
match
.
contains
(
"-"
)
?
match
.
substring
(
match
.
lastIndexOf
(
"-"
)
+
1
)
:
match
;
return
(
match
.
contains
(
"-"
)
?
match
.
substring
(
match
.
lastIndexOf
(
"-"
)
+
1
)
:
match
)
;
}
else
{
return
null
;
...
...
@@ -139,7 +140,7 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
public
String
addVersion
(
String
requestPath
,
String
version
)
{
String
baseFilename
=
StringUtils
.
stripFilenameExtension
(
requestPath
);
String
extension
=
StringUtils
.
getFilenameExtension
(
requestPath
);
return
baseFilename
+
"-"
+
version
+
"."
+
extension
;
return
(
baseFilename
+
"-"
+
version
+
"."
+
extension
)
;
}
}
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java
浏览文件 @
a9e5e9ec
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
...
...
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.web.servlet.resource
;
import
org.junit.Before
;
...
...
@@ -21,7 +22,8 @@ import org.junit.Test;
import
static
org
.
junit
.
Assert
.*;
/**
* Unit tests for {@link org.springframework.web.servlet.resource.FixedVersionStrategy}
* Unit tests for {@link org.springframework.web.servlet.resource.FixedVersionStrategy}.
*
* @author Brian Clozel
*/
public
class
FixedVersionStrategyTests
{
...
...
@@ -60,8 +62,7 @@ public class FixedVersionStrategyTests {
assertEquals
(
this
.
version
+
"/"
+
this
.
path
,
this
.
strategy
.
addVersion
(
"/"
+
this
.
path
,
this
.
version
));
}
// SPR-13727
@Test
@Test
// SPR-13727
public
void
addVersionRelativePath
()
throws
Exception
{
String
relativePath
=
"../"
+
this
.
path
;
assertEquals
(
relativePath
,
this
.
strategy
.
addVersion
(
relativePath
,
this
.
version
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录