Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wd1105040417
retrofit
提交
4ec77317
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 搜索 >>
提交
4ec77317
编写于
1月 24, 2017
作者:
E
Eric Cochran
提交者:
Jake Wharton
1月 29, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add failOnUnknown to MoshiConverterFactory
上级
e134cfd0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
6 deletion
+40
-6
retrofit-converters/moshi/src/main/java/retrofit2/converter/moshi/MoshiConverterFactory.java
...java/retrofit2/converter/moshi/MoshiConverterFactory.java
+21
-6
retrofit-converters/moshi/src/test/java/retrofit2/converter/moshi/MoshiConverterFactoryTest.java
.../retrofit2/converter/moshi/MoshiConverterFactoryTest.java
+19
-0
未找到文件。
retrofit-converters/moshi/src/main/java/retrofit2/converter/moshi/MoshiConverterFactory.java
浏览文件 @
4ec77317
...
...
@@ -51,27 +51,37 @@ public final class MoshiConverterFactory extends Converter.Factory {
/** Create an instance using {@code moshi} for conversion. */
public
static
MoshiConverterFactory
create
(
Moshi
moshi
)
{
if
(
moshi
==
null
)
throw
new
NullPointerException
(
"moshi == null"
);
return
new
MoshiConverterFactory
(
moshi
,
false
,
false
);
return
new
MoshiConverterFactory
(
moshi
,
false
,
false
,
false
);
}
private
final
Moshi
moshi
;
private
final
boolean
lenient
;
private
final
boolean
failOnUnknown
;
private
final
boolean
serializeNulls
;
private
MoshiConverterFactory
(
Moshi
moshi
,
boolean
lenient
,
boolean
serializeNulls
)
{
private
MoshiConverterFactory
(
Moshi
moshi
,
boolean
lenient
,
boolean
failOnUnknown
,
boolean
serializeNulls
)
{
this
.
moshi
=
moshi
;
this
.
lenient
=
lenient
;
this
.
failOnUnknown
=
failOnUnknown
;
this
.
serializeNulls
=
serializeNulls
;
}
/** Return a new factory which uses {@linkplain JsonAdapter#lenient() lenient} adapters. */
public
MoshiConverterFactory
asLenient
()
{
return
new
MoshiConverterFactory
(
moshi
,
true
,
serializeNulls
);
return
new
MoshiConverterFactory
(
moshi
,
true
,
failOnUnknown
,
serializeNulls
);
}
/**
* Return a new factory which uses {@link JsonAdapter#failOnUnknown()} adapters.
*/
public
MoshiConverterFactory
failOnUnknown
()
{
return
new
MoshiConverterFactory
(
moshi
,
lenient
,
true
,
serializeNulls
);
}
/** Return a new factory which includes null values into the serialized JSON. */
public
MoshiConverterFactory
withNullSerialization
()
{
return
new
MoshiConverterFactory
(
moshi
,
lenient
,
true
);
return
new
MoshiConverterFactory
(
moshi
,
lenient
,
failOnUnknown
,
true
);
}
@Override
...
...
@@ -81,16 +91,21 @@ public final class MoshiConverterFactory extends Converter.Factory {
if
(
lenient
)
{
adapter
=
adapter
.
lenient
();
}
if
(
failOnUnknown
)
{
adapter
=
adapter
.
failOnUnknown
();
}
return
new
MoshiResponseBodyConverter
<>(
adapter
);
}
@Override
public
Converter
<?,
RequestBody
>
requestBodyConverter
(
Type
type
,
@Override
public
Converter
<?,
RequestBody
>
requestBodyConverter
(
Type
type
,
Annotation
[]
parameterAnnotations
,
Annotation
[]
methodAnnotations
,
Retrofit
retrofit
)
{
JsonAdapter
<?>
adapter
=
moshi
.
adapter
(
type
,
jsonAnnotations
(
parameterAnnotations
));
if
(
lenient
)
{
adapter
=
adapter
.
lenient
();
}
if
(
failOnUnknown
)
{
adapter
=
adapter
.
failOnUnknown
();
}
return
new
MoshiRequestBodyConverter
<>(
adapter
,
serializeNulls
);
}
...
...
retrofit-converters/moshi/src/test/java/retrofit2/converter/moshi/MoshiConverterFactoryTest.java
浏览文件 @
4ec77317
...
...
@@ -17,6 +17,7 @@ package retrofit2.converter.moshi;
import
com.squareup.moshi.FromJson
;
import
com.squareup.moshi.JsonAdapter
;
import
com.squareup.moshi.JsonDataException
;
import
com.squareup.moshi.JsonQualifier
;
import
com.squareup.moshi.JsonReader
;
import
com.squareup.moshi.JsonWriter
;
...
...
@@ -120,6 +121,7 @@ public final class MoshiConverterFactoryTest {
private
Service
service
;
private
Service
serviceLenient
;
private
Service
serviceNulls
;
private
Service
serviceFailOnUnknown
;
@Before
public
void
setUp
()
{
Moshi
moshi
=
new
Moshi
.
Builder
()
...
...
@@ -139,6 +141,7 @@ public final class MoshiConverterFactoryTest {
MoshiConverterFactory
factory
=
MoshiConverterFactory
.
create
(
moshi
);
MoshiConverterFactory
factoryLenient
=
factory
.
asLenient
();
MoshiConverterFactory
factoryNulls
=
factory
.
withNullSerialization
();
MoshiConverterFactory
factoryFailOnUnknown
=
factory
.
failOnUnknown
();
Retrofit
retrofit
=
new
Retrofit
.
Builder
()
.
baseUrl
(
server
.
url
(
"/"
))
.
addConverterFactory
(
factory
)
...
...
@@ -151,9 +154,14 @@ public final class MoshiConverterFactoryTest {
.
baseUrl
(
server
.
url
(
"/"
))
.
addConverterFactory
(
factoryNulls
)
.
build
();
Retrofit
retrofitFailOnUnknown
=
new
Retrofit
.
Builder
()
.
baseUrl
(
server
.
url
(
"/"
))
.
addConverterFactory
(
factoryFailOnUnknown
)
.
build
();
service
=
retrofit
.
create
(
Service
.
class
);
serviceLenient
=
retrofitLenient
.
create
(
Service
.
class
);
serviceNulls
=
retrofitNulls
.
create
(
Service
.
class
);
serviceFailOnUnknown
=
retrofitFailOnUnknown
.
create
(
Service
.
class
);
}
@Test
public
void
anInterface
()
throws
IOException
,
InterruptedException
{
...
...
@@ -222,6 +230,17 @@ public final class MoshiConverterFactoryTest {
assertEquals
(
"{\"theName\":null}"
,
server
.
takeRequest
().
getBody
().
readUtf8
());
}
@Test
public
void
failOnUnknown
()
throws
IOException
,
InterruptedException
{
server
.
enqueue
(
new
MockResponse
().
setBody
(
"{\"taco\":\"delicious\"}"
));
Call
<
AnImplementation
>
call
=
serviceFailOnUnknown
.
anImplementation
(
new
AnImplementation
(
null
));
try
{
call
.
execute
();
}
catch
(
JsonDataException
e
)
{
assertThat
(
e
).
hasMessage
(
"Cannot skip unexpected STRING at $.taco"
);
}
}
@Test
public
void
utf8BomSkipped
()
throws
IOException
{
Buffer
responseBody
=
new
Buffer
()
.
write
(
ByteString
.
decodeHex
(
"EFBBBF"
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录