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

8273935: (zipfs) Files.getFileAttributeView() throws UOE instead of returning null when view not supported #5579

Closed
wants to merge 5 commits into from

Conversation

LanceAndersen
Copy link
Contributor

@LanceAndersen LanceAndersen commented Sep 19, 2021

Hi all,

Please review this patch which addresses the issue where Zip FS will throw a UOE instead of returning null when Files.getFileAttributeView() is invoked and the view not supported.

Mach5 tiers1 - tier3 are clean.

Best
Lance


Progress

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

Issue

  • JDK-8273935: (zipfs) Files.getFileAttributeView() throws UOE instead of returning null when view not supported

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5579

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 19, 2021

👋 Welcome back lancea! 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 openjdk bot added the rfr label Sep 19, 2021
@LanceAndersen
Copy link
Contributor Author

@LanceAndersen LanceAndersen commented Sep 20, 2021

/cc core-libs nio-dev

@openjdk
Copy link

@openjdk openjdk bot commented Sep 20, 2021

@LanceAndersen The following labels will be automatically applied to this pull request:

  • core-libs
  • nio

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

@openjdk openjdk bot added nio core-libs labels Sep 20, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 20, 2021

Webrevs

@@ -713,7 +713,7 @@ public void remove() {
if (type == FileOwnerAttributeView.class)
return (V)new ZipPosixFileAttributeView(this,true);
}
throw new UnsupportedOperationException("view <" + type + "> is not supported");
return (V) null;
Copy link
Contributor

@AlanBateman AlanBateman Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume (V) isn't needed here.

Copy link
Contributor Author

@LanceAndersen LanceAndersen Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it is not and can also probably be removed from open/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java at some point

@BeforeTest
public void setup() throws IOException {
Files.deleteIfExists(ZIP_FILE);
Entry e0 = Entry.of(ZIP_ENTRY, ZipEntry.DEFLATED,
Copy link
Contributor

@AlanBateman AlanBateman Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why this is named "e0"?

Copy link
Contributor Author

@LanceAndersen LanceAndersen Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. Historically that was the variable name format used in some of the Zip FS tests. I changed the name to entry

protected Object[][] zipfsMap() {
return new Object[][]{
{Map.of()},
{ Map.of("enablePosixFileAttributes", "true")}
Copy link
Contributor

@AlanBateman AlanBateman Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nit, inconsistent formatting with L81 vs. L82.

Copy link
Contributor Author

@LanceAndersen LanceAndersen Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks for catching that.

*/
@Test(dataProvider = "zipfsMap")
public void testPosixAttributeView(Map<String, String> env) throws Exception {

Copy link
Contributor

@AlanBateman AlanBateman Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spurious blank line.

Copy link
Contributor Author

@LanceAndersen LanceAndersen Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 20, 2021

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

8273935: (zipfs) Files.getFileAttributeView() throws UOE instead of returning null when view not supported

Reviewed-by: alanb, bpb, sgehwolf

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

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 label Sep 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 20, 2021

@LanceAndersen The core-libs label was already applied.
The nio label was already applied.

Path entry = fs.getPath(ZIP_ENTRY);
PosixFileAttributeView view = Files.getFileAttributeView(entry,
PosixFileAttributeView.class);
System.out.printf("View returned: %s%n", view);
Copy link
Contributor

@jerboaa jerboaa Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be useful to also print whether the environment is empty:
Suggestion: System.out.printf("View returned: %s, (empty_env=%s)%n", view, env.isEmpty());

Copy link
Contributor Author

@LanceAndersen LanceAndersen Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, you can see that whether the Map is/is not empty in the jtr file for the test run (based on the DataProvider Properties for a given run).

However, per your suggestion, I tweaked the test to dump the Map values.

bplb
bplb approved these changes Sep 20, 2021
bplb
bplb approved these changes Sep 20, 2021
bplb
bplb approved these changes Sep 20, 2021
@LanceAndersen
Copy link
Contributor Author

@LanceAndersen LanceAndersen commented Sep 21, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 21, 2021

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

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Sep 21, 2021

@LanceAndersen Pushed as commit 161fdb4.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs integrated nio
4 participants