Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
5095ec40
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(gitcode.net)2024年7月9日维护升级公告
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
5095ec40
编写于
8月 02, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
takeUntilByteCount actually uses takeUntil
Issue: SPR-17188
上级
542ed81d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
12 deletion
+22
-12
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
...a/org/springframework/core/io/buffer/DataBufferUtils.java
+3
-6
spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
.../springframework/core/io/buffer/DataBufferUtilsTests.java
+19
-6
未找到文件。
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
浏览文件 @
5095ec40
...
...
@@ -396,14 +396,11 @@ public abstract class DataBufferUtils {
AtomicLong
countDown
=
new
AtomicLong
(
maxByteCount
);
return
Flux
.
from
(
publisher
)
.
takeWhile
(
buffer
->
{
int
delta
=
-
buffer
.
readableByteCount
();
return
countDown
.
getAndAdd
(
delta
)
>=
0
;
})
.
map
(
buffer
->
{
long
count
=
countDown
.
get
(
);
long
count
=
countDown
.
addAndGet
(-
buffer
.
readableByteCount
()
);
return
count
>=
0
?
buffer
:
buffer
.
slice
(
0
,
buffer
.
readableByteCount
()
+
(
int
)
count
);
});
})
.
takeUntil
(
buffer
->
countDown
.
get
()
<=
0
);
}
/**
...
...
spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
浏览文件 @
5095ec40
...
...
@@ -226,19 +226,32 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
@Test
public
void
takeUntilByteCount
()
{
DataBuffer
foo
=
stringBuffer
(
"foo"
);
DataBuffer
bar
=
stringBuffer
(
"bar"
);
DataBuffer
baz
=
stringBuffer
(
"baz"
);
Flux
<
DataBuffer
>
flux
=
Flux
.
just
(
foo
,
bar
,
baz
);
Flux
<
DataBuffer
>
result
=
DataBufferUtils
.
takeUntilByteCount
(
flux
,
5L
);
Flux
<
DataBuffer
>
result
=
DataBufferUtils
.
takeUntilByteCount
(
Flux
.
just
(
stringBuffer
(
"foo"
),
stringBuffer
(
"bar"
)),
5L
);
StepVerifier
.
create
(
result
)
.
consumeNextWith
(
stringConsumer
(
"foo"
))
.
consumeNextWith
(
stringConsumer
(
"ba"
))
.
expectComplete
()
.
verify
(
Duration
.
ofSeconds
(
5
));
}
@Test
public
void
takeUntilByteCountExact
()
{
DataBuffer
extraBuffer
=
stringBuffer
(
"baz"
);
Flux
<
DataBuffer
>
result
=
DataBufferUtils
.
takeUntilByteCount
(
Flux
.
just
(
stringBuffer
(
"foo"
),
stringBuffer
(
"bar"
),
extraBuffer
),
6L
);
StepVerifier
.
create
(
result
)
.
consumeNextWith
(
stringConsumer
(
"foo"
))
.
consumeNextWith
(
stringConsumer
(
"bar"
))
.
expectComplete
()
.
verify
(
Duration
.
ofSeconds
(
5
));
release
(
baz
);
release
(
extraBuffer
);
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录