Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
e4c84ec7
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 搜索 >>
提交
e4c84ec7
编写于
11月 09, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Consistent default encoding in DefaultUriBuilderFactory
Issue: SPR-17465
上级
f5da737b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
9 deletion
+14
-9
spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java
...rg/springframework/web/util/DefaultUriBuilderFactory.java
+6
-8
spring-web/src/test/java/org/springframework/web/util/DefaultUriBuilderFactoryTests.java
...ringframework/web/util/DefaultUriBuilderFactoryTests.java
+8
-1
未找到文件。
spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java
浏览文件 @
e4c84ec7
...
...
@@ -228,16 +228,14 @@ public class DefaultUriBuilderFactory implements UriBuilderFactory {
}
private
UriComponentsBuilder
initUriComponentsBuilder
(
String
uriTemplate
)
{
UriComponentsBuilder
result
;
if
(
StringUtils
.
isEmpty
(
uriTemplate
))
{
re
turn
baseUri
!=
null
?
baseUri
.
cloneBuilder
()
:
UriComponentsBuilder
.
newInstance
();
re
sult
=
baseUri
!=
null
?
baseUri
.
cloneBuilder
()
:
UriComponentsBuilder
.
newInstance
();
}
UriComponentsBuilder
result
;
if
(
baseUri
!=
null
)
{
UriComponentsBuilder
uricBuilder
=
UriComponentsBuilder
.
fromUriString
(
uriTemplate
);
UriComponents
uric
=
uricBuilder
.
build
();
result
=
uric
.
getHost
()
==
null
?
baseUri
.
cloneBuilder
().
uriComponents
(
uric
)
:
uricBuilder
;
else
if
(
baseUri
!=
null
)
{
UriComponentsBuilder
builder
=
UriComponentsBuilder
.
fromUriString
(
uriTemplate
);
UriComponents
uri
=
builder
.
build
();
result
=
uri
.
getHost
()
==
null
?
baseUri
.
cloneBuilder
().
uriComponents
(
uri
)
:
builder
;
}
else
{
result
=
UriComponentsBuilder
.
fromUriString
(
uriTemplate
);
...
...
spring-web/src/test/java/org/springframework/web/util/DefaultUriBuilderFactoryTests.java
浏览文件 @
e4c84ec7
...
...
@@ -35,7 +35,14 @@ public class DefaultUriBuilderFactoryTests {
@Test
public
void
defaultSettings
()
{
DefaultUriBuilderFactory
factory
=
new
DefaultUriBuilderFactory
();
URI
uri
=
factory
.
uriString
(
"/foo"
).
pathSegment
(
"{id}"
).
build
(
"a/b"
);
URI
uri
=
factory
.
uriString
(
"/foo/{id}"
).
build
(
"a/b"
);
assertEquals
(
"/foo/a%2Fb"
,
uri
.
toString
());
}
@Test
// SPR-17465
public
void
defaultSettingsWithBuilder
()
{
DefaultUriBuilderFactory
factory
=
new
DefaultUriBuilderFactory
();
URI
uri
=
factory
.
builder
().
path
(
"/foo/{id}"
).
build
(
"a/b"
);
assertEquals
(
"/foo/a%2Fb"
,
uri
.
toString
());
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录