8345502: Remove doIntersectionPrivilege methods

Reviewed-by: weijun

Author: seanjmullan

src/java.base/share/classes/java/security/Policy.java

@@ -43,7 +43,7 @@
  *       supported. Installing a system-wide {@code Policy} object is no longer
  *       supported. The {@linkplain #setPolicy setPolicy} method has been
  *       changed to always throw {@code UnsupportedOperationException}. The
- *       {@linkplain getPolicy getPolicy} method has been changed to always
+ *       {@linkplain #getPolicy getPolicy} method has been changed to always
  *       return a {@code Policy} object that grants no permissions. There is no
  *       replacement for the Security Manager or this class.
  */

src/java.base/share/classes/java/security/ProtectionDomain.java

@@ -25,9 +25,6 @@
 
 package java.security;
 
-import jdk.internal.access.JavaSecurityAccess;
-import jdk.internal.access.SharedSecrets;
-
 /**
  * The {@code ProtectionDomain} class encapsulates the characteristics of a
  * domain, which encloses a set of classes whose instances are granted a set
@@ -51,39 +48,6 @@
 
 public class ProtectionDomain {
 
-    private static class JavaSecurityAccessImpl implements JavaSecurityAccess {
-
-        private JavaSecurityAccessImpl() {
-        }
-
-        @SuppressWarnings("removal")
-        @Override
-        public <T> T doIntersectionPrivilege(
-                PrivilegedAction<T> action,
-                final AccessControlContext stack,
-                final AccessControlContext context) {
-            if (action == null) {
-                throw new NullPointerException();
-            }
-
-            return AccessController.doPrivileged(action);
-        }
-
-        @SuppressWarnings("removal")
-        @Override
-        public <T> T doIntersectionPrivilege(
-                PrivilegedAction<T> action,
-                AccessControlContext context) {
-            return doIntersectionPrivilege(action,
-                AccessController.getContext(), context);
-        }
-    }
-
-    static {
-        // Set up JavaSecurityAccess in SharedSecrets
-        SharedSecrets.setJavaSecurityAccess(new JavaSecurityAccessImpl());
-    }
-
     /* CodeSource */
     private final CodeSource codesource ;
 

src/java.base/share/classes/jdk/internal/access/JavaSecurityAccess.java

@@ -39,10 +39,7 @@
 import java.io.FileDescriptor;
 import java.io.FilePermission;
 import java.io.ObjectInputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.io.RandomAccessFile;
-import java.security.ProtectionDomain;
 import java.security.Signature;
 import javax.security.auth.x500.X500Principal;
 
@@ -89,7 +86,6 @@ public class SharedSecrets {
     private static JavaUtilJarAccess javaUtilJarAccess;
     private static JavaUtilZipFileAccess javaUtilZipFileAccess;
     private static JavaUtilResourceBundleAccess javaUtilResourceBundleAccess;
-    private static JavaSecurityAccess javaSecurityAccess;
     private static JavaSecurityPropertiesAccess javaSecurityPropertiesAccess;
     private static JavaSecuritySignatureAccess javaSecuritySignatureAccess;
     private static JavaSecuritySpecAccess javaSecuritySpecAccess;
@@ -313,19 +309,6 @@ public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() {
         return access;
     }
 
-    public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
-        javaSecurityAccess = jsa;
-    }
-
-    public static JavaSecurityAccess getJavaSecurityAccess() {
-        var access = javaSecurityAccess;
-        if (access == null) {
-            ensureClassInitialized(ProtectionDomain.class);
-            access = javaSecurityAccess;
-        }
-        return access;
-    }
-
     public static void setJavaSecurityPropertiesAccess(JavaSecurityPropertiesAccess jspa) {
         javaSecurityPropertiesAccess = jspa;
     }