Skip to content

Commit 1848f8f

Browse files
committed
Refactor DigestUtils.updateDigest(MessageDigest, File) to use NIO
Reduce vertical whitespace
1 parent 4eb3f43 commit 1848f8f

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/changes/changes.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
4646
<release version="1.18.1" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required.">
4747
<!-- FIX -->
4848
<action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action>
49+
<action type="fix" dev="ggregory" due-to="Gary Gregory">Refactor DigestUtils.updateDigest(MessageDigest, File) to use NIO.</action>
4950
<!-- ADD -->
5051
<!-- UPDATE -->
5152
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump org.apache.commons:commons-parent from 79 to 81.</action>

src/main/java/org/apache/commons/codec/digest/DigestUtils.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.io.BufferedInputStream;
2121
import java.io.File;
22-
import java.io.FileInputStream;
2322
import java.io.IOException;
2423
import java.io.InputStream;
2524
import java.io.RandomAccessFile;
@@ -1276,9 +1275,7 @@ public static MessageDigest updateDigest(final MessageDigest messageDigest, fina
12761275
* @since 1.11
12771276
*/
12781277
public static MessageDigest updateDigest(final MessageDigest digest, final File data) throws IOException {
1279-
try (BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(data))) {
1280-
return updateDigest(digest, inputStream);
1281-
}
1278+
return updateDigest(digest, data.toPath());
12821279
}
12831280

12841281
/**
@@ -1314,12 +1311,10 @@ private static MessageDigest updateDigest(final MessageDigest digest, final File
13141311
public static MessageDigest updateDigest(final MessageDigest digest, final InputStream inputStream) throws IOException {
13151312
final byte[] buffer = new byte[BUFFER_SIZE];
13161313
int read = inputStream.read(buffer, 0, BUFFER_SIZE);
1317-
13181314
while (read > -1) {
13191315
digest.update(buffer, 0, read);
13201316
read = inputStream.read(buffer, 0, BUFFER_SIZE);
13211317
}
1322-
13231318
return digest;
13241319
}
13251320

0 commit comments

Comments
 (0)