CODEC-206 Add java.io.File APIs to DigestUtils

Drop algo-specific methods in favour of generic ones

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1744410 13f79535-47bb-0310-9956-ffa450edef68

Author: sebbASF

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

@@ -46,6 +46,7 @@
  * import static org.apache.commons.codec.digest.MessageDigestAlgorithms.SHA_224;
  * ...
  * byte [] digest = DigestUtils.digest(SHA_224, dataToDigest);
+ * byte [] pommed = DigestUtils.digest(SHA_224, new File("pom.xml"));
  * </pre>
  * </code>
  * @see MessageDigestAlgorithms
@@ -358,20 +359,6 @@ public static byte[] md2(final ByteBuffer data) {
         return digest(getMd2Digest(), data);
     }
 
-    /**
-     * Calculates the MD2 digest and returns the value as a 16 element <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return MD2 digest
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static byte[] md2(final File data) throws IOException {
-        return digest(getMd2Digest(), data);
-    }
-
     /**
      * Calculates the MD2 digest and returns the value as a 16 element <code>byte[]</code>.
      *
@@ -422,20 +409,6 @@ public static String md2Hex(final ByteBuffer data) {
         return Hex.encodeHexString(md2(data));
     }
 
-    /**
-     * Calculates the MD2 digest and returns the value as a 32 character hex string.
-     *
-     * @param data
-     *            Data to digest
-     * @return MD2 digest as a hex string
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static String md2Hex(final File data) throws IOException {
-        return Hex.encodeHexString(md2(data));
-    }
-
     /**
      * Calculates the MD2 digest and returns the value as a 32 character hex string.
      *
@@ -485,20 +458,6 @@ public static byte[] md5(final ByteBuffer data) {
         return digest(getMd5Digest(), data);
     }
 
-    /**
-     * Calculates the MD5 digest and returns the value as a 16 element <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return MD5 digest
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static byte[] md5(final File data) throws IOException {
-        return digest(getMd5Digest(), data);
-    }
-
     /**
      * Calculates the MD5 digest and returns the value as a 16 element <code>byte[]</code>.
      *
@@ -547,20 +506,6 @@ public static String md5Hex(final ByteBuffer data) {
         return Hex.encodeHexString(md5(data));
     }
 
-    /**
-     * Calculates the MD5 digest and returns the value as a 32 character hex string.
-     *
-     * @param data
-     *            Data to digest
-     * @return MD5 digest as a hex string
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static String md5Hex(final File data) throws IOException {
-        return Hex.encodeHexString(md5(data));
-    }
-
     /**
      * Calculates the MD5 digest and returns the value as a 32 character hex string.
      *
@@ -652,20 +597,6 @@ public static byte[] sha1(final ByteBuffer data) {
         return digest(getSha1Digest(), data);
     }
 
-    /**
-     * Calculates the SHA-1 digest and returns the value as a <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-1 digest
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static byte[] sha1(final File data) throws IOException {
-        return digest(getSha1Digest(), data);
-    }
-
     /**
      * Calculates the SHA-1 digest and returns the value as a <code>byte[]</code>.
      *
@@ -715,20 +646,6 @@ public static String sha1Hex(final ByteBuffer data) {
         return Hex.encodeHexString(sha1(data));
     }
 
-    /**
-     * Calculates the SHA-1 digest and returns the value as a hex string.
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-1 digest as a hex string
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static String sha1Hex(final File data) throws IOException {
-        return Hex.encodeHexString(sha1(data));
-    }
-
     /**
      * Calculates the SHA-1 digest and returns the value as a hex string.
      *
@@ -782,23 +699,6 @@ public static byte[] sha256(final ByteBuffer data) {
         return digest(getSha256Digest(), data);
     }
 
-    /**
-     * Calculates the SHA-256 digest and returns the value as a <code>byte[]</code>.
-     * <p>
-     * Throws a <code>RuntimeException</code> on JRE versions prior to 1.4.0.
-     * </p>
-     *
-     * @param data
-     *            File to digest
-     * @return SHA-256 digest
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static byte[] sha256(final File data) throws IOException {
-        return digest(getSha256Digest(), data);
-    }
-
     /**
      * Calculates the SHA-256 digest and returns the value as a <code>byte[]</code>.
      * <p>
@@ -858,23 +758,6 @@ public static String sha256Hex(final ByteBuffer data) {
         return Hex.encodeHexString(sha256(data));
     }
 
-    /**
-     * Calculates the SHA-256 digest and returns the value as a hex string.
-     * <p>
-     * Throws a <code>RuntimeException</code> on JRE versions prior to 1.4.0.
-     * </p>
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-256 digest as a hex string
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static String sha256Hex(final File data) throws IOException {
-        return Hex.encodeHexString(sha256(data));
-    }
-
     /**
      * Calculates the SHA-256 digest and returns the value as a hex string.
      * <p>
@@ -934,23 +817,6 @@ public static byte[] sha384(final ByteBuffer data) {
         return digest(getSha384Digest(), data);
     }
 
-    /**
-     * Calculates the SHA-384 digest and returns the value as a <code>byte[]</code>.
-     * <p>
-     * Throws a <code>RuntimeException</code> on JRE versions prior to 1.4.0.
-     * </p>
-     *
-     * @param data
-     *            File to digest
-     * @return SHA-384 digest
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static byte[] sha384(final File data) throws IOException {
-        return digest(getSha384Digest(), data);
-    }
-
     /**
      * Calculates the SHA-384 digest and returns the value as a <code>byte[]</code>.
      * <p>
@@ -1010,23 +876,6 @@ public static String sha384Hex(final ByteBuffer data) {
         return Hex.encodeHexString(sha384(data));
     }
 
-    /**
-     * Calculates the SHA-384 digest and returns the value as a hex string.
-     * <p>
-     * Throws a <code>RuntimeException</code> on JRE versions prior to 1.4.0.
-     * </p>
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-384 digest as a hex string
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static String sha384Hex(final File data) throws IOException {
-        return Hex.encodeHexString(sha384(data));
-    }
-
     /**
      * Calculates the SHA-384 digest and returns the value as a hex string.
      * <p>
@@ -1086,23 +935,6 @@ public static byte[] sha512(final ByteBuffer data) {
         return digest(getSha512Digest(), data);
     }
 
-    /**
-     * Calculates the SHA-512 digest and returns the value as a <code>byte[]</code>.
-     * <p>
-     * Throws a <code>RuntimeException</code> on JRE versions prior to 1.4.0.
-     * </p>
-     *
-     * @param data
-     *            File to digest
-     * @return SHA-512 digest
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static byte[] sha512(final File data) throws IOException {
-        return digest(getSha512Digest(), data);
-    }
-
     /**
      * Calculates the SHA-512 digest and returns the value as a <code>byte[]</code>.
      * <p>
@@ -1162,23 +994,6 @@ public static String sha512Hex(final ByteBuffer data) {
         return Hex.encodeHexString(sha512(data));
     }
 
-    /**
-     * Calculates the SHA-512 digest and returns the value as a hex string.
-     * <p>
-     * Throws a <code>RuntimeException</code> on JRE versions prior to 1.4.0.
-     * </p>
-     *
-     * @param data
-     *            File to digest
-     * @return SHA-512 digest as a hex string
-     * @throws IOException
-     *             On error reading from the stream
-     * @since 1.11
-     */
-    public static String sha512Hex(File data) throws IOException {
-        return Hex.encodeHexString(sha512(data));
-    }
-
     /**
      * Calculates the SHA-512 digest and returns the value as a hex string.
      * <p>