MessageDigestAlgorithm => MessageDigestAlgorithms as the former has been dropped

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

Author: sebbASF

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

@@ -40,7 +40,7 @@ public class Digest {
      * </p>
      *
      * @param args
-     *            {@code args[0]} is one of {@link MessageDigestAlgorithm} name, {@link MessageDigest} name, {@code ALL}
+     *            {@code args[0]} is one of {@link MessageDigestAlgorithms} name, {@link MessageDigest} name, {@code ALL}
      *            , or {@code *}. {@code args[1]} is a FILE.
      * @throws IOException
      */

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

@@ -161,7 +161,7 @@ public static MessageDigest getDigest(final String algorithm, MessageDigest defa
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught, which should never happen because MD2 is a
      *             built-in algorithm
-     * @see MessageDigestAlgorithm#MD2
+     * @see MessageDigestAlgorithms#MD2
      * @since 1.7
      */
     public static MessageDigest getMd2Digest() {
@@ -175,7 +175,7 @@ public static MessageDigest getMd2Digest() {
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught, which should never happen because MD5 is a
      *             built-in algorithm
-     * @see MessageDigestAlgorithm#MD5
+     * @see MessageDigestAlgorithms#MD5
      */
     public static MessageDigest getMd5Digest() {
         return getDigest(MessageDigestAlgorithms.MD5);
@@ -188,7 +188,7 @@ public static MessageDigest getMd5Digest() {
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-1 is a
      *             built-in algorithm
-     * @see MessageDigestAlgorithm#SHA_1
+     * @see MessageDigestAlgorithms#SHA_1
      * @since 1.7
      */
     public static MessageDigest getSha1Digest() {
@@ -205,7 +205,7 @@ public static MessageDigest getSha1Digest() {
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught on Java 7 and older, SHA-224 is a built-in
      *             algorithm on Java 8
-     * @see MessageDigestAlgorithm#SHA_224
+     * @see MessageDigestAlgorithms#SHA_224
      * @since 1.11
      */
     public static MessageDigest getSha224Digest() {
@@ -222,7 +222,7 @@ public static MessageDigest getSha224Digest() {
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-256 is a
      *             built-in algorithm
-     * @see MessageDigestAlgorithm#SHA_256
+     * @see MessageDigestAlgorithms#SHA_256
      */
     public static MessageDigest getSha256Digest() {
         return getDigest(MessageDigestAlgorithms.SHA_256);
@@ -238,7 +238,7 @@ public static MessageDigest getSha256Digest() {
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-384 is a
      *             built-in algorithm
-     * @see MessageDigestAlgorithm#SHA_384
+     * @see MessageDigestAlgorithms#SHA_384
      */
     public static MessageDigest getSha384Digest() {
         return getDigest(MessageDigestAlgorithms.SHA_384);
@@ -254,7 +254,7 @@ public static MessageDigest getSha384Digest() {
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-512 is a
      *             built-in algorithm
-     * @see MessageDigestAlgorithm#SHA_512
+     * @see MessageDigestAlgorithms#SHA_512
      */
     public static MessageDigest getSha512Digest() {
         return getDigest(MessageDigestAlgorithms.SHA_512);

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

@@ -833,4 +833,34 @@ public static Mac updateHmac(final Mac mac, final String valueToDigest) {
         mac.update(StringUtils.getBytesUtf8(valueToDigest));
         return mac;
     }
+
+    // Fluent interface code
+
+    private final Mac mac;
+    
+    private HmacUtils(Mac mac) {
+        this.mac = mac;
+    }
+
+    public static HmacUtils with(HmacAlgorithms algo, byte[] key) {
+        return with(algo.getName(), key);
+    }
+
+    public static HmacUtils with(String algo, byte[] key) {
+        Mac mac = getInitializedMac(algo, key);
+        return new HmacUtils(mac);
+    }
+
+    public HmacUtils updateHmac(byte[] valueToDigest) {
+        mac.update(valueToDigest);
+        return this;
+    }
+
+    public Mac getMac() {
+        return mac;
+    }
+
+    public byte[] doFinal() {
+        return mac.doFinal();
+    }
 }

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

@@ -128,7 +128,7 @@ public static String sha256Crypt(final byte[] keyBytes, String salt) {
      *             if the given salt is <code>null</code> or does not match the allowed pattern
      * @throws IllegalArgumentException
      *             when a {@link NoSuchAlgorithmException} is caught
-     * @see MessageDigestAlgorithm
+     * @see MessageDigestAlgorithms
      */
     private static String sha2Crypt(final byte[] keyBytes, final String salt, final String saltPrefix,
             final int blocksize, final String algorithm) {

src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java

@@ -32,7 +32,7 @@
 import org.junit.runners.Parameterized.Parameters;
 
 /**
- * Tests {@link MessageDigestAlgorithm}.
+ * Tests {@link MessageDigestAlgorithms}.
  *
  * @since 1.11
  */