Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wd1105040417
retrofit
提交
64cb9064
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,发现更多精彩内容 >>
提交
64cb9064
编写于
2月 09, 2016
作者:
J
Jake Wharton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Throw nice message when resolved URL is malformed.
上级
11e70827
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
40 addition
and
0 deletion
+40
-0
retrofit/src/main/java/retrofit2/RequestBuilder.java
retrofit/src/main/java/retrofit2/RequestBuilder.java
+8
-0
retrofit/src/test/java/retrofit2/RequestBuilderTest.java
retrofit/src/test/java/retrofit2/RequestBuilderTest.java
+32
-0
未找到文件。
retrofit/src/main/java/retrofit2/RequestBuilder.java
浏览文件 @
64cb9064
...
...
@@ -141,6 +141,10 @@ final class RequestBuilder {
if
(
relativeUrl
!=
null
)
{
// Do a one-time combination of the built relative URL and the base URL.
urlBuilder
=
baseUrl
.
newBuilder
(
relativeUrl
);
if
(
urlBuilder
==
null
)
{
throw
new
IllegalArgumentException
(
"Malformed URL. Base: "
+
baseUrl
+
", Relative: "
+
relativeUrl
);
}
relativeUrl
=
null
;
}
...
...
@@ -175,6 +179,10 @@ final class RequestBuilder {
}
else
{
// No query parameters triggered builder creation, just combine the relative URL and base URL.
url
=
baseUrl
.
resolve
(
relativeUrl
);
if
(
url
==
null
)
{
throw
new
IllegalArgumentException
(
"Malformed URL. Base: "
+
baseUrl
+
", Relative: "
+
relativeUrl
);
}
}
RequestBody
body
=
this
.
body
;
...
...
retrofit/src/test/java/retrofit2/RequestBuilderTest.java
浏览文件 @
64cb9064
...
...
@@ -1885,6 +1885,38 @@ public final class RequestBuilderTest {
assertThat
(
request
.
body
().
contentType
().
toString
()).
isEqualTo
(
"text/not-plain"
);
}
@Test
public
void
malformedAnnotationRelativeUrlThrows
()
{
class
Example
{
@GET
(
"ftp://example.org"
)
Call
<
ResponseBody
>
get
()
{
return
null
;
}
}
try
{
buildRequest
(
Example
.
class
);
fail
();
}
catch
(
IllegalArgumentException
e
)
{
assertThat
(
e
).
hasMessage
(
"Malformed URL. Base: http://example.com/, Relative: ftp://example.org"
);
}
}
@Test
public
void
malformedParameterRelativeUrlThrows
()
{
class
Example
{
@GET
Call
<
ResponseBody
>
get
(
@Url
String
relativeUrl
)
{
return
null
;
}
}
try
{
buildRequest
(
Example
.
class
,
"ftp://example.org"
);
fail
();
}
catch
(
IllegalArgumentException
e
)
{
assertThat
(
e
).
hasMessage
(
"Malformed URL. Base: http://example.com/, Relative: ftp://example.org"
);
}
}
private
static
void
assertBody
(
RequestBody
body
,
String
expected
)
{
assertThat
(
body
).
isNotNull
();
Buffer
buffer
=
new
Buffer
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录