8301120: Cleanup utility classes java.util.Arrays and java.util.Collections #12207

amaembo · 2023-01-25T21:41:37Z

number of minor cleanups could be done in Arrays and Collections utility classes.
In Arrays:

Redundant import jdk.internal.misc.Unsafe;
C-style array declaration is used in public static boolean equals(short[] a, short a2[]) (that's the only place in the whole file)

In Collections:

A few obsolete "unchecked" and "rawtypes" suppressions
Unnecessary local variable initializer in get() method
Raw type can be avoided in a number of casts
Explicit type parameters could be omitted or converted to diamonds
A couple of javadoc links on private APIs are malformed

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8301120: Cleanup utility classes java.util.Arrays and java.util.Collections

Reviewers

Stuart Marks (@stuart-marks - Reviewer)
Joe Darcy (@jddarcy - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12207/head:pull/12207
$ git checkout pull/12207

Update a local copy of the PR:
$ git checkout pull/12207
$ git pull https://git.openjdk.org/jdk pull/12207/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12207

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12207.diff

bridgekeeper · 2023-01-25T21:43:28Z

👋 Welcome back tvaleev! 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 · 2023-01-25T21:45:17Z

@amaembo The following label will be automatically applied to this pull request:

core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2023-01-25T21:48:47Z

Webrevs

01: Full - Incremental (ec7b2afc)
00: Full (f1345d33)

stuart-marks · 2023-01-27T00:19:49Z

src/java.base/share/classes/java/util/Collections.java

@@ -1067,7 +1065,7 @@ public static <T> Collection<T> unmodifiableCollection(Collection<? extends T> c
        public String toString()                   {return c.toString();}

        public Iterator<E> iterator() {
-            return new Iterator<E>() {
+            return new Iterator<>() {


Interesting, this whole family of changes is now possible because the original version of diamond didn't allow it to be used in the context of an anonymous inner class, because of non-denotability of types or some such. That restriction has been relaxed, but we never went back to fix these up.

I also note think that Martin objected to this sort of change in java.util.concurrent, but I'm OK with it here.

Yes, the improved version of diamond was
JDK-8062373: Project Coin: diamond and anonymous classes
as part of JEP 213.

stuart-marks · 2023-01-27T00:30:01Z

src/java.base/share/classes/java/util/Collections.java

            UnmodifiableEntrySet(Set<? extends Map.Entry<? extends K, ? extends V>> s) {
-                // Need to cast to raw in order to work around a limitation in the type system
-                super((Set)s);
+                super((Set<Map.Entry<K, V>>)s);


Huh, good catch, there doesn't appear to be a "limitation in the type system" here, either currently or in older versions of javac going back to JDK 7.

stuart-marks · 2023-01-27T00:31:27Z

src/java.base/share/classes/java/util/Collections.java

-                (o instanceof ReverseComparator2 &&
-                 cmp.equals(((ReverseComparator2)o).cmp));
+                (o instanceof ReverseComparator2<?> that &&
+                 cmp.equals(that.cmp));


Nice, using an instanceof pattern where we had missed it previously.

stuart-marks

Overall looks good, no changes necessary, comments are just observations.

I'll come back and approve this when my CI build finishes.

stuart-marks

Test run looks good, ok to integrate.

openjdk · 2023-01-27T16:56:58Z

@amaembo 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:

8301120: Cleanup utility classes java.util.Arrays and java.util.Collections

Reviewed-by: smarks, darcy

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 46 new commits pushed to the master branch:

22c976a: 8177418: NPE is not apparent for methods in java.util.TimeZone API docs
7aaf76c: 8300924: Method::invoke throws wrong exception type when passing wrong number of arguments to method with 4 or more parameters
49ff520: 8300241: Replace NULL with nullptr in share/classfile/
f52d35c: 8300240: Replace NULL with nullptr in share/ci/
5c1ec82: 8301077: Replace NULL with nullptr in share/services/
dff4131: 8285850: [AIX] unreachable code in basic_tools.m4 -> BASIC_CHECK_TAR
e2a3b20: 8301187: Memory leaks in OopMapCache
fccf818: 8301123: Enable Symbol refcounting underflow checks in PRODUCT
e4252bb: 8300823: UB: Compile::_phase_optimize_finished is initialized too late
db8fa1b: 8300405: Screen capture for test JFileChooserSetLocationTest.java, failure case
... and 36 more: https://git.openjdk.org/jdk/compare/adcfd257358fcd810f75d41bda7b916595e5dcdf...master

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.

amaembo · 2023-01-27T19:22:39Z

/integrate

openjdk · 2023-01-27T19:23:59Z

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

b8e5abc: 8301097: Update GHA XCode to 12.5.1
9c4bc2c: 8301132: Test update for deprecated sprintf in Xcode 14
7f05d57: 8217920: Lookup.defineClass injects a class that can access private members of any class in its own module
22c976a: 8177418: NPE is not apparent for methods in java.util.TimeZone API docs
7aaf76c: 8300924: Method::invoke throws wrong exception type when passing wrong number of arguments to method with 4 or more parameters
49ff520: 8300241: Replace NULL with nullptr in share/classfile/
f52d35c: 8300240: Replace NULL with nullptr in share/ci/
5c1ec82: 8301077: Replace NULL with nullptr in share/services/
dff4131: 8285850: [AIX] unreachable code in basic_tools.m4 -> BASIC_CHECK_TAR
e2a3b20: 8301187: Memory leaks in OopMapCache
... and 39 more: https://git.openjdk.org/jdk/compare/adcfd257358fcd810f75d41bda7b916595e5dcdf...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-01-27T19:24:10Z

@amaembo Pushed as commit ae0e76d.

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

Cleanup

f1345d3

openjdk bot added the rfr Pull request is ready for review label Jan 25, 2023

openjdk bot added the core-libs core-libs-dev@openjdk.org label Jan 25, 2023

Revert cast removal

ec7b2af

stuart-marks reviewed Jan 27, 2023

View reviewed changes

stuart-marks approved these changes Jan 27, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 27, 2023

jddarcy approved these changes Jan 27, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jan 27, 2023

openjdk bot closed this Jan 27, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8301120: Cleanup utility classes java.util.Arrays and java.util.Collections #12207

8301120: Cleanup utility classes java.util.Arrays and java.util.Collections #12207

amaembo commented Jan 25, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

mlbridge bot commented Jan 25, 2023 •

edited

Loading

stuart-marks Jan 27, 2023

jddarcy Jan 27, 2023

stuart-marks Jan 27, 2023

stuart-marks Jan 27, 2023

stuart-marks left a comment

stuart-marks left a comment

openjdk bot commented Jan 27, 2023 •

edited

Loading

amaembo commented Jan 27, 2023

openjdk bot commented Jan 27, 2023

openjdk bot commented Jan 27, 2023

8301120: Cleanup utility classes java.util.Arrays and java.util.Collections #12207

8301120: Cleanup utility classes java.util.Arrays and java.util.Collections #12207

Conversation

amaembo commented Jan 25, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

mlbridge bot commented Jan 25, 2023 • edited Loading

Webrevs

stuart-marks Jan 27, 2023

Choose a reason for hiding this comment

jddarcy Jan 27, 2023

Choose a reason for hiding this comment

stuart-marks Jan 27, 2023

Choose a reason for hiding this comment

stuart-marks Jan 27, 2023

Choose a reason for hiding this comment

stuart-marks left a comment

Choose a reason for hiding this comment

stuart-marks left a comment

Choose a reason for hiding this comment

openjdk bot commented Jan 27, 2023 • edited Loading

amaembo commented Jan 27, 2023

openjdk bot commented Jan 27, 2023

openjdk bot commented Jan 27, 2023

amaembo commented Jan 25, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 25, 2023 •

edited

Loading

openjdk bot commented Jan 27, 2023 •

edited

Loading