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

8292140: (fs) Needless instanceof check in RegistryFileTypeDetector #9797

Conversation

turbanoff
Copy link
Member

@turbanoff turbanoff commented Aug 8, 2022

Type of file parameter is known to be Path. And instanceof only checks if it's null or not.

public String implProbeContentType(Path file) throws IOException {
if (!(file instanceof Path))
return null;

Before implProbeContentType method is called, parameter is checked for null in sun.nio.fs.AbstractFileTypeDetector#probeContentType. It means null check is redundant too.

public final String probeContentType(Path file) throws IOException {
if (file == null)
throw new NullPointerException("'file' is null");
String result = implProbeContentType(file);


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-8292140: (fs) Needless instanceof check in RegistryFileTypeDetector

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9797

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 8, 2022

👋 Welcome back aturbanov! 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 bot commented Aug 8, 2022

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

  • nio

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 nio nio-dev@openjdk.org label Aug 8, 2022
@AlanBateman
Copy link
Contributor

I think this is a left over from when the parameter was of type FileRef.

@turbanoff turbanoff changed the title [PATCH] Confusing instanceof check in RegistryFileTypeDetector 8292140: (fs) Confusing instanceof check in RegistryFileTypeDetecto Aug 9, 2022
@turbanoff turbanoff changed the title 8292140: (fs) Confusing instanceof check in RegistryFileTypeDetecto 8292140: (fs) Confusing instanceof check in RegistryFileTypeDetector Aug 9, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 9, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 9, 2022

Webrevs

@turbanoff turbanoff changed the title 8292140: (fs) Confusing instanceof check in RegistryFileTypeDetector 8292140: (fs) Needless instanceof check in RegistryFileTypeDetector Aug 10, 2022
@openjdk
Copy link

openjdk bot commented Aug 10, 2022

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

8292140: (fs) Needless instanceof check in RegistryFileTypeDetector

Reviewed-by: alanb

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

  • 83dc2e3: 8292062: misc javax/swing tests failing
  • 4913380: 8292007: Do not include vmSymbol.hpp in method.hpp
  • 6397d56: 8151430: (fs) BasicFileAttributeView.setTimes should support setting file create time on OS X
  • 57e0da1: 8292132: ProblemList jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
  • 17c77b5: 8292119: ProblemList java/awt/image/multiresolution/MultiresolutionIconTest.java on linux-x64 and windows-all
  • d889264: 8290836: Improve test coverage for XPath functions: String Functions
  • ae1a9a0: 8292060: Make ClassFileVersionTest.java version adapting
  • 4040927: 8290047: (fs) FileSystem.getPathMatcher does not check for ":" at last index
  • 8d0d9ea: 8291238: JDK can't be built without G1
  • aff7689: 8292075: Remove deleted test compiler/rangechecks/TestRangeCheckHoistingScaledIV.java from ProblemList
  • ... and 8 more: https://git.openjdk.org/jdk/compare/08274e6fea982e71ccc5964f4919c65501b048e1...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 10, 2022
@turbanoff
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 11, 2022

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

  • 2ddf728: 8292026: Remove redundant allocations from DoubleByteEncoder
  • 3aaffd6: 8292071: NMT: move MallocHeader to its own header and inline header checks
  • 85a6023: Merge
  • 4c6d22a: 8288769: Revert unintentional change to deflate.c
  • 5fce02e: 8291496: Allocating card table before heap causes underflow asserts in CardTable::addr_for()
  • 0def531: 8290889: JDK 19 RDP2 L10n resource files update - msgdrop 10
  • 4b03e13: 8285405: add test and check for negative argument to HashMap::newHashMap et al
  • 2e0a17c: 8292187: aarch64: Remove duplicate header files
  • 36ef4c1: 8291081: Some sun/tools/jstatd/TestJstatd* tests fail with "Not a percentage: 68.31: expected true, was false"
  • b47438c: 8292068: Convert ModuleEntryTable into ResourceHashtable
  • ... and 27 more: https://git.openjdk.org/jdk/compare/08274e6fea982e71ccc5964f4919c65501b048e1...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 11, 2022
@openjdk openjdk bot closed this Aug 11, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 11, 2022
@openjdk
Copy link

openjdk bot commented Aug 11, 2022

@turbanoff Pushed as commit ad5f628.

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

@turbanoff turbanoff deleted the confusing_instanceof_RegistryFileTypeDetector branch October 27, 2022 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated nio nio-dev@openjdk.org
2 participants