8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath #20155

turbanoff · 2024-07-12T11:54:15Z

Implementation of both methods is the same.

jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java

Lines 129 to 135 in 9b6f6c5

    
           UnixPath checkPath(Path obj) { 
        
               if (obj == null) 
        
                   throw new NullPointerException(); 
        
               if (!(obj instanceof UnixPath)) 
        
                   throw new ProviderMismatchException(); 
        
               return (UnixPath)obj; 
        
           }

jdk/src/java.base/unix/classes/sun/nio/fs/UnixPath.java

Lines 172 to 179 in 9b6f6c5

    
           // Checks that the given file is a UnixPath 
        
           static UnixPath toUnixPath(Path obj) { 
        
               if (obj == null) 
        
                   throw new NullPointerException(); 
        
               if (!(obj instanceof UnixPath)) 
        
                   throw new ProviderMismatchException(); 
        
               return (UnixPath)obj; 
        
           }

UnixPath.toUnixPath is already used by UnixFileSystemProvider in multiple places. Two more usages shouldn't cause problems.

Tested on linux x64 test/jdk/java/nio + test/jdk/java/io

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-8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath (Enhancement - P5)

Reviewers

Jaikiran Pai (@jaikiran - Reviewer)
Alan Bateman (@AlanBateman - Reviewer)
Brian Burkhalter (@bplb - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20155

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

Using diff file

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

Webrev

Link to Webrev Comment

…toUnixPath

bridgekeeper · 2024-07-12T11:55:00Z

👋 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 · 2024-07-12T11:56:19Z

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

8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath

Reviewed-by: jpai, alanb, bpb

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

02be7b8: 8334495: Use FFM instead of jdk.internal.misc.Unsafe in java.desktop font implementation
bbc79a5: 8333768: Minor doc updates to java.lang.{Float, Double}
245c086: 8332600: javac uses record components source position during compilation
5f7b007: 8336346: Fix -Wzero-as-null-pointer-constant warnings in jvmciJavaClasses.cpp
4a73ed4: 8330144: Revise os::free_memory()
35df48e: 8335860: compiler/vectorization/TestFloat16VectorConvChain.java fails with non-standard AVX/SSE settings
7bf5313: 8335480: Only deoptimize threads if needed when closing shared arena
1b83bd9: 8336661: Parallel: Remove stacks_empty assert in PSScavenge::invoke
72297d2: 8317720: RISC-V: Implement Adler32 intrinsic
21a6cf8: 8336587: failure_handler lldb command times out on macosx-aarch64 core file
... and 56 more: https://git.openjdk.org/jdk/compare/9b6f6c5c9dd6d0fbb056e8d84c3a0888a3320edf...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 · 2024-07-12T11:56:48Z

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

turbanoff · 2024-07-12T11:57:33Z

BTW, after my changes, implementations of sun.nio.fs.UnixFileSystemProvider#newFileChannel and sun.nio.fs.UnixFileSystemProvider#newByteChannel are now identical too. Should we just call newFileChannel from newByteChannel ?

AlanBateman · 2024-07-14T07:52:40Z

BTW, after my changes, implementations of sun.nio.fs.UnixFileSystemProvider#newFileChannel and sun.nio.fs.UnixFileSystemProvider#newByteChannel are now identical too. Should we just call newFileChannel from newByteChannel ?

The other way around, meaning it would okay for newByteChannel to call newFileChannel.

…toUnixPath newFileChannel and newByteChannel methods now contains exactly the same code. reuse one from another

AlanBateman · 2024-07-16T13:48:18Z

Are you planning to create a JBS issue for this cleanup?

mlbridge · 2024-07-17T19:38:57Z

Webrevs

00: Full (8da8c646)

jaikiran

Looks OK to me, but please wait for another review from someone in this area.
Have relevant tier tests been run after this change?

AlanBateman · 2024-07-18T06:44:22Z

Have relevant tier tests been run after this change?

I'm running the tests with the change because I don't know if Andrey is able to run tier2 on Linux/macOS (which are impacted by the change).

Update: No issues with tier1 and tier2.

turbanoff · 2024-07-19T05:53:10Z

/integrate

openjdk · 2024-07-19T05:54:26Z

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

902bada: 8234071: JTable.AUTO_RESIZE_LAST_COLUMN acts like AUTO_RESIZE_ALL_COLUMNS
1b9270a: 8328723: IP Address error when client enables HTTPS endpoint check on server socket
330e520: 8028127: Regtest java/security/Security/SynchronizedAccess.java is incorrect
39f4476: 8334772: Change Class::signers to an explicit field
902c2af: 8336585: BoundAttribute.readEntryList not type-safe
b44632a: 8336588: Ensure Transform downstream receives upstream start items only after downstream started
02be7b8: 8334495: Use FFM instead of jdk.internal.misc.Unsafe in java.desktop font implementation
bbc79a5: 8333768: Minor doc updates to java.lang.{Float, Double}
245c086: 8332600: javac uses record components source position during compilation
5f7b007: 8336346: Fix -Wzero-as-null-pointer-constant warnings in jvmciJavaClasses.cpp
... and 62 more: https://git.openjdk.org/jdk/compare/9b6f6c5c9dd6d0fbb056e8d84c3a0888a3320edf...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-07-19T05:54:34Z

@turbanoff Pushed as commit f5871df.

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

[PATCH] Remove UnixFileSystemProvider.checkPath in favor of UnixPath.…

44d0d56

…toUnixPath

openjdk bot added the nio nio-dev@openjdk.org label Jul 12, 2024

[PATCH] Remove UnixFileSystemProvider.checkPath in favor of UnixPath.…

8da8c64

…toUnixPath newFileChannel and newByteChannel methods now contains exactly the same code. reuse one from another

turbanoff changed the title ~~[PATCH] Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath~~ 8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath Jul 17, 2024

openjdk bot added the rfr Pull request is ready for review label Jul 17, 2024

jaikiran approved these changes Jul 18, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 18, 2024

AlanBateman approved these changes Jul 18, 2024

View reviewed changes

bplb approved these changes Jul 18, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jul 19, 2024

openjdk bot closed this Jul 19, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath #20155

8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath #20155

Uh oh!

turbanoff commented Jul 12, 2024 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Jul 12, 2024

Uh oh!

openjdk bot commented Jul 12, 2024 •

edited

Loading

Uh oh!

openjdk bot commented Jul 12, 2024

Uh oh!

turbanoff commented Jul 12, 2024 •

edited

Loading

Uh oh!

AlanBateman commented Jul 14, 2024

Uh oh!

AlanBateman commented Jul 16, 2024

Uh oh!

mlbridge bot commented Jul 17, 2024

Uh oh!

jaikiran left a comment

Uh oh!

AlanBateman commented Jul 18, 2024 •

edited

Loading

Uh oh!

turbanoff commented Jul 19, 2024

Uh oh!

openjdk bot commented Jul 19, 2024

Uh oh!

openjdk bot commented Jul 19, 2024

Uh oh!

Uh oh!

	UnixPath checkPath(Path obj) {
	if (obj == null)
	throw new NullPointerException();
	if (!(obj instanceof UnixPath))
	throw new ProviderMismatchException();
	return (UnixPath)obj;
	}

	// Checks that the given file is a UnixPath
	static UnixPath toUnixPath(Path obj) {
	if (obj == null)
	throw new NullPointerException();
	if (!(obj instanceof UnixPath))
	throw new ProviderMismatchException();
	return (UnixPath)obj;
	}

8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath #20155

8336675: Remove UnixFileSystemProvider.checkPath in favor of UnixPath.toUnixPath #20155

Uh oh!

Conversation

turbanoff commented Jul 12, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Jul 12, 2024

Uh oh!

openjdk bot commented Jul 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Jul 12, 2024

Uh oh!

turbanoff commented Jul 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AlanBateman commented Jul 14, 2024

Uh oh!

AlanBateman commented Jul 16, 2024

Uh oh!

mlbridge bot commented Jul 17, 2024

Webrevs

Uh oh!

jaikiran left a comment

Choose a reason for hiding this comment

Uh oh!

AlanBateman commented Jul 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

turbanoff commented Jul 19, 2024

Uh oh!

openjdk bot commented Jul 19, 2024

Uh oh!

openjdk bot commented Jul 19, 2024

Uh oh!

Uh oh!

turbanoff commented Jul 12, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Jul 12, 2024 •

edited

Loading

turbanoff commented Jul 12, 2024 •

edited

Loading

AlanBateman commented Jul 18, 2024 •

edited

Loading