Skip to content

Commit 83c4b1c

Browse files
committed
Revert CODEC-211
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1744172 13f79535-47bb-0310-9956-ffa450edef68
1 parent 858aa75 commit 83c4b1c

5 files changed

Lines changed: 275 additions & 357 deletions

File tree

src/changes/changes.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ The <action> type attribute can be add,update,fix,remove.
5252
<action dev="ggregory" type="add" issue="CODEC-217" due-to="Gary Gregory">Add HmacAlgorithms.HMAC_SHA_224 (Java 8 only)</action>
5353
<action dev="ggregory" type="add" issue="CODEC-213" due-to="Gary Gregory">Support JEP 287: SHA-3 Hash Algorithms</action>
5454
<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>
55-
<action dev="ggregory" type="add" issue="CODEC-211" due-to="Gary Gregory">Create enum MessageDigestAlgorithm and deprecate class MessageDigestAlgorithms</action>
5655
<action dev="ggregory" type="add" issue="CODEC-210" due-to="Gary Gregory">Add DigestUtils.getDigest(String, MessageDigest)</action>
5756
<action dev="ggregory" type="add" issue="CODEC-208" due-to="Gary Gregory">Make some DigestUtils APIs public</action>
5857
<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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ private void println(String prefix, final byte[] digest) {
7676

7777
private void run() throws IOException {
7878
if (algorithm.equalsIgnoreCase("ALL") || algorithm.equals("*")) {
79-
run(MessageDigestAlgorithm.values());
79+
run(MessageDigestAlgorithms.values());
8080
return;
8181
}
8282
final MessageDigest messageDigest = DigestUtils.getDigest(algorithm, null);
8383
if (messageDigest != null) {
8484
run("", messageDigest);
8585
} else {
86-
run("", MessageDigestAlgorithm.valueOf(algorithm.toUpperCase(Locale.ROOT)).getMessageDigest());
86+
run("", DigestUtils.getDigest(algorithm.toUpperCase(Locale.ROOT)));
8787
}
8888
}
8989

90-
private void run(MessageDigestAlgorithm[] digestAlgorithms) throws IOException {
91-
for (MessageDigestAlgorithm messageDigestAlgorithm : digestAlgorithms) {
92-
if (messageDigestAlgorithm.isAvailable()) {
93-
run(messageDigestAlgorithm.getName() + " ", messageDigestAlgorithm);
90+
private void run(String[] digestAlgorithms) throws IOException {
91+
for (String messageDigestAlgorithm : digestAlgorithms) {
92+
if (DigestUtils.isAvailable(messageDigestAlgorithm)) {
93+
run(messageDigestAlgorithm + " ", messageDigestAlgorithm);
9494
}
9595
}
9696
}
@@ -116,8 +116,8 @@ private void run(String prefix, MessageDigest messageDigest, File[] files) throw
116116
}
117117
}
118118

119-
private void run(String prefix, final MessageDigestAlgorithm messageDigestAlgorithm) throws IOException {
120-
run(prefix, messageDigestAlgorithm.getMessageDigest());
119+
private void run(String prefix, final String messageDigestAlgorithm) throws IOException {
120+
run(prefix, DigestUtils.getDigest(messageDigestAlgorithm));
121121
}
122122

123123
@Override

0 commit comments

Comments
 (0)