8300228: ModuleReader.find on exploded module throws if resource name maps to invalid file path

[AlanBateman]

The ModuleReader implementation for exploded modules maps resource names to file paths. A small oversight is that it doesn't handle InvalidPathException which is thrown when the resource name maps to something that can't be parsed as a file path. This has a knock on impact to Class/ClassLoader getResourceXXX and other usages of ModuleReader.

The existing ModuleReaderTest is updated to include additional resource names to test. I've also moved @Test annotation to the test methods so that it's a bit clearer which are the test methods in this source 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-8300228: ModuleReader.find on exploded module throws if resource name maps to invalid file path

Reviewers

• Jaikiran Pai (@jaikiran - Reviewer)
• Chris Hegarty (@ChrisHegarty - Reviewer)
• Christian Stein (@sormuras - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12035

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

Using diff file

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

[bridgekeeper]

👋 Welcome back alanb! 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]

@AlanBateman 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]

Webrevs

• 00: Full (0614f79d)

[jaikiran]

Looks good to me. Should we also add a C:/java (one with a forward slash) to the new junk resource names added in this test, to exercise the path where a forward slash is present in a resource name which also has the Windows disallowed : character in it?

[openjdk]

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

8300228: ModuleReader.find on exploded module throws if resource name maps to invalid file path

Reviewed-by: jpai, chegar, cstein

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

• 85d70ac: Merge
• e15bdc5: 8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs
• b7fb8ef: 8299323: Allow extended registers for cmpw
• 07d5753: 8300168: Typo in AccessibleJTableHeaderEntry javadoc

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

[ChrisHegarty]

LGTM

[AlanBateman]

Should we also add a C:/java (one with a forward slash) to the new junk resource names added in this test, to exercise the path where a forward slash is present in a resource name which also has the Windows disallowed : character in it?

C:/java is a legal file path so there wouldn't be InvalidPathException for that case. The reason that resource name will be rejected on Windows is because it has a root component. So yes, it could be added as a test case, just wouldn't add any more test coverage to the existing tests.

[jaikiran]

So yes, it could be added as a test case, just wouldn't add any more test coverage to the existing tests.

Thank you for the explanation, Alan. The current state of the test, in the PR, looks fine to me then.

[AlanBateman]

/integrate

[openjdk]

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

• 4cd166f: 8300125: Serial: Remove unused Generation::reset_saved_marks
• 85d70ac: Merge
• e15bdc5: 8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs
• b7fb8ef: 8299323: Allow extended registers for cmpw
• 07d5753: 8300168: Typo in AccessibleJTableHeaderEntry javadoc

Your commit was automatically rebased without conflicts.

[openjdk]

@AlanBateman Pushed as commit fb147aa.

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