Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
b4749169
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 搜索 >>
提交
b4749169
编写于
1月 22, 2018
作者:
A
Arjen Poutsma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support array of scalar values in Jackson2Tokenizer
Issue: SPR-16407
上级
9d0e62ef
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
5 deletion
+10
-5
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
...rg/springframework/http/codec/json/Jackson2Tokenizer.java
+4
-3
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java
...ringframework/http/codec/json/Jackson2TokenizerTests.java
+6
-2
未找到文件。
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
浏览文件 @
b4749169
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -173,8 +173,9 @@ class Jackson2Tokenizer {
this
.
tokenBuffer
.
copyCurrentEvent
(
this
.
parser
);
}
if
((
token
==
JsonToken
.
END_OBJECT
&&
this
.
objectDepth
==
0
&&
(
this
.
arrayDepth
==
1
||
this
.
arrayDepth
==
0
))
||
(
token
.
isScalarValue
())
&&
this
.
objectDepth
==
0
&&
this
.
arrayDepth
==
0
)
{
if
(
this
.
objectDepth
==
0
&&
(
this
.
arrayDepth
==
0
||
this
.
arrayDepth
==
1
)
&&
(
token
==
JsonToken
.
END_OBJECT
||
token
.
isScalarValue
()))
{
result
.
add
(
this
.
tokenBuffer
);
this
.
tokenBuffer
=
new
TokenBuffer
(
this
.
parser
);
}
...
...
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java
浏览文件 @
b4749169
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -168,6 +168,10 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
testTokenize
(
asList
(
"12."
,
"34"
)
,
singletonList
(
"12.34"
),
true
);
// SPR-16407
testTokenize
(
asList
(
"[1"
,
",2,"
,
"3]"
),
asList
(
"1"
,
"2"
,
"3"
),
true
);
}
private
void
testTokenize
(
List
<
String
>
source
,
List
<
String
>
expected
,
boolean
tokenizeArrayElements
)
{
...
...
@@ -175,7 +179,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
.
map
(
this
::
stringBuffer
);
Flux
<
TokenBuffer
>
tokenBufferFlux
=
Jackson2Tokenizer
.
tokenize
(
sourceFlux
,
jsonFactory
,
tokenizeArrayElements
);
Jackson2Tokenizer
.
tokenize
(
sourceFlux
,
this
.
jsonFactory
,
tokenizeArrayElements
);
Flux
<
String
>
result
=
tokenBufferFlux
.
map
(
tokenBuffer
->
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录