Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

StandardCharsets can be used

Browse Source 
Reports methods and constructors where constant charset String literal is used (like "UTF-8") which could be replaced with a predefined Charset object like StandardCharsets.UTF_8. This may work a little bit faster, because charset lookup becomes unnecessary. Also catching UnsupportedEncodingException may become unnecessary as well. In this case the catch block will be removed automatically.
This commit is contained in:
Lars Grefer 2019-08-09 00:39:09 +02:00
parent fb39d9c255
commit fe9e454978
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java
View File

@ -733,11 +733,7 @@ public class BCrypt {
public static String hashpw(String password, String salt) { public static String hashpw(String password, String salt) {
byte passwordb[]; byte passwordb[];
try { passwordb = password.getBytes(StandardCharsets.UTF_8);
passwordb = password.getBytes("UTF-8");
} catch (UnsupportedEncodingException uee) {
throw new AssertionError("UTF-8 is not supported");
}
return hashpw(passwordb, salt); return hashpw(passwordb, salt);
} }

3
crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java
View File

@ -19,6 +19,7 @@ import java.nio.ByteBuffer;
import java.nio.CharBuffer; import java.nio.CharBuffer;
import java.nio.charset.CharacterCodingException; import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
/** /**
* UTF-8 Charset encoder/decoder. * UTF-8 Charset encoder/decoder.
@ -28,7 +29,7 @@ import java.nio.charset.Charset;
* @author Luke Taylor * @author Luke Taylor
*/ */
public final class Utf8 { public final class Utf8 {
private static final Charset CHARSET = Charset.forName("UTF-8"); private static final Charset CHARSET = StandardCharsets.UTF_8;
/** /**
* Get the bytes of the String in UTF-8 encoded form. * Get the bytes of the String in UTF-8 encoded form.

15
test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
View File

@ -18,6 +18,7 @@ package org.springframework.security.test.web.servlet.request;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory; import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
@ -638,12 +639,7 @@ public final class SecurityMockMvcRequestPostProcessors {
} }
private static String md5Hex(String a2) { private static String md5Hex(String a2) {
try { return DigestUtils.md5DigestAsHex(a2.getBytes(StandardCharsets.UTF_8));
return DigestUtils.md5DigestAsHex(a2.getBytes("UTF-8"));
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
} }
} }
@ -985,12 +981,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private HttpBasicRequestPostProcessor(String username, String password) { private HttpBasicRequestPostProcessor(String username, String password) {
byte[] toEncode; byte[] toEncode;
try { toEncode = (username + ":" + password).getBytes(StandardCharsets.UTF_8);
toEncode = (username + ":" + password).getBytes("UTF-8");
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
this.headerValue = "Basic " + new String(Base64.getEncoder().encode(toEncode)); this.headerValue = "Basic " + new String(Base64.getEncoder().encode(toEncode));
} }