[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java

[noreply at shibboleth.net]

Author: iay
Date: Tue Dec  9 12:31:35 2014
New Revision: 702

URL: http://svn.shibboleth.net/view/utilities?rev=702&view=rev
Log:
Avoid deprecated API.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java?rev=702&r1=701&r2=702&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java Tue Dec  9 12:31:35 2014
@@ -24,14 +24,14 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.apache.commons.codec.Charsets;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
+import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.codec.binary.Hex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import com.google.common.base.Function;
 
@@ -53,7 +53,7 @@
     };
     
     /** The default input character set.*/
-    @Nonnull public static final Charset DEFAULT_INPUT_CHARSET = Charsets.UTF_8;
+    @Nonnull public static final Charset DEFAULT_INPUT_CHARSET = Charset.forName(CharEncoding.UTF_8);
     
     /** Logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(StringDigester.class);
@@ -98,7 +98,7 @@
         digestAlgorithm = Constraint.isNotNull(StringSupport.trimOrNull(algorithm), 
                 "Digest algorithm was null or empty");
         
-        // Test the digest algorithm upfront to make sure it's valid. If not, it will throw.
+        // Test the digest algorithm up front to make sure it's valid. If not, it will throw.
         MessageDigest.getInstance(digestAlgorithm);
         
         outputFormat = format;
@@ -140,7 +140,7 @@
         try {
             digest = MessageDigest.getInstance(digestAlgorithm);
         } catch (NoSuchAlgorithmException e) {
-            // This shouldn't happen, b/c we tested it earlier in the ctor, so just log and return null.
+            // This shouldn't happen, because we tested it earlier in the constructor, so just log and return null.
             log.error("Digest algorithm '{}' was invalid", digestAlgorithm, e);
             return null;
         }