Refactoring to use Utf8 encoder instead of String.getBytes("UTF-8").

ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java

@@ -28,6 +28,7 @@ import javax.naming.directory.SearchResult;
 import org.junit.*;
 import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.ldap.core.ContextExecutor;
+import org.springframework.security.crypto.codec.Utf8;
 
 /**
  * @author Luke Taylor
@@ -51,12 +52,12 @@ public class SpringSecurityLdapTemplateTests extends AbstractLdapIntegrationTest
 
     @Test
     public void compareOfCorrectByteValueSucceeds() {
-        assertTrue(template.compare("uid=bob,ou=people", "userPassword", LdapUtils.getUtf8Bytes("bobspassword")));
+        assertTrue(template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("bobspassword")));
     }
 
     @Test
     public void compareOfWrongByteValueFails() {
-        assertFalse(template.compare("uid=bob,ou=people", "userPassword", LdapUtils.getUtf8Bytes("wrongvalue")));
+        assertFalse(template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("wrongvalue")));
     }
 
     @Test

ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java

@@ -17,6 +17,7 @@ package org.springframework.security.ldap;
 
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.util.Assert;
 
 import org.apache.commons.logging.Log;
@@ -25,7 +26,6 @@ import org.apache.commons.logging.LogFactory;
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -123,29 +123,11 @@ public final class LdapUtils {
         return baseDn;
     }
 
-    public static byte[] getUtf8Bytes(String s) {
-        try {
-            return s.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            // Should be impossible since UTF-8 is required by all implementations
-            throw new IllegalStateException("Failed to convert string to UTF-8 bytes. Shouldn't be possible");
-        }
-    }
-
-    public static String getUtf8BytesAsString(byte[] utf8) {
-        try {
-            return new String(utf8, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            // Should be impossible since UTF-8 is required by all implementations
-            throw new IllegalStateException("Failed to convert string to UTF-8 bytes. Shouldn't be possible");
-        }
-    }
-
     public static String convertPasswordToString(Object passObj) {
         Assert.notNull(passObj, "Password object to convert must not be null");
 
         if(passObj instanceof byte[]) {
-            return getUtf8BytesAsString((byte[])passObj);
+            return Utf8.decode((byte[])passObj);
         } else if (passObj instanceof String) {
             return (String)passObj;
         } else {

ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java

@@ -26,7 +26,7 @@ import org.springframework.security.authentication.encoding.LdapShaPasswordEncod
 import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.ldap.LdapUtils;
+import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.security.ldap.SpringSecurityLdapTemplate;
 import org.springframework.util.Assert;
 
@@ -96,7 +96,7 @@ public final class PasswordComparisonAuthenticator extends AbstractLdapAuthentic
         }
 
         String encodedPassword = passwordEncoder.encodePassword(password, null);
-        byte[] passwordBytes = LdapUtils.getUtf8Bytes(encodedPassword);
+        byte[] passwordBytes = Utf8.encode(encodedPassword);
 
         if (!ldapTemplate.compare(user.getDn().toString(), passwordAttributeName, passwordBytes)) {
             throw new BadCredentialsException(messages.getMessage("PasswordComparisonAuthenticator.badCredentials",