archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8285504: Minor cleanup could be done in javax.net

Browse source 
Reviewed-by: wetmore
This commit is contained in:
Mark Powers 2022-04-28 22:18:36 +00:00 • committed by Bradford Wetmore
parent bba456a8db
commit 573eaceca5
20 changed files with 107 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,13 +42,13 @@ import sun.security.jca.GetInstance;
*/
public class KeyManagerFactory {
// The provider
private Provider provider;
private final Provider provider;
// The provider implementation (delegate)
private KeyManagerFactorySpi factorySpi;
private final KeyManagerFactorySpi factorySpi;
// The name of the key management algorithm.
private String algorithm;
private final String algorithm;
/**
* Obtains the default KeyManagerFactory algorithm name.
@ -63,15 +63,10 @@ public class KeyManagerFactory {
* implementation-specific default if no such property exists.
*/
@SuppressWarnings("removal")
public static final String getDefaultAlgorithm() {
public static String getDefaultAlgorithm() {
String type;
type = AccessController.doPrivileged(new PrivilegedAction<>() {
@Override
public String run() {
return Security.getProperty(
"ssl.KeyManagerFactory.algorithm");
}
});
type = AccessController.doPrivileged((PrivilegedAction<String>) () ->
Security.getProperty("ssl.KeyManagerFactory.algorithm"));
if (type == null) {
type = "SunX509";
}
@ -123,7 +118,7 @@ public class KeyManagerFactory {
* {@code jdk.security.provider.preferred}
* {@link Security#getProperty(String) Security} property to determine
* the preferred provider order for the specified algorithm. This
* may be different than the order of providers returned by
* may be different from the order of providers returned by
* {@link Security#getProviders() Security.getProviders()}.
*
* @param algorithm the standard name of the requested algorithm.