8264139: Suppress removal warnings for Security Manager methods #528

kevinrushforth · 2021-06-03T23:34:38Z

This PR adds the necessary @SuppressWarnings("removal") annotations for the recently-integrated security manager deprecation, JEP 411. See openjdk/jdk#4073.

There are four commits:

678b026 : A patch generated by @wangweij to add annotations to the runtime (modules/*/src/main/java) using the same automated tooling that he used as part of the implementation of JEP 411.
9698e87 : Same as above for the tests.
1c42cf8 : Manually removes a pair of unused imports, one of which (a static import) was causing a removal warning.
4f87d18 : Manually reduced the scope of the annotation where it was added to an entire class, or to a large method where only a small part of the method uses a deprecated method. This was done using similar techniques to the following fixes that Weijun did in 8267543: Post JEP 411 refactoring: security jdk#4172.

The first two commits represent the bulk of the changes. Other than scanning to ensure that there are no obvious errors, and testing, they probably don't need the same level of scrutiny as the manual changes do.

I tested this on all three platforms by doing a build / test with JDK_HOME set to a local JDK 17 ea build that includes the fix for JEP 411. I ran the build with gradle -PLINT=removal and verified that there were removal warnings for the security manager APIs without this fix and none with this fix.

NOTE: The following files under modules/javafx.web/src/android and modules/javafx.web/src/ios were not processed by the automated tool. As I have no way to compile them, I chose not to manually fix them either, but doing so would be trivial as a follow-up fix if desired.

modules/javafx.web/src/android/java/com/sun/webkit/Timer.java
modules/javafx.web/src/android/java/com/sun/webkit/WebPage.java
modules/javafx.web/src/android/java/javafx/scene/web/WebEngine.java
modules/javafx.web/src/ios/java/javafx/scene/web/ExportedJavaObject.java
modules/javafx.web/src/ios/java/javafx/scene/web/HTMLEditorSkin.java
modules/javafx.web/src/ios/java/javafx/scene/web/JS2JavaBridge.java
modules/javafx.web/src/ios/java/javafx/scene/web/WebEngine.java

/reviewers 2
/contributor add weijun
/contributor add kcr

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8264139: Suppress removal warnings for Security Manager methods

Reviewers

Weijun Wang (@wangweij - no project role) 🔄 Re-review required (review applies to 4f87d18)
Ajit Ghaisas (@aghaisas - Reviewer)
Ambarish Rapte (@arapte - Reviewer)

Contributors

Weijun Wang <weijun@openjdk.org>
Kevin Rushforth <kcr@openjdk.org>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/528/head:pull/528
$ git checkout pull/528

Update a local copy of the PR:
$ git checkout pull/528
$ git pull https://git.openjdk.java.net/jfx pull/528/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 528

View PR using the GUI difftool:
$ git pr show -t 528

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/528.diff

bridgekeeper · 2021-06-03T23:35:15Z

👋 Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-06-03T23:36:19Z

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

openjdk · 2021-06-03T23:36:58Z

@kevinrushforth
Contributor Weijun Wang <weijun@openjdk.org> successfully added.

openjdk · 2021-06-03T23:38:29Z

@kevinrushforth
Contributor Kevin Rushforth <kcr@openjdk.org> successfully added.

mlbridge · 2021-06-03T23:42:18Z

Webrevs

01: Full - Incremental (84775ff5)
00: Full (4f87d187)

wangweij

All change looks good. Some personal style preferences comments.

wangweij · 2021-06-04T14:31:49Z

modules/javafx.graphics/src/main/java/javafx/scene/Node.java

@@ -9966,7 +9966,7 @@ Accessible getAccessible() {
        if (accessible == null) {
            accessible = Application.GetApplication().createAccessible();
            accessible.setEventHandler(new Accessible.EventHandler() {
-                @SuppressWarnings({"removal","deprecation"})
+                @SuppressWarnings("removal")


Was this "deprecation" already useless before this change?

Yes. The code to which it applied was removed back in JDK 9, but we forgot to remove the annotation.

wangweij · 2021-06-04T14:32:54Z

modules/javafx.web/src/main/java/com/sun/webkit/network/HTTP2Loader.java

@@ -412,11 +411,13 @@ private HTTP2Loader(WebPage webPage,
        };

        // Run the HttpClient in the page's access control context
-        this.response = AccessController.doPrivileged((PrivilegedAction<CompletableFuture<Void>>) () -> {
+        @SuppressWarnings("removal")
+        CompletableFuture<Void> tmpResponse = AccessController.doPrivileged((PrivilegedAction<CompletableFuture<Void>>) () -> {


Is "var" enough?

Yes, I'll change it.

wangweij · 2021-06-04T14:37:05Z

modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java

 public class ModuleHelper {
    private static final Method getModuleMethod;
    private static final Method getResourceAsStreamMethod;

    private static final boolean verbose;

    static {
-        verbose = AccessController.doPrivileged((PrivilegedAction<Boolean>) () ->


You can merge this assignment with the declaration on line 38. Or you can keep this so the check of verbose is in the same block with its assignment.

I think I'll keep this one as is to minimize changes.

wangweij · 2021-06-04T14:40:23Z

modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java

@@ -41,7 +40,9 @@
    private static final int dpiOverride;

    static {
-        dpiOverride = AccessController.doPrivileged((PrivilegedAction<Integer>) () -> Integer.getInteger("com.sun.javafx.screenDPI", 0)).intValue();
+        @SuppressWarnings("removal")


Combine assignment and declaration?

Good idea. This allows the static block to be removed.

wangweij · 2021-06-04T14:41:25Z

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/LinuxArch.java

 public class LinuxArch {

    private static final int bits;

    static {
-        bits = AccessController.doPrivileged((PrivilegedAction<Integer>) () -> {


Good idea. This allows the static block to be removed.

wangweij · 2021-06-04T14:48:06Z

modules/javafx.web/src/main/java/com/sun/webkit/network/NetworkContext.java

@@ -240,12 +242,14 @@ private static int fwkGetMaximumHTTPConnectionCountPerHost() {
        private static final Permission modifyThreadGroupPerm = new RuntimePermission("modifyThreadGroup");
        private static final Permission modifyThreadPerm = new RuntimePermission("modifyThread");

+        @SuppressWarnings("removal")


Maybe move this onto the 1st line inside the method?

aghaisas · 2021-06-14T15:31:54Z

When built with JDK 17ea26 + gradle -PLINT=removal - I cross verified on my macBook (macOS 10.15) that -

without this fix - the warnings are generated
with this fix - the warnings are not generated

arapte

Looks good to me.

openjdk · 2021-06-15T08:08:23Z

@kevinrushforth This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8264139: Suppress removal warnings for Security Manager methods

Co-authored-by: Weijun Wang <weijun@openjdk.org>
Co-authored-by: Kevin Rushforth <kcr@openjdk.org>
Reviewed-by: aghaisas, arapte

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 7 new commits pushed to the master branch:

0ffa8e2: 8244075: Accelerator of ContextMenu's MenuItem is not removed when ContextMenu is removed from Scene
e6cf1df: 8267094: TreeCell: cancelEvent must return correct editing location
ca25036: 8267858: Document that title property in WebEngine gets updated asynchronously
59cf4de: 8267505: {List,Set,Map}PropertyBase::bind should check against identity
fe81b9c: 8268120: Allow hardware cursor to be used on Monocle-EGL platforms
ee03238: 8268152: gstmpegaudioparse does not provides timestamps for HLS MP3 streams
47700d8: 8267819: CoInitialize/CoUninitialize should be called on same thread

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

kevinrushforth · 2021-06-15T12:49:41Z

/integrate

openjdk · 2021-06-15T12:50:44Z

Going to push as commit c81a722.
Since your change was applied there have been 7 commits pushed to the master branch:

0ffa8e2: 8244075: Accelerator of ContextMenu's MenuItem is not removed when ContextMenu is removed from Scene
e6cf1df: 8267094: TreeCell: cancelEvent must return correct editing location
ca25036: 8267858: Document that title property in WebEngine gets updated asynchronously
59cf4de: 8267505: {List,Set,Map}PropertyBase::bind should check against identity
fe81b9c: 8268120: Allow hardware cursor to be used on Monocle-EGL platforms
ee03238: 8268152: gstmpegaudioparse does not provides timestamps for HLS MP3 streams
47700d8: 8267819: CoInitialize/CoUninitialize should be called on same thread

Your commit was automatically rebased without conflicts.

openjdk · 2021-06-15T12:51:02Z

@kevinrushforth Pushed as commit c81a722.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

wangweij and others added 4 commits June 2, 2021 06:38

8264139: Suppress removal warnings for Security Manager methods

678b026

Suppress removal warnings for Security Manager methods in tests

9698e87

Remove unused security manager imports

1c42cf8

Narrow the scope of @SuppressWarnings("removal") annotation

4f87d18

openjdk bot added the rfr Ready for review label Jun 3, 2021

wangweij approved these changes Jun 4, 2021

View reviewed changes

Address review feedback

84775ff

kevinrushforth requested review from aghaisas and arapte June 5, 2021 14:23

aghaisas approved these changes Jun 14, 2021

View reviewed changes

arapte approved these changes Jun 15, 2021

View reviewed changes

openjdk bot added the ready Ready to be integrated label Jun 15, 2021

openjdk bot closed this Jun 15, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Jun 15, 2021

kevinrushforth deleted the 8264139-sm-warnings branch June 15, 2021 23:16

8264139: Suppress removal warnings for Security Manager methods #528

8264139: Suppress removal warnings for Security Manager methods #528

kevinrushforth commented Jun 3, 2021 •

edited by openjdk bot

bridgekeeper bot commented Jun 3, 2021

openjdk bot commented Jun 3, 2021

openjdk bot commented Jun 3, 2021

openjdk bot commented Jun 3, 2021

mlbridge bot commented Jun 3, 2021 •

edited

wangweij left a comment

wangweij Jun 4, 2021

kevinrushforth Jun 4, 2021

wangweij Jun 4, 2021

kevinrushforth Jun 4, 2021

wangweij Jun 4, 2021

kevinrushforth Jun 4, 2021

wangweij Jun 4, 2021

kevinrushforth Jun 4, 2021

wangweij Jun 4, 2021

kevinrushforth Jun 4, 2021

wangweij Jun 4, 2021

aghaisas commented Jun 14, 2021

arapte left a comment

openjdk bot commented Jun 15, 2021

kevinrushforth commented Jun 15, 2021

openjdk bot commented Jun 15, 2021

openjdk bot commented Jun 15, 2021

8264139: Suppress removal warnings for Security Manager methods #528

8264139: Suppress removal warnings for Security Manager methods #528

Conversation

kevinrushforth commented Jun 3, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Contributors

Reviewing

bridgekeeper bot commented Jun 3, 2021

openjdk bot commented Jun 3, 2021

openjdk bot commented Jun 3, 2021

openjdk bot commented Jun 3, 2021

mlbridge bot commented Jun 3, 2021 • edited

Webrevs

wangweij left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aghaisas commented Jun 14, 2021

arapte left a comment

Choose a reason for hiding this comment

openjdk bot commented Jun 15, 2021

kevinrushforth commented Jun 15, 2021

openjdk bot commented Jun 15, 2021

openjdk bot commented Jun 15, 2021

kevinrushforth commented Jun 3, 2021 •

edited by openjdk bot

mlbridge bot commented Jun 3, 2021 •

edited