Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
5d1787bd
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 搜索 >>
提交
5d1787bd
编写于
4月 08, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid expensive assertions in HttpRange
Closes gh-22742
上级
f328bfc1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
22 deletion
+23
-22
spring-web/src/main/java/org/springframework/http/HttpRange.java
...web/src/main/java/org/springframework/http/HttpRange.java
+23
-22
未找到文件。
spring-web/src/main/java/org/springframework/http/HttpRange.java
浏览文件 @
5d1787bd
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -62,24 +62,11 @@ public abstract class HttpRange {
Assert
.
isTrue
(
resource
.
getClass
()
!=
InputStreamResource
.
class
,
"Cannot convert an InputStreamResource to a ResourceRegion"
);
long
contentLength
=
getLengthFor
(
resource
);
Assert
.
isTrue
(
contentLength
>
0
,
"Resource content length should be > 0"
);
long
start
=
getRangeStart
(
contentLength
);
long
end
=
getRangeEnd
(
contentLength
);
return
new
ResourceRegion
(
resource
,
start
,
end
-
start
+
1
);
}
private
static
long
getLengthFor
(
Resource
resource
)
{
long
contentLength
;
try
{
contentLength
=
resource
.
contentLength
();
Assert
.
isTrue
(
contentLength
>
0
,
"Resource content length should be > 0"
);
}
catch
(
IOException
ex
)
{
throw
new
IllegalArgumentException
(
"Failed to obtain Resource content length"
,
ex
);
}
return
contentLength
;
}
/**
* Return the start of the range given the total length of a representation.
* @param length the length of the representation
...
...
@@ -131,8 +118,8 @@ public abstract class HttpRange {
* <p>This method can be used to parse an {@code Range} header.
* @param ranges the string to parse
* @return the list of ranges
* @throws IllegalArgumentException if the string cannot be parsed
, or if
*
the number of ranges is greater than 100.
* @throws IllegalArgumentException if the string cannot be parsed
*
or if the number of ranges is greater than 100
*/
public
static
List
<
HttpRange
>
parseRanges
(
String
ranges
)
{
if
(!
StringUtils
.
hasLength
(
ranges
))
{
...
...
@@ -144,7 +131,9 @@ public abstract class HttpRange {
ranges
=
ranges
.
substring
(
BYTE_RANGE_PREFIX
.
length
());
String
[]
tokens
=
StringUtils
.
tokenizeToStringArray
(
ranges
,
","
);
Assert
.
isTrue
(
tokens
.
length
<=
MAX_RANGES
,
"Too many ranges "
+
tokens
.
length
);
if
(
tokens
.
length
>
MAX_RANGES
)
{
throw
new
IllegalArgumentException
(
"Too many ranges: "
+
tokens
.
length
);
}
List
<
HttpRange
>
result
=
new
ArrayList
<
HttpRange
>(
tokens
.
length
);
for
(
String
token
:
tokens
)
{
result
.
add
(
parseRange
(
token
));
...
...
@@ -158,7 +147,7 @@ public abstract class HttpRange {
if
(
dashIdx
>
0
)
{
long
firstPos
=
Long
.
parseLong
(
range
.
substring
(
0
,
dashIdx
));
if
(
dashIdx
<
range
.
length
()
-
1
)
{
Long
lastPos
=
Long
.
parseLong
(
range
.
substring
(
dashIdx
+
1
,
range
.
length
()
));
Long
lastPos
=
Long
.
parseLong
(
range
.
substring
(
dashIdx
+
1
));
return
new
ByteRange
(
firstPos
,
lastPos
);
}
else
{
...
...
@@ -180,9 +169,8 @@ public abstract class HttpRange {
* @param ranges the list of ranges
* @param resource the resource to select the regions from
* @return the list of regions for the given resource
* @throws IllegalArgumentException if the sum of all ranges exceeds the resource length
* @since 4.3
* @throws IllegalArgumentException if the sum of all ranges exceeds the
* resource length.
*/
public
static
List
<
ResourceRegion
>
toResourceRegions
(
List
<
HttpRange
>
ranges
,
Resource
resource
)
{
if
(
CollectionUtils
.
isEmpty
(
ranges
))
{
...
...
@@ -198,12 +186,25 @@ public abstract class HttpRange {
for
(
ResourceRegion
region
:
regions
)
{
total
+=
region
.
getCount
();
}
Assert
.
isTrue
(
total
<
length
,
"The sum of all ranges ("
+
total
+
") "
+
"should be less than the resource length ("
+
length
+
")"
);
if
(
total
>=
length
)
{
throw
new
IllegalArgumentException
(
"The sum of all ranges ("
+
total
+
") should be less than the resource length ("
+
length
+
")"
);
}
}
return
regions
;
}
private
static
long
getLengthFor
(
Resource
resource
)
{
try
{
long
contentLength
=
resource
.
contentLength
();
Assert
.
isTrue
(
contentLength
>
0
,
"Resource content length should be > 0"
);
return
contentLength
;
}
catch
(
IOException
ex
)
{
throw
new
IllegalArgumentException
(
"Failed to obtain Resource content length"
,
ex
);
}
}
/**
* Return a string representation of the given list of {@code HttpRange} objects.
* <p>This method can be used to for an {@code Range} header.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录