(commons-codec) 01/02: Refactor DigestUtils.updateDigest(MessageDigest, File) to use NIO

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git

commit 1848f8fc46bdfdd54f4c0b28f4644bf6c8f2cf29
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Mar 15 15:05:45 2025 -0400

    Refactor DigestUtils.updateDigest(MessageDigest, File) to use NIO
    
    Reduce vertical whitespace
---
 src/changes/changes.xml                                        | 1 +
 src/main/java/org/apache/commons/codec/digest/DigestUtils.java | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 06051c67..26257f40 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
     <release version="1.18.1" date="YYYY-MM-DD" description="This is a feature 
and maintenance release. Java 8 or later is required.">
       <!-- FIX -->
       <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>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Refactor 
DigestUtils.updateDigest(MessageDigest, File) to use NIO.</action>
       <!-- ADD -->
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Gary Gregory">Bump 
org.apache.commons:commons-parent from 79 to 81.</action>
diff --git a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java 
b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
index a5d09648..9d0bbb12 100644
--- a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
@@ -19,7 +19,6 @@ package org.apache.commons.codec.digest;
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
@@ -1276,9 +1275,7 @@ public class DigestUtils {
      * @since 1.11
      */
     public static MessageDigest updateDigest(final MessageDigest digest, final 
File data) throws IOException {
-        try (BufferedInputStream inputStream = new BufferedInputStream(new 
FileInputStream(data))) {
-            return updateDigest(digest, inputStream);
-        }
+        return updateDigest(digest, data.toPath());
     }
 
     /**
@@ -1314,12 +1311,10 @@ public class DigestUtils {
     public static MessageDigest updateDigest(final MessageDigest digest, final 
InputStream inputStream) throws IOException {
         final byte[] buffer = new byte[BUFFER_SIZE];
         int read = inputStream.read(buffer, 0, BUFFER_SIZE);
-
         while (read > -1) {
             digest.update(buffer, 0, read);
             read = inputStream.read(buffer, 0, BUFFER_SIZE);
         }
-
         return digest;
     }