You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/05/15 18:20:00 UTC
svn commit: r1743944 - in /commons/proper/codec/trunk/src:
main/java/org/apache/commons/codec/digest/
test/java/org/apache/commons/codec/digest/
Author: ggregory
Date: Sun May 15 18:20:00 2016
New Revision: 1743944
URL: http://svn.apache.org/viewvc?rev=1743944&view=rev
Log:
[CODEC-211] Create enum MessageDigestAlgorithm and deprecate class MessageDigestAlgorithms. Rename MessageDigestAlgorithm.getAlgorithm() to getName().
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithm.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java?rev=1743944&r1=1743943&r2=1743944&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java Sun May 15 18:20:00 2016
@@ -87,7 +87,7 @@ public class Digest {
for (int i = 0; i < digestAlgorithms.length; i++) {
final MessageDigestAlgorithm messageDigestAlgorithm = digestAlgorithms[i];
if (messageDigestAlgorithm.isAvailable()) {
- run(messageDigestAlgorithm.getAlgorithm() + " ", messageDigestAlgorithm);
+ run(messageDigestAlgorithm.getName() + " ", messageDigestAlgorithm);
}
}
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java?rev=1743944&r1=1743943&r2=1743944&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java Sun May 15 18:20:00 2016
@@ -157,7 +157,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which should never happen because MD2 is a
* built-in algorithm
- * @see MessageDigestAlgorithms#MD2
+ * @see MessageDigestAlgorithm#MD2
* @since 1.7
*/
public static MessageDigest getMd2Digest() {
@@ -171,7 +171,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which should never happen because MD5 is a
* built-in algorithm
- * @see MessageDigestAlgorithms#MD5
+ * @see MessageDigestAlgorithm#MD5
*/
public static MessageDigest getMd5Digest() {
return MessageDigestAlgorithm.MD5.getMessageDigest();
@@ -184,7 +184,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-1 is a
* built-in algorithm
- * @see MessageDigestAlgorithms#SHA_1
+ * @see MessageDigestAlgorithm#SHA_1
* @since 1.7
*/
public static MessageDigest getSha1Digest() {
@@ -201,7 +201,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught on Java 7 and older, SHA-224 is a built-in
* algorithm on Java 8
- * @see MessageDigestAlgorithms#SHA_224
+ * @see MessageDigestAlgorithm#SHA_224
*/
public static MessageDigest getSha224Digest() {
return MessageDigestAlgorithm.SHA_224.getMessageDigest();
@@ -217,7 +217,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-256 is a
* built-in algorithm
- * @see MessageDigestAlgorithms#SHA_256
+ * @see MessageDigestAlgorithm#SHA_256
*/
public static MessageDigest getSha256Digest() {
return MessageDigestAlgorithm.SHA_256.getMessageDigest();
@@ -233,7 +233,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-384 is a
* built-in algorithm
- * @see MessageDigestAlgorithms#SHA_384
+ * @see MessageDigestAlgorithm#SHA_384
*/
public static MessageDigest getSha384Digest() {
return MessageDigestAlgorithm.SHA_384.getMessageDigest();
@@ -249,7 +249,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which should never happen because SHA-512 is a
* built-in algorithm
- * @see MessageDigestAlgorithms#SHA_512
+ * @see MessageDigestAlgorithm#SHA_512
*/
public static MessageDigest getSha512Digest() {
return MessageDigestAlgorithm.SHA_512.getMessageDigest();
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithm.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithm.java?rev=1743944&r1=1743943&r2=1743944&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithm.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithm.java Sun May 15 18:20:00 2016
@@ -171,7 +171,7 @@ public enum MessageDigestAlgorithm {
*
* @return the algorithm name.
*/
- public String getAlgorithm() {
+ public String getName() {
return algorithm;
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java?rev=1743944&r1=1743943&r2=1743944&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java Sun May 15 18:20:00 2016
@@ -102,7 +102,7 @@ public class Sha2Crypt {
if (salt == null) {
salt = SHA256_PREFIX + B64.getRandomSalt(8);
}
- return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithm.SHA_256.getAlgorithm());
+ return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithm.SHA_256.getName());
}
/**
@@ -540,6 +540,6 @@ public class Sha2Crypt {
if (salt == null) {
salt = SHA512_PREFIX + B64.getRandomSalt(8);
}
- return sha2Crypt(keyBytes, salt, SHA512_PREFIX, SHA512_BLOCKSIZE, MessageDigestAlgorithm.SHA_512.getAlgorithm());
+ return sha2Crypt(keyBytes, salt, SHA512_PREFIX, SHA512_BLOCKSIZE, MessageDigestAlgorithm.SHA_512.getName());
}
}
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java?rev=1743944&r1=1743943&r2=1743944&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java Sun May 15 18:20:00 2016
@@ -79,7 +79,7 @@ public class MessageDigestAlgorithmTest
@Test
public void testAlgorithm() throws IOException, NoSuchAlgorithmException {
- final String algorithm = messageDigestAlgorithm.getAlgorithm();
+ final String algorithm = messageDigestAlgorithm.getName();
Assert.assertNotNull(algorithm);
Assert.assertFalse(algorithm.isEmpty());
Assume.assumeTrue(messageDigestAlgorithm.isAvailable());
@@ -122,7 +122,7 @@ public class MessageDigestAlgorithmTest
public void testGetMessageDigest() throws IOException, NoSuchAlgorithmException {
Assume.assumeTrue(messageDigestAlgorithm.isAvailable());
final MessageDigest messageDigest = messageDigestAlgorithm.getMessageDigest();
- Assert.assertEquals(messageDigestAlgorithm.getAlgorithm(), messageDigest.getAlgorithm());
+ Assert.assertEquals(messageDigestAlgorithm.getName(), messageDigest.getAlgorithm());
}
}