Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
14ccb385
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 搜索 >>
提交
14ccb385
编写于
7月 21, 2017
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Handle nested w/o top-level array in Jackson2JsonTokenizer
Issue: SPR-15803
上级
bd0de708
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
4 deletion
+9
-4
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
...rg/springframework/http/codec/json/Jackson2Tokenizer.java
+2
-2
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java
...ringframework/http/codec/json/Jackson2TokenizerTests.java
+7
-2
未找到文件。
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
浏览文件 @
14ccb385
...
@@ -152,8 +152,8 @@ class Jackson2Tokenizer implements Function<DataBuffer, Flux<TokenBuffer>> {
...
@@ -152,8 +152,8 @@ class Jackson2Tokenizer implements Function<DataBuffer, Flux<TokenBuffer>> {
}
}
private
boolean
isTopLevelArrayToken
(
JsonToken
token
)
{
private
boolean
isTopLevelArrayToken
(
JsonToken
token
)
{
return
(
token
==
JsonToken
.
START_ARRAY
&&
this
.
arrayDepth
==
1
)
||
return
this
.
objectDepth
==
0
&&
(
(
token
==
JsonToken
.
START_ARRAY
&&
this
.
arrayDepth
==
1
)
||
(
token
==
JsonToken
.
END_ARRAY
&&
this
.
arrayDepth
==
0
);
(
token
==
JsonToken
.
END_ARRAY
&&
this
.
arrayDepth
==
0
)
)
;
}
}
public
void
endOfInput
()
{
public
void
endOfInput
()
{
...
...
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java
浏览文件 @
14ccb385
...
@@ -57,7 +57,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
...
@@ -57,7 +57,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
}
}
@Test
@Test
public
void
no
TokenizeArrayElements
()
{
public
void
doNot
TokenizeArrayElements
()
{
this
.
tokenizer
=
new
Jackson2Tokenizer
(
this
.
jsonParser
,
false
);
this
.
tokenizer
=
new
Jackson2Tokenizer
(
this
.
jsonParser
,
false
);
testTokenize
(
testTokenize
(
...
@@ -116,7 +116,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
...
@@ -116,7 +116,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
asList
(
"{\"foo\": \"bar\"}"
,
asList
(
"{\"foo\": \"bar\"}"
,
"{\"foo\": \"baz\"}"
));
"{\"foo\": \"baz\"}"
));
// SPR-15803
// SPR-15803
: nested array
testTokenize
(
testTokenize
(
singletonList
(
"["
+
singletonList
(
"["
+
"{\"id\":\"0\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]},"
+
"{\"id\":\"0\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]},"
+
...
@@ -129,6 +129,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
...
@@ -129,6 +129,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
"{\"id\":\"2\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}"
)
"{\"id\":\"2\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}"
)
);
);
// SPR-15803: nested array, no top-level array
testTokenize
(
singletonList
(
"{\"speakerIds\":[\"tastapod\"],\"language\":\"ENGLISH\"}"
),
singletonList
(
"{\"speakerIds\":[\"tastapod\"],\"language\":\"ENGLISH\"}"
));
testTokenize
(
testTokenize
(
asList
(
"[{\"foo\": \"foofoo\", \"bar\""
,
asList
(
"[{\"foo\": \"foofoo\", \"bar\""
,
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"
),
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录