Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8273484: Cleanup unnecessary null comparison before instanceof check in java.naming #5374

Conversation

turbanoff
Copy link
Member

@turbanoff turbanoff commented Sep 6, 2021

Update code checks both non-null and instance of a class in java.naming module classes.
The checks and explicit casts could also be replaced with pattern matching for the instanceof operator.
For example:
The following code:

    return (obj != null &&
            obj instanceof CompoundName &&
            impl.equals(((CompoundName)obj).impl));

Can be simplified to:

    return (obj instanceof CompoundName other) &&
            impl.equals(other.impl);

See similar cleanup in java.base - https://bugs.openjdk.java.net/browse/JDK-8258422


Progress

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

Issue

  • JDK-8273484: Cleanup unnecessary null comparison before instanceof check in java.naming

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5374

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 6, 2021

👋 Welcome back turbanoff! 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
Copy link

@openjdk openjdk bot commented Sep 6, 2021

@turbanoff 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.

@openjdk openjdk bot added the core-libs label Sep 6, 2021
@turbanoff turbanoff changed the title [PATCH] Cleanup unnecessary null comparison before instanceof check in java.naming 8273484: Cleanup unnecessary null comparison before instanceof check in java.naming Sep 8, 2021
@openjdk openjdk bot added the rfr label Sep 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 8, 2021

Webrevs

Copy link
Member

@AlekseiEfimov AlekseiEfimov left a comment

Hi Andrey,
The changes look good to me.
And it looks like there is one more method to cleanup: LdapReferralContext.setHopCount

@turbanoff
Copy link
Member Author

@turbanoff turbanoff commented Sep 9, 2021

Good catch! Improved.
Not sure why IDEA don't report such case. Created https://youtrack.jetbrains.com/issue/IDEA-277851

Copy link
Member

@AlekseiEfimov AlekseiEfimov left a comment

The latest version looks good to me.
Our CI system is also happy with this patch - no java.naming test failures observed.

dfuch
dfuch approved these changes Sep 10, 2021
Copy link
Member

@dfuch dfuch left a comment

Nice simplification and usage of the new instanceof pattern. Thanks Andrey for this patch!
LGTM - Aleksei or I will sponsor this if needed.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 10, 2021

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

8273484: Cleanup unnecessary null comparison before instanceof check in java.naming

Reviewed-by: aefimov, dfuchs

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

  • f189dff: 8273595: tools/jpackage tests do not work on apt-based Linux distros like Debian
  • 922e86f: 8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap
  • f42b927: 8273609: Fix trivial doc typos in the compiler area
  • e4cd209: 8273611: Remove unused ProfilePrint_lock
  • f690a01: 8273278: Support XSLT on GraalVM Native Image--deterministic bytecode generation in XSLT
  • 5e1df2c: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • d4177a9: 8273351: bad tag in jdk.random module-info.java
  • ec9d1be: 8273194: Document the two possible cases when Lookup::ensureInitialized returns
  • 81d2ace: 8273369: Computing micros between two instants unexpectedly overflows for some cases
  • efe3ed1: 8273358: macOS Monterey does not have the font Times needed by Serif
  • ... and 82 more: https://git.openjdk.java.net/jdk/compare/c640fe42c2b5e6668a2a875678be44443942c868...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@AlekseiEfimov, @dfuch) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Sep 10, 2021
@turbanoff
Copy link
Member Author

@turbanoff turbanoff commented Sep 11, 2021

/integrate

@openjdk openjdk bot added the sponsor label Sep 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2021

@turbanoff
Your change (at version 4b1bc75) is now ready to be sponsored by a Committer.

@AlekseiEfimov
Copy link
Member

@AlekseiEfimov AlekseiEfimov commented Sep 12, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Sep 12, 2021

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

  • f189dff: 8273595: tools/jpackage tests do not work on apt-based Linux distros like Debian
  • 922e86f: 8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap
  • f42b927: 8273609: Fix trivial doc typos in the compiler area
  • e4cd209: 8273611: Remove unused ProfilePrint_lock
  • f690a01: 8273278: Support XSLT on GraalVM Native Image--deterministic bytecode generation in XSLT
  • 5e1df2c: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • d4177a9: 8273351: bad tag in jdk.random module-info.java
  • ec9d1be: 8273194: Document the two possible cases when Lookup::ensureInitialized returns
  • 81d2ace: 8273369: Computing micros between two instants unexpectedly overflows for some cases
  • efe3ed1: 8273358: macOS Monterey does not have the font Times needed by Serif
  • ... and 82 more: https://git.openjdk.java.net/jdk/compare/c640fe42c2b5e6668a2a875678be44443942c868...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 12, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Sep 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 12, 2021

@AlekseiEfimov @turbanoff Pushed as commit 2ee1f96.

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

@turbanoff turbanoff deleted the cleanup_unnecessary_null_comparison_before_instanceof_java.naming branch Sep 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs integrated
3 participants