Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wd1105040417
retrofit
提交
4d8fab28
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,发现更多精彩内容 >>
提交
4d8fab28
编写于
10月 03, 2012
作者:
J
Jake Wharton
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #59 from square/ray/spaces-in-path-params
Allows spaces to appear in path parameters.
上级
59a7f867
1fa4bca9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
3 deletion
+28
-3
http/src/main/java/retrofit/http/HttpRequestBuilder.java
http/src/main/java/retrofit/http/HttpRequestBuilder.java
+10
-2
http/src/test/java/retrofit/http/HttpRequestBuilderTest.java
http/src/test/java/retrofit/http/HttpRequestBuilderTest.java
+18
-1
未找到文件。
http/src/main/java/retrofit/http/HttpRequestBuilder.java
浏览文件 @
4d8fab28
package
retrofit.http
;
import
com.google.gson.Gson
;
import
javax.inject.Named
;
import
org.apache.http.NameValuePair
;
import
org.apache.http.client.methods.HttpUriRequest
;
import
org.apache.http.message.BasicNameValuePair
;
import
retrofit.io.MimeType
;
import
retrofit.io.TypedBytes
;
import
javax.inject.Named
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.io.UnsupportedEncodingException
;
import
java.lang.annotation.Annotation
;
import
java.lang.reflect.Method
;
import
java.net.URISyntaxException
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.List
;
...
...
@@ -181,7 +183,13 @@ final class HttpRequestBuilder {
}
}
if
(
found
!=
null
)
{
replacedPath
=
doReplace
(
replacedPath
,
found
.
getName
(),
found
.
getValue
());
String
value
;
try
{
value
=
URLEncoder
.
encode
(
found
.
getValue
(),
"UTF-8"
);
}
catch
(
UnsupportedEncodingException
e
)
{
throw
new
AssertionError
(
e
);
}
replacedPath
=
doReplace
(
replacedPath
,
found
.
getName
(),
value
);
paramList
.
remove
(
found
);
}
else
{
throw
new
IllegalArgumentException
(
...
...
http/src/test/java/retrofit/http/HttpRequestBuilderTest.java
浏览文件 @
4d8fab28
...
...
@@ -12,6 +12,7 @@ import javax.inject.Named;
import
java.io.ByteArrayOutputStream
;
import
java.lang.reflect.Method
;
import
java.net.URISyntaxException
;
import
java.net.URLEncoder
;
import
java.util.Set
;
import
java.util.UUID
;
...
...
@@ -26,7 +27,7 @@ public class HttpRequestBuilderTest {
}
};
public
void
testRegex
()
throws
Exception
{
@Test
public
void
testRegex
()
throws
Exception
{
expectParams
(
""
);
expectParams
(
"foo"
);
expectParams
(
"foo/bar"
);
...
...
@@ -77,6 +78,22 @@ public class HttpRequestBuilderTest {
assertThat
(
uri
).
isEqualTo
(
API_URL
+
"/foo/"
+
expectedId
+
"/bar?category="
+
category
);
}
@Test
public
void
testGetWithPathParamAndWhitespaceValue
()
throws
Exception
{
Method
method
=
MyService
.
class
.
getMethod
(
"getWithPathParam"
,
String
.
class
,
String
.
class
,
Callback
.
class
);
String
expectedId
=
"I have spaces buddy"
;
String
category
=
UUID
.
randomUUID
().
toString
();
Object
[]
args
=
new
Object
[]
{
expectedId
,
category
,
new
MyCallback
()};
HttpUriRequest
request
=
build
(
method
,
args
);
assertThat
(
request
).
isInstanceOf
(
HttpGet
.
class
);
HttpGet
put
=
(
HttpGet
)
request
;
// Make sure the url param got translated.
final
String
uri
=
put
.
getURI
().
toString
();
assertThat
(
uri
).
isEqualTo
(
API_URL
+
"/foo/"
+
URLEncoder
.
encode
(
expectedId
,
"UTF-8"
)
+
"/bar?category="
+
category
);
}
@Test
public
void
testSingleEntityWithPathParams
()
throws
Exception
{
Method
method
=
MyService
.
class
.
getMethod
(
"singleEntityPut"
,
MyJsonObj
.
class
,
String
.
class
,
Callback
.
class
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录