Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
61db8e9f
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,发现更多精彩内容 >>
提交
61db8e9f
编写于
7月 08, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
DigestUtils processes InputStream with buffered read instead of full copy
Issue: SPR-14427
上级
2bf9bc31
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
15 deletion
+38
-15
spring-core/src/main/java/org/springframework/util/DigestUtils.java
...e/src/main/java/org/springframework/util/DigestUtils.java
+13
-8
spring-core/src/test/java/org/springframework/util/DigestUtilsTests.java
.../test/java/org/springframework/util/DigestUtilsTests.java
+25
-7
未找到文件。
spring-core/src/main/java/org/springframework/util/DigestUtils.java
浏览文件 @
61db8e9f
...
@@ -23,11 +23,13 @@ import java.security.NoSuchAlgorithmException;
...
@@ -23,11 +23,13 @@ import java.security.NoSuchAlgorithmException;
/**
/**
* Miscellaneous methods for calculating digests.
* Miscellaneous methods for calculating digests.
*
* <p>Mainly for internal use within the framework; consider
* <p>Mainly for internal use within the framework; consider
* <a href="http://commons.apache.org/codec/">Apache Commons Codec</a>
* <a href="http://commons.apache.org/codec/">Apache Commons Codec</a>
* for a more comprehensive suite of digest utilities.
* for a more comprehensive suite of digest utilities.
*
*
* @author Arjen Poutsma
* @author Arjen Poutsma
* @author Juergen Hoeller
* @author Craig Andrews
* @author Craig Andrews
* @since 3.0
* @since 3.0
*/
*/
...
@@ -49,8 +51,8 @@ public abstract class DigestUtils {
...
@@ -49,8 +51,8 @@ public abstract class DigestUtils {
}
}
/**
/**
* Calculate the MD5 digest of the given
InputS
tream.
* Calculate the MD5 digest of the given
s
tream.
* @param inputStream the
i
nputStream to calculate the digest over
* @param inputStream the
I
nputStream to calculate the digest over
* @return the digest
* @return the digest
* @since 4.2
* @since 4.2
*/
*/
...
@@ -59,8 +61,7 @@ public abstract class DigestUtils {
...
@@ -59,8 +61,7 @@ public abstract class DigestUtils {
}
}
/**
/**
* Return a hexadecimal string representation of the MD5 digest of the given
* Return a hexadecimal string representation of the MD5 digest of the given bytes.
* bytes.
* @param bytes the bytes to calculate the digest over
* @param bytes the bytes to calculate the digest over
* @return a hexadecimal digest string
* @return a hexadecimal digest string
*/
*/
...
@@ -69,9 +70,8 @@ public abstract class DigestUtils {
...
@@ -69,9 +70,8 @@ public abstract class DigestUtils {
}
}
/**
/**
* Return a hexadecimal string representation of the MD5 digest of the given
* Return a hexadecimal string representation of the MD5 digest of the given stream.
* inputStream.
* @param inputStream the InputStream to calculate the digest over
* @param inputStream the inputStream to calculate the digest over
* @return a hexadecimal digest string
* @return a hexadecimal digest string
* @since 4.2
* @since 4.2
*/
*/
...
@@ -127,7 +127,12 @@ public abstract class DigestUtils {
...
@@ -127,7 +127,12 @@ public abstract class DigestUtils {
return
messageDigest
.
digest
();
return
messageDigest
.
digest
();
}
}
else
{
else
{
return
messageDigest
.
digest
(
StreamUtils
.
copyToByteArray
(
inputStream
));
final
byte
[]
buffer
=
new
byte
[
StreamUtils
.
BUFFER_SIZE
];
int
bytesRead
=
-
1
;
while
((
bytesRead
=
inputStream
.
read
(
buffer
))
!=
-
1
)
{
messageDigest
.
update
(
buffer
,
0
,
bytesRead
);
}
return
messageDigest
.
digest
();
}
}
}
}
...
...
spring-core/src/test/java/org/springframework/util/DigestUtilsTests.java
浏览文件 @
61db8e9f
/*
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -16,6 +16,8 @@
...
@@ -16,6 +16,8 @@
package
org.springframework.util
;
package
org.springframework.util
;
import
java.io.ByteArrayInputStream
;
import
java.io.IOException
;
import
java.io.UnsupportedEncodingException
;
import
java.io.UnsupportedEncodingException
;
import
org.junit.Before
;
import
org.junit.Before
;
...
@@ -25,6 +27,7 @@ import static org.junit.Assert.*;
...
@@ -25,6 +27,7 @@ import static org.junit.Assert.*;
/**
/**
* @author Arjen Poutsma
* @author Arjen Poutsma
* @author Juergen Hoeller
*/
*/
public
class
DigestUtilsTests
{
public
class
DigestUtilsTests
{
...
@@ -38,24 +41,39 @@ public class DigestUtilsTests {
...
@@ -38,24 +41,39 @@ public class DigestUtilsTests {
@Test
@Test
public
void
md5
()
{
public
void
md5
()
throws
IOException
{
byte
[]
result
=
DigestUtils
.
md5Digest
(
bytes
);
byte
[]
expected
=
new
byte
[]
byte
[]
expected
=
new
byte
[]
{-
0x4f
,
0xa
,
-
0x73
,
-
0x4f
,
0x64
,
-
0x20
,
0x75
,
0x41
,
0x5
,
-
0x49
,
-
0x57
,
-
0x65
,
-
0x19
,
0x2e
,
0x3f
,
-
0x1b
};
{-
0x4f
,
0xa
,
-
0x73
,
-
0x4f
,
0x64
,
-
0x20
,
0x75
,
0x41
,
0x5
,
-
0x49
,
-
0x57
,
-
0x65
,
-
0x19
,
0x2e
,
0x3f
,
-
0x1b
};
byte
[]
result
=
DigestUtils
.
md5Digest
(
bytes
);
assertArrayEquals
(
"Invalid hash"
,
expected
,
result
);
result
=
DigestUtils
.
md5Digest
(
new
ByteArrayInputStream
(
bytes
));
assertArrayEquals
(
"Invalid hash"
,
expected
,
result
);
assertArrayEquals
(
"Invalid hash"
,
expected
,
result
);
}
}
@Test
@Test
public
void
md5Hex
()
throws
UnsupportedEncodingException
{
public
void
md5Hex
()
throws
IOException
{
String
expected
=
"b10a8db164e0754105b7a99be72e3fe5"
;
String
hash
=
DigestUtils
.
md5DigestAsHex
(
bytes
);
String
hash
=
DigestUtils
.
md5DigestAsHex
(
bytes
);
assertEquals
(
"Invalid hash"
,
"b10a8db164e0754105b7a99be72e3fe5"
,
hash
);
assertEquals
(
"Invalid hash"
,
expected
,
hash
);
hash
=
DigestUtils
.
md5DigestAsHex
(
new
ByteArrayInputStream
(
bytes
));
assertEquals
(
"Invalid hash"
,
expected
,
hash
);
}
}
@Test
@Test
public
void
md5StringBuilder
()
throws
UnsupportedEncodingException
{
public
void
md5StringBuilder
()
throws
IOException
{
String
expected
=
"b10a8db164e0754105b7a99be72e3fe5"
;
StringBuilder
builder
=
new
StringBuilder
();
StringBuilder
builder
=
new
StringBuilder
();
DigestUtils
.
appendMd5DigestAsHex
(
bytes
,
builder
);
DigestUtils
.
appendMd5DigestAsHex
(
bytes
,
builder
);
assertEquals
(
"Invalid hash"
,
"b10a8db164e0754105b7a99be72e3fe5"
,
builder
.
toString
());
assertEquals
(
"Invalid hash"
,
expected
,
builder
.
toString
());
builder
=
new
StringBuilder
();
DigestUtils
.
appendMd5DigestAsHex
(
new
ByteArrayInputStream
(
bytes
),
builder
);
assertEquals
(
"Invalid hash"
,
expected
,
builder
.
toString
());
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录