1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8159535: Mark deprecated javax.security.auth.Policy API with forRemoval=true

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2017-10-27 21:10:56 +08:00
parent 1eb567e210
commit 2dfe7fb8ab
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.base/share/classes/javax/security/auth/Policy.java
View File

@ -134,7 +134,7 @@ import sun.security.util.Debug;
* setting the value of the {@code auth.policy.provider} security property to * setting the value of the {@code auth.policy.provider} security property to
* the fully qualified name of the desired {@code Policy} implementation class. * the fully qualified name of the desired {@code Policy} implementation class.
* *
* @deprecated as of JDK version 1.4 -- Replaced by java.security.Policy. * @deprecated Replaced by java.security.Policy.
* java.security.Policy has a method: * java.security.Policy has a method:
* <pre> * <pre>
* public PermissionCollection getPermissions * public PermissionCollection getPermissions
@ -152,11 +152,12 @@ import sun.security.util.Debug;
* *
* These two APIs provide callers the means to query the * These two APIs provide callers the means to query the
* Policy for Principal-based Permission entries. * Policy for Principal-based Permission entries.
* This class is subject to removal in a future version of Java SE.
* *
* @since 1.4 * @since 1.4
* @see java.security.Security security properties * @see java.security.Security security properties
*/ */
@Deprecated(since="1.4") @Deprecated(since="1.4", forRemoval=true)
public abstract class Policy { public abstract class Policy {
private static Policy policy; private static Policy policy;

7
src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
View File

@ -29,7 +29,6 @@ import java.security.AccessController;
import java.security.Permission; import java.security.Permission;
import java.security.Permissions; import java.security.Permissions;
import java.security.PermissionCollection; import java.security.PermissionCollection;
import java.security.Policy;
import java.security.Principal; import java.security.Principal;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.security.ProtectionDomain; import java.security.ProtectionDomain;
@ -57,7 +56,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
sun.security.util.Debug.getInstance("combiner", sun.security.util.Debug.getInstance("combiner",
"\t[SubjectDomainCombiner]"); "\t[SubjectDomainCombiner]");
@SuppressWarnings("deprecation") @SuppressWarnings({"deprecation", "removal"})
// Note: check only at classloading time, not dynamically during combine() // Note: check only at classloading time, not dynamically during combine()
private static final boolean useJavaxPolicy = private static final boolean useJavaxPolicy =
javax.security.auth.Policy.isCustomPolicySet(debug); javax.security.auth.Policy.isCustomPolicySet(debug);
@ -303,7 +302,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
if (!allowCaching) { if (!allowCaching) {
java.security.AccessController.doPrivileged java.security.AccessController.doPrivileged
(new PrivilegedAction<Void>() { (new PrivilegedAction<Void>() {
@SuppressWarnings("deprecation") @SuppressWarnings({"deprecation", "removal"})
public Void run() { public Void run() {
// Call refresh only caching is disallowed // Call refresh only caching is disallowed
javax.security.auth.Policy.getPolicy().refresh(); javax.security.auth.Policy.getPolicy().refresh();
@ -374,7 +373,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
PermissionCollection newPerms = PermissionCollection newPerms =
java.security.AccessController.doPrivileged java.security.AccessController.doPrivileged
(new PrivilegedAction<PermissionCollection>() { (new PrivilegedAction<PermissionCollection>() {
@SuppressWarnings("deprecation") @SuppressWarnings({"deprecation", "removal"})
public PermissionCollection run() { public PermissionCollection run() {
return return
javax.security.auth.Policy.getPolicy().getPermissions javax.security.auth.Policy.getPolicy().getPermissions

1
src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
View File

@ -65,6 +65,7 @@ import sun.security.util.PropertyExpander;
* This class is entirely deprecated. * This class is entirely deprecated.
*/ */
@Deprecated @Deprecated
@SuppressWarnings("removal")
public class AuthPolicyFile extends javax.security.auth.Policy { public class AuthPolicyFile extends javax.security.auth.Policy {
static final ResourceBundle rb = static final ResourceBundle rb =