Revert CODEC-211

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

Author: sebbASF

src/changes/changes.xml

@@ -52,7 +52,6 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="add" issue="CODEC-217" due-to="Gary Gregory">Add HmacAlgorithms.HMAC_SHA_224 (Java 8 only)</action>         
       <action dev="ggregory" type="add" issue="CODEC-213" due-to="Gary Gregory">Support JEP 287: SHA-3 Hash Algorithms</action>         
       <action dev="ggregory" type="add" issue="CODEC-212" due-to="Gary Gregory">Create a minimal Digest command line utility: org.apache.commons.codec.digest.Digest</action>         
-      <action dev="ggregory" type="add" issue="CODEC-211" due-to="Gary Gregory">Create enum MessageDigestAlgorithm and deprecate class MessageDigestAlgorithms</action>         
       <action dev="ggregory" type="add" issue="CODEC-210" due-to="Gary Gregory">Add DigestUtils.getDigest(String, MessageDigest)</action>         
       <action dev="ggregory" type="add" issue="CODEC-208" due-to="Gary Gregory">Make some DigestUtils APIs public</action>         
       <action dev="ggregory" type="add" issue="CODEC-206" due-to="Gary Gregory">Add java.io.File APIs to MessageDigestAlgorithm</action>         

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

@@ -76,21 +76,21 @@ private void println(String prefix, final byte[] digest) {
 
     private void run() throws IOException {
         if (algorithm.equalsIgnoreCase("ALL") || algorithm.equals("*")) {
-            run(MessageDigestAlgorithm.values());
+            run(MessageDigestAlgorithms.values());
             return;
         }
         final MessageDigest messageDigest = DigestUtils.getDigest(algorithm, null);
         if (messageDigest != null) {
             run("", messageDigest);
         } else {
-            run("", MessageDigestAlgorithm.valueOf(algorithm.toUpperCase(Locale.ROOT)).getMessageDigest());
+            run("", DigestUtils.getDigest(algorithm.toUpperCase(Locale.ROOT)));
         }
     }
 
-    private void run(MessageDigestAlgorithm[] digestAlgorithms) throws IOException {
-        for (MessageDigestAlgorithm messageDigestAlgorithm : digestAlgorithms) {
-            if (messageDigestAlgorithm.isAvailable()) {
-                run(messageDigestAlgorithm.getName() + " ", messageDigestAlgorithm);
+    private void run(String[] digestAlgorithms) throws IOException {
+        for (String messageDigestAlgorithm : digestAlgorithms) {
+            if (DigestUtils.isAvailable(messageDigestAlgorithm)) {
+                run(messageDigestAlgorithm + " ", messageDigestAlgorithm);
             }
         }
     }
@@ -116,8 +116,8 @@ private void run(String prefix, MessageDigest messageDigest, File[] files) throw
         }
     }
 
-    private void run(String prefix, final MessageDigestAlgorithm messageDigestAlgorithm) throws IOException {
-        run(prefix, messageDigestAlgorithm.getMessageDigest());
+    private void run(String prefix, final String messageDigestAlgorithm) throws IOException {
+        run(prefix, DigestUtils.getDigest(messageDigestAlgorithm));
     }
 
     @Override