manual change before automatic annotating

openjdk · May 17, 2021 · 26a54a8 · prrace · May 18, 2021 · wangweij
1 parent 576161d
commit 26a54a8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
@@ -25,6 +25,7 @@
 package java.lang;
 
 import java.lang.annotation.Native;
+import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.time.Duration;
 import java.time.Instant;
@@ -40,8 +41,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static java.security.AccessController.doPrivileged;
-
 /**
  * ProcessHandleImpl is the implementation of ProcessHandle.
  *
@@ -84,7 +83,7 @@ final class ProcessHandleImpl implements ProcessHandle {
      * The thread pool of "process reaper" daemon threads.
      */
     private static final Executor processReaperExecutor =
-            doPrivileged((PrivilegedAction<Executor>) () -> {
+            AccessController.doPrivileged((PrivilegedAction<Executor>) () -> {
                 // Initialize ThreadLocalRandom now to avoid using the smaller stack
                 // of the processReaper threads.
                 ThreadLocalRandom.current();

diff --git a/src/java.base/share/classes/javax/crypto/JceSecurity.java.template b/src/java.base/share/classes/javax/crypto/JceSecurity.java.template
@@ -73,6 +73,7 @@ import sun.security.util.Debug;
  * @since 1.4
  */
 
+@SuppressWarnings("removal")
 final class JceSecurity {
 
     private static final Debug debug = Debug.getInstance("jca");

diff --git a/src/java.base/unix/classes/java/lang/ProcessImpl.java b/src/java.base/unix/classes/java/lang/ProcessImpl.java
@@ -42,7 +42,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.security.AccessController;
-import static java.security.AccessController.doPrivileged;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -321,7 +320,7 @@ private ProcessImpl(final byte[] prog,
         processHandle = ProcessHandleImpl.getInternal(pid);
 
         try {
-            doPrivileged((PrivilegedExceptionAction<Void>) () -> {
+            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
                 initStreams(fds, forceNullOutputStream);
                 return null;
             });

diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
@@ -27,6 +27,7 @@
 
 import java.awt.*;
 import java.beans.*;
+import java.security.AccessController;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -39,8 +40,6 @@
 import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
 import sun.security.action.GetPropertyAction;
 
-import static java.security.AccessController.*;
-
 public class AquaUtilControlSize {
     protected static final String CLIENT_PROPERTY_KEY = "JComponent.sizeVariant";
     protected static final String SYSTEM_PROPERTY_KEY = "swing.component.sizevariant";
@@ -73,7 +72,7 @@ private static JRSUIConstants.Size getSizeFromString(final String name) {
     }
 
     private static Size getDefaultSize() {
-        final String sizeProperty = doPrivileged(new GetPropertyAction(SYSTEM_PROPERTY_KEY));
+        final String sizeProperty = AccessController.doPrivileged(new GetPropertyAction(SYSTEM_PROPERTY_KEY));
         final JRSUIConstants.Size size = getSizeFromString(sizeProperty);
         if (size != null) return size;
         return JRSUIConstants.Size.REGULAR;

diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
@@ -48,6 +48,7 @@ public class Platform {
     private static final String compiler    = privilegedGetProperty("sun.management.compiler");
     private static final String testJdk     = privilegedGetProperty("test.jdk");
 
+    @SuppressWarnings("removal")
     private static String privilegedGetProperty(String key) {
         return AccessController.doPrivileged((
                 PrivilegedAction<String>) () -> System.getProperty(key));

diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
@@ -55,6 +55,7 @@ private WhiteBox() {}
    * untrusted code.
    */
   public synchronized static WhiteBox getWhiteBox() {
+    @SuppressWarnings("removal")
     SecurityManager sm = System.getSecurityManager();
     if (sm != null) {
       sm.checkPermission(new WhiteBoxPermission("getInstance"));