Remove deprecated Integer constructor usage. by mbien · Pull Request #8391 · apache/netbeans

mbien · 2025-04-03T13:33:58Z

The feared Integer PR - this should hopefully be the last one in the chain.

project wide, skipped tests
commits grouped by clusters for easier review
- NotifyDescriptor changes were extracted to [NotifyDescriptor] Refactor return values to not rely on Integer identity #8407
approach:
1. I used a simple replace rule to replace it with Integer.valueOf()
2. went through all matches and manually adjusted or simplified them while looking for Object identity issues

part of #8257

mbien · 2025-04-03T13:37:40Z

platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenCache.java

-    Integer ADDED_CHILD = new Integer(0);
-    Integer REMOVED_CHILD = new Integer(1);
+    Integer ADDED_CHILD = 0;
+    Integer REMOVED_CHILD = 1;


switched all usages which compared with == to equals

usages in FolderObj and ChildrenSupportTest, no public API.

mbien · 2025-04-03T13:41:13Z

platform/openide.dialogs/src/org/openide/NotifyDescriptor.java

-    public static final Object YES_OPTION = new Integer(JOptionPane.YES_OPTION);
+    public static final Object YES_OPTION = JOptionPane.YES_OPTION;

    /** Return value if NO is chosen. */
-    public static final Object NO_OPTION = new Integer(JOptionPane.NO_OPTION);
+    public static final Object NO_OPTION = JOptionPane.NO_OPTION;

    /** Return value if CANCEL is chosen. */
-    public static final Object CANCEL_OPTION = new Integer(JOptionPane.CANCEL_OPTION);
+    public static final Object CANCEL_OPTION = JOptionPane.CANCEL_OPTION;

    /** Return value if OK is chosen. */
-    public static final Object OK_OPTION = new Integer(JOptionPane.OK_OPTION);
+    public static final Object OK_OPTION = JOptionPane.OK_OPTION;

    /** Return value if user closes the window without pressing any button. */
-    public static final Object CLOSED_OPTION = new Integer(JOptionPane.CLOSED_OPTION);
+    public static final Object CLOSED_OPTION = JOptionPane.CLOSED_OPTION;


i think this should be ok unless someone relied on the fact that YES_OPTION != OK_OPTION object identity wise (it has the same int value).

Considered making everything new Object but this would cause problems if someone would compare the values. BigInteger would work as last resort.

edit: this won't work

mbien · 2025-04-04T08:26:32Z

platform/openide.awt/src/org/openide/awt/SplittedPanel.java

-    public static final Object ADD_SPLITTER = new Integer(0);
+    public static final Object ADD_SPLITTER = new Object();

    /** constraints constant for adding a component to the first (left/top) pane */
-    public static final Object ADD_FIRST = new Integer(1);
+    public static final Object ADD_FIRST = new Object();

    /** constraints constant for adding a component to the second (right/bottom) pane */
-    public static final Object ADD_SECOND = new Integer(2);
+    public static final Object ADD_SECOND = new Object();


this panel is public unfortunately, but unused and deprecated. This should be still compatible unless someone casts down to Integer.

Could have kept 0, 1, and, 2...

yeah I think so. Not sure why I didn't. Will change it.

lkishalmi · 2025-04-07T23:51:37Z

platform/openide.dialogs/src/org/openide/NotifyDescriptor.java

     */
    public static final String PROP_INFO_NOTIFICATION = "infoNotification"; // NOI18N

+    /**


Does this worth doing at all? The only advantage over simple auto boxing is to have unique Object instances for each option.

Do we really need that? Also it could break comparisons like ret.equals(0).

Object YES_OPTION = JOptionPane.YES_OPTION;

would make more sense.

this doesn't work since two options (JOptionPane.YES_OPTION and JOptionPane.OK_OPTION) would have the same int value which would return the same Integer instance due to the vlaueOf() cache (also used by auto boxing). Two return options with the same identity would be an incompatible change. This fails several tests across NB (already tried with #8391 (comment)).

Also it could break comparisons like ret.equals(0)

this is hopefully unlikely since the return type is Object not Integer. It being an Integer is an implementation detail but not in the doc.

moved the NotifyDescriptor changes to a separate PR #8407

lkishalmi

Looks good save the last commit, where things got over-engineered.

mbien · 2025-04-08T12:52:24Z

extracted the NotifyDescriptor changes to a separate PR (including unit test to visualize the problem), linked from PR text

lkishalmi

LGTM.

mbien · 2025-04-08T17:27:35Z

thanks for review, will merge after looking through it for the last time.

mbien · 2025-04-08T18:30:41Z

java/java.examples/src/org/netbeans/modules/java/examples/PanelProjectLocationVisual.form

-          <ResourceString bundle="org/netbeans/modules/web/project/ui/wizards/Bundle.properties" key="LBL_NWP1_ProjectName_LabelMnemonic" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="" key="LBL_NWP1_ProjectName_LabelMnemonic" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>


this example broke since the package was changed without updating the bundle path most likely. Will fix it.

mbien added Code cleanup Label for cleanup done on the Netbeans IDE ci:all-tests [ci] enable all tests ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labels Apr 3, 2025

mbien commented Apr 3, 2025

View reviewed changes

mbien removed the ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) label Apr 3, 2025

mbien force-pushed the integer-constructors branch from 3dd5b3c to 838983f Compare April 3, 2025 14:48

mbien added Platform [ci] enable platform tests (platform/*) and removed ci:all-tests [ci] enable all tests labels Apr 3, 2025

mbien force-pushed the integer-constructors branch from ef742fc to 7635ea1 Compare April 3, 2025 18:37

mbien added ci:all-tests [ci] enable all tests ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labels Apr 3, 2025

mbien force-pushed the integer-constructors branch from 7635ea1 to b53c321 Compare April 3, 2025 19:57

mbien marked this pull request as ready for review April 3, 2025 19:58

mbien added this to the NB26 milestone Apr 4, 2025

mbien force-pushed the integer-constructors branch from b53c321 to b1ebec8 Compare April 4, 2025 08:22

mbien commented Apr 4, 2025

View reviewed changes

mbien requested review from ebarboni, lkishalmi and neilcsmith-net April 7, 2025 23:30

lkishalmi reviewed Apr 7, 2025

View reviewed changes

lkishalmi requested changes Apr 7, 2025

View reviewed changes

[1/5][java/form] Remove deprecated Integer constructor usage.

1741245

mbien force-pushed the integer-constructors branch from b1ebec8 to 47275af Compare April 8, 2025 12:40

mbien mentioned this pull request Apr 8, 2025

[NotifyDescriptor] Refactor return values to not rely on Integer identity #8407

Closed

mbien requested a review from lkishalmi April 8, 2025 14:26

lkishalmi approved these changes Apr 8, 2025

View reviewed changes

mbien commented Apr 8, 2025

View reviewed changes

[2/5][java/other] Remove deprecated Integer constructor usage.

ed38ede

mbien added 3 commits April 8, 2025 21:13

[3/5][enterprise] Remove deprecated Integer constructor usage.

77f173f

[4/5][platform] Remove deprecated Integer constructor usage.

a20bd60

[5/5][ide, javafx, misc] Remove deprecated Integer constructor usage.

5496ae9

mbien force-pushed the integer-constructors branch from 47275af to 5496ae9 Compare April 8, 2025 19:15

mbien removed the ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) label Apr 8, 2025

mbien merged commit a19ec46 into apache:master Apr 8, 2025
41 checks passed

This was referenced Sep 9, 2025

Remove use of deprecated Integer constructor in NotifyDescriptor #8799

Merged

Remove remaining Integer constructor calls in custom form code and String literal #8808

Merged

		<ResourceString bundle="org/netbeans/modules/web/project/ui/wizards/Bundle.properties" key="LBL_NWP1_ProjectName_LabelMnemonic" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
		<ResourceString bundle="" key="LBL_NWP1_ProjectName_LabelMnemonic" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>

Conversation

mbien commented Apr 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mbien Apr 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mbien Apr 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mbien Apr 4, 2025

Choose a reason for hiding this comment

Uh oh!

lkishalmi Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

mbien Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

mbien Apr 8, 2025

Choose a reason for hiding this comment

Uh oh!

lkishalmi Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

mbien Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mbien Apr 8, 2025

Choose a reason for hiding this comment

Uh oh!

lkishalmi left a comment

Choose a reason for hiding this comment

Uh oh!

mbien commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lkishalmi left a comment

Choose a reason for hiding this comment

Uh oh!

mbien commented Apr 8, 2025

Uh oh!

mbien Apr 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mbien commented Apr 3, 2025 •

edited

Loading

mbien Apr 3, 2025 •

edited

Loading

mbien Apr 3, 2025 •

edited

Loading

mbien Apr 7, 2025 •

edited

Loading

mbien commented Apr 8, 2025 •

edited

Loading