8263658: Use the blessed modifier order in java.base

Reviewed-by: rriggs, redestad
This commit is contained in:
Alex Blewitt 2021-03-19 13:06:58 +00:00 committed by Claes Redestad
parent 1572f3ccdd
commit b49c589340
28 changed files with 139 additions and 139 deletions

View file

@ -307,7 +307,7 @@ public class IPAddressUtil {
* Mapping from unscoped local Inet(6)Address to the same address
* including the correct scope-id, determined from NetworkInterface.
*/
private final static ConcurrentHashMap<InetAddress,InetAddress>
private static final ConcurrentHashMap<InetAddress,InetAddress>
cache = new ConcurrentHashMap<>();
/**

View file

@ -518,7 +518,7 @@ public abstract class AbstractDrbg {
* assumed to support prediction resistance and always contains
* full-entropy.
*/
private final static EntropySource defaultES =
private static final EntropySource defaultES =
(minE, minLen, maxLen, pr) -> {
byte[] result = new byte[minLen];
SeedGenerator.generateSeed(result);

View file

@ -411,7 +411,7 @@ enum SSLCipher {
private static final HashMap<String, Long> cipherLimits = new HashMap<>();
// Keywords found on the jdk.tls.keyLimits security property.
final static String[] tag = {"KEYUPDATE"};
static final String[] tag = {"KEYUPDATE"};
static {
final long max = 4611686018427387904L; // 2^62

View file

@ -58,9 +58,9 @@ import sun.security.util.Cache;
*/
final class SSLSessionContextImpl implements SSLSessionContext {
private final static int DEFAULT_MAX_CACHE_SIZE = 20480;
private static final int DEFAULT_MAX_CACHE_SIZE = 20480;
// Default lifetime of a session. 24 hours
final static int DEFAULT_SESSION_TIMEOUT = 86400;
static final int DEFAULT_SESSION_TIMEOUT = 86400;
private final Cache<SessionId, SSLSessionImpl> sessionCache;
// session cache, session id as key

View file

@ -112,7 +112,7 @@ final class SessionTicketExtension {
}
// Crypto key context for session state. Used with stateless operation.
final static class StatelessKey {
static final class StatelessKey {
final long timeout;
final SecretKey key;
final int num;

View file

@ -34,7 +34,7 @@ import jdk.internal.misc.VM;
*/
public class ResourcesMgr {
// intended for java.security, javax.security and sun.security resources
private final static Map<String, ResourceBundle> bundles = new ConcurrentHashMap<>();
private static final Map<String, ResourceBundle> bundles = new ConcurrentHashMap<>();
public static String getString(String s) {
return getBundle("sun.security.util.Resources").getString(s);

View file

@ -195,9 +195,9 @@ public class SignatureUtil {
}
public static class EdDSADigestAlgHolder {
public final static AlgorithmId sha512;
public final static AlgorithmId shake256;
public final static AlgorithmId shake256$512;
public static final AlgorithmId sha512;
public static final AlgorithmId shake256;
public static final AlgorithmId shake256$512;
static {
try {
@ -508,15 +508,15 @@ public class SignatureUtil {
// Useful PSSParameterSpec objects
private static class PSSParamsHolder {
final static PSSParameterSpec PSS_256_SPEC = new PSSParameterSpec(
static final PSSParameterSpec PSS_256_SPEC = new PSSParameterSpec(
"SHA-256", "MGF1",
MGF1ParameterSpec.SHA256,
32, PSSParameterSpec.TRAILER_FIELD_BC);
final static PSSParameterSpec PSS_384_SPEC = new PSSParameterSpec(
static final PSSParameterSpec PSS_384_SPEC = new PSSParameterSpec(
"SHA-384", "MGF1",
MGF1ParameterSpec.SHA384,
48, PSSParameterSpec.TRAILER_FIELD_BC);
final static PSSParameterSpec PSS_512_SPEC = new PSSParameterSpec(
static final PSSParameterSpec PSS_512_SPEC = new PSSParameterSpec(
"SHA-512", "MGF1",
MGF1ParameterSpec.SHA512,
64, PSSParameterSpec.TRAILER_FIELD_BC);