8129572: Cleanup usage of getResourceAsStream in jaxp

[akashche]

Please review a backport of a JAXP cleanup.

Original commit 17b47acf5b3d in jdk9.

Commit 4ebbfc9 in jdk11u-dev.

This cleanup should allow to backport other JAXP changes (like JDK-8163121) easier.

All code changes apply cleanly (with reshuffled paths) except LSSerializerTest.java that was excluded. LSSerializerTest.java is not present in 8u, it was added with JDK-8043084 (not public, jdk9 commit 29ba77ad2a87).

Testing:

• jtreg:javax/xml/jaxp
• jck:api/javax_xml

---

Progress

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

Issue

• JDK-8129572: Cleanup usage of getResourceAsStream in jaxp

Reviewers

• Andrew John Hughes (@gnu-andrew - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk8u-dev pull/4/head:pull/4
$ git checkout pull/4

Update a local copy of the PR:
$ git checkout pull/4
$ git pull https://git.openjdk.java.net/jdk8u-dev pull/4/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk8u-dev/pull/4.diff

[bridgekeeper]

👋 Welcome back akasko! 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.

[mlbridge]

Webrevs

• 03: Full - Incremental (0c0854a8)
• 02: Full - Incremental (24601c81)
• 01: Full - Incremental (2bf03c91)
• 00: Full (f0cd3f72)

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[gnu-andrew]

This looks fine to me; only difference from the 11u patch, other than the paths, is the missing test change, which just adds some println statements to it. While it might be nice to bring in all those additional tests for 8u, JDK-8043084 is not a mandatory prerequisite of this change.

Please flag with jdk8u-fix-request.

[akashche]

Thanks for the review! I've marked the issue for approval.

[akashche]

Thanks for the approval! Should this PR be somehow marked as "reviewed" or can I go forward and integrate it?

[gnu-andrew]

Marked as reviewed. I was holding off as SKARA doesn't yet check for jdk8u-fix-yes (see SKARA-1199)

[openjdk]

@akashche This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8129572: Cleanup usage of getResourceAsStream in jaxp

Reviewed-by: andrew

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

• 969f31e: Merge
• 0183285: Added tag jdk8u332-b05 for changeset 2a92df021686
• 3a7c382: 8041523: Xerces Update: Serializer improvements from Xalan
• 2bbec15: 8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target
• 25693fa: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
• 5fcfb7a: 8194154: System property user.dir should not be changed
• 94cb2ef: 8076190: Customizing the generation of a PKCS12 keystore
• b5bcf6c: 8279669: test/jdk/com/sun/jdi/TestScaffold.java uses wrong condition

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.

[akashche]

/integrate

[openjdk]

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

• 969f31e: Merge
• 0183285: Added tag jdk8u332-b05 for changeset 2a92df021686
• 3a7c382: 8041523: Xerces Update: Serializer improvements from Xalan
• 2bbec15: 8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target
• 25693fa: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
• 5fcfb7a: 8194154: System property user.dir should not be changed
• 94cb2ef: 8076190: Customizing the generation of a PKCS12 keystore
• b5bcf6c: 8279669: test/jdk/com/sun/jdi/TestScaffold.java uses wrong condition

Your commit was automatically rebased without conflicts.

[openjdk]

@akashche Pushed as commit bb69732.

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