Sort new methods from previous commit.

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

Author: garydgregory

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

@@ -34,6 +34,8 @@
  */
 public class DigestUtils {
 
+    private static final int STREAM_BUFFER_LENGTH = 1024;
+
     /**
      * Read through an ByteBuffer and returns the digest for the data
      *
@@ -200,6 +202,18 @@ public static byte[] md2(final byte[] data) {
         return getMd2Digest().digest(data);
     }
 
+    /**
+     * Calculates the MD2 digest and returns the value as a 16 element <code>byte[]</code>.
+     *
+     * @param data
+     *            Data to digest
+     * @return MD2 digest
+     * @since 1.11
+     */
+    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>.
      *
@@ -287,66 +301,6 @@ public static byte[] md5(final byte[] data) {
         return getMd5Digest().digest(data);
     }
 
-    /**
-     * Calculates the MD2 digest and returns the value as a 16 element <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return MD2 digest
-     * @since 1.11
-     */
-    public static byte[] md2(final ByteBuffer data) {
-        return digest(getMd2Digest(), data);
-    }
-
-    /**
-     * Calculates the SHA-1 digest and returns the value as a <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-1 digest
-     * @since 1.11
-     */
-    public static byte[] sha1(final ByteBuffer data) {
-        return digest(getSha1Digest(), data);
-    }
-
-    /**
-     * Calculates the SHA-256 digest and returns the value as a <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-256 digest
-     * @since 1.11
-     */
-    public static byte[] sha256(final ByteBuffer data) {
-        return digest(getSha256Digest(), data);
-    }
-
-    /**
-     * Calculates the SHA-384 digest and returns the value as a <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-384 digest
-     * @since 1.11
-     */
-    public static byte[] sha384(final ByteBuffer data) {
-        return digest(getSha384Digest(), data);
-    }
-
-    /**
-     * Calculates the SHA-512 digest and returns the value as a <code>byte[]</code>.
-     *
-     * @param data
-     *            Data to digest
-     * @return SHA-512 digest
-     * @since 1.11
-     */
-    public static byte[] sha512(final ByteBuffer data) {
-        return digest(getSha512Digest(), data);
-    }
-
     /**
      * Calculates the MD5 digest and returns the value as a 16 element <code>byte[]</code>.
      *
@@ -407,19 +361,19 @@ 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.4
-     */
-    public static String md5Hex(final InputStream data) throws IOException {
-        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.4
+         */
+        public static String md5Hex(final InputStream data) throws IOException {
+            return Hex.encodeHexString(md5(data));
+        }
 
     /**
      * Calculates the MD5 digest and returns the value as a 32 character hex string.
@@ -445,19 +399,32 @@ public static byte[] sha(final byte[] data) {
         return sha1(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.4
+ * @deprecated Use {@link #sha1(InputStream)}
+ */
+@Deprecated
+public static byte[] sha(final InputStream data) throws IOException {
+    return sha1(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.4
-     * @deprecated Use {@link #sha1(InputStream)}
+     * @deprecated Use {@link #sha1(String)}
      */
     @Deprecated
-    public static byte[] sha(final InputStream data) throws IOException {
+    public static byte[] sha(final String data) {
         return sha1(data);
     }
 
@@ -467,11 +434,10 @@ public static byte[] sha(final InputStream data) throws IOException {
      * @param data
      *            Data to digest
      * @return SHA-1 digest
-     * @deprecated Use {@link #sha1(String)}
+     * @since 1.7
      */
-    @Deprecated
-    public static byte[] sha(final String data) {
-        return sha1(data);
+    public static byte[] sha1(final byte[] data) {
+        return getSha1Digest().digest(data);
     }
 
     /**
@@ -480,10 +446,10 @@ public static byte[] sha(final String data) {
      * @param data
      *            Data to digest
      * @return SHA-1 digest
-     * @since 1.7
+     * @since 1.11
      */
-    public static byte[] sha1(final byte[] data) {
-        return getSha1Digest().digest(data);
+    public static byte[] sha1(final ByteBuffer data) {
+        return digest(getSha1Digest(), data);
     }
 
     /**
@@ -576,6 +542,18 @@ public static byte[] sha256(final byte[] data) {
         return getSha256Digest().digest(data);
     }
 
+    /**
+     * Calculates the SHA-256 digest and returns the value as a <code>byte[]</code>.
+     *
+     * @param data
+     *            Data to digest
+     * @return SHA-256 digest
+     * @since 1.11
+     */
+    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>
@@ -682,6 +660,18 @@ public static byte[] sha384(final byte[] data) {
         return getSha384Digest().digest(data);
     }
 
+    /**
+     * Calculates the SHA-384 digest and returns the value as a <code>byte[]</code>.
+     *
+     * @param data
+     *            Data to digest
+     * @return SHA-384 digest
+     * @since 1.11
+     */
+    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>
@@ -788,6 +778,18 @@ public static byte[] sha512(final byte[] data) {
         return getSha512Digest().digest(data);
     }
 
+    /**
+     * Calculates the SHA-512 digest and returns the value as a <code>byte[]</code>.
+     *
+     * @param data
+     *            Data to digest
+     * @return SHA-512 digest
+     * @since 1.11
+     */
+    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>
@@ -990,6 +992,4 @@ public static MessageDigest updateDigest(final MessageDigest messageDigest, fina
         messageDigest.update(StringUtils.getBytesUtf8(valueToDigest));
         return messageDigest;
     }
-
-    private static final int STREAM_BUFFER_LENGTH = 1024;
 }