Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wd1105040417
retrofit
提交
728cb3b6
R
retrofit
项目概览
wd1105040417
/
retrofit
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
retrofit
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
728cb3b6
编写于
5月 26, 2016
作者:
J
Jake Wharton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Eagerly catch malformed content type headers.
上级
f8521711
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
2 deletion
+44
-2
retrofit/src/main/java/retrofit2/RequestBuilder.java
retrofit/src/main/java/retrofit2/RequestBuilder.java
+5
-1
retrofit/src/main/java/retrofit2/ServiceMethod.java
retrofit/src/main/java/retrofit2/ServiceMethod.java
+5
-1
retrofit/src/test/java/retrofit2/RequestBuilderTest.java
retrofit/src/test/java/retrofit2/RequestBuilderTest.java
+34
-0
未找到文件。
retrofit/src/main/java/retrofit2/RequestBuilder.java
浏览文件 @
728cb3b6
...
...
@@ -75,7 +75,11 @@ final class RequestBuilder {
void
addHeader
(
String
name
,
String
value
)
{
if
(
"Content-Type"
.
equalsIgnoreCase
(
name
))
{
contentType
=
MediaType
.
parse
(
value
);
MediaType
type
=
MediaType
.
parse
(
value
);
if
(
type
==
null
)
{
throw
new
IllegalArgumentException
(
"Malformed content type: "
+
value
);
}
contentType
=
type
;
}
else
{
requestBuilder
.
addHeader
(
name
,
value
);
}
...
...
retrofit/src/main/java/retrofit2/ServiceMethod.java
浏览文件 @
728cb3b6
...
...
@@ -314,7 +314,11 @@ final class ServiceMethod<T> {
String
headerName
=
header
.
substring
(
0
,
colon
);
String
headerValue
=
header
.
substring
(
colon
+
1
).
trim
();
if
(
"Content-Type"
.
equalsIgnoreCase
(
headerName
))
{
contentType
=
MediaType
.
parse
(
headerValue
);
MediaType
type
=
MediaType
.
parse
(
headerValue
);
if
(
type
==
null
)
{
throw
methodError
(
"Malformed content type: %s"
,
headerValue
);
}
contentType
=
type
;
}
else
{
builder
.
add
(
headerName
,
headerValue
);
}
...
...
retrofit/src/test/java/retrofit2/RequestBuilderTest.java
浏览文件 @
728cb3b6
...
...
@@ -2395,6 +2395,24 @@ public final class RequestBuilderTest {
assertThat
(
request
.
body
().
contentType
().
toString
()).
isEqualTo
(
"text/not-plain"
);
}
@Test
public
void
malformedContentTypeHeaderThrows
()
{
class
Example
{
@POST
(
"/"
)
//
@Headers
(
"Content-Type: hello, world!"
)
//
Call
<
ResponseBody
>
method
(
@Body
RequestBody
body
)
{
return
null
;
}
}
RequestBody
body
=
RequestBody
.
create
(
MediaType
.
parse
(
"text/plain"
),
"hi"
);
try
{
buildRequest
(
Example
.
class
,
body
);
fail
();
}
catch
(
IllegalArgumentException
e
)
{
assertThat
(
e
).
hasMessage
(
"Malformed content type: hello, world!\n"
+
" for method Example.method"
);
}
}
@Test
public
void
contentTypeAnnotationHeaderAddsHeaderWithNoBody
()
{
class
Example
{
@DELETE
(
"/"
)
//
...
...
@@ -2419,6 +2437,22 @@ public final class RequestBuilderTest {
assertThat
(
request
.
body
().
contentType
().
toString
()).
isEqualTo
(
"text/not-plain"
);
}
@Test
public
void
malformedContentTypeParameterThrows
()
{
class
Example
{
@POST
(
"/"
)
//
Call
<
ResponseBody
>
method
(
@Header
(
"Content-Type"
)
String
contentType
,
@Body
RequestBody
body
)
{
return
null
;
}
}
RequestBody
body
=
RequestBody
.
create
(
MediaType
.
parse
(
"text/plain"
),
"hi"
);
try
{
buildRequest
(
Example
.
class
,
"hello, world!"
,
body
);
fail
();
}
catch
(
IllegalArgumentException
e
)
{
assertThat
(
e
).
hasMessage
(
"Malformed content type: hello, world!"
);
}
}
@Test
public
void
malformedAnnotationRelativeUrlThrows
()
{
class
Example
{
@GET
(
"ftp://example.org"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录