Skip to content

8294626: Improve URL protocol lower casing #10506

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

Closed
wants to merge 7 commits into from

Conversation

cl4es
Copy link
Member

@cl4es cl4es commented Sep 30, 2022

Move a simple utility method from URL to the shared sun.net.util.URLUtil class, rename it for clarity and enhance it so that it returns the string literal if the protocol matches one of the tested variants. This helps reduce dependencies from bootstrap code on Locale while improving the performance and allocation pressure in certain applications.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10506

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2022

👋 Welcome back redestad! 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 Pull request is ready for review label Sep 30, 2022
@openjdk
Copy link

openjdk bot commented Sep 30, 2022

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

  • net

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 net net-dev@openjdk.org label Sep 30, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2022

Webrevs

@AlanBateman
Copy link
Contributor

From a maintenance point of view it might be better to keep all special handling of these built-in schemes in URL rather than having them in two places. I'm thinking of isOverrideable, DefaultFactory.createURLStreamHandler and probably others. It's not a big issue, just a bit surprising to have special handling in code in two packages, if you see what I mean.

@dfuch
Copy link
Member

dfuch commented Sep 30, 2022

I agree with Alan.

@cl4es
Copy link
Member Author

cl4es commented Sep 30, 2022

URLUtil already exists, is used during bootstrap from non-java.net packages and would profit from reusing this lower case method. Making the method in URL public is a non-starter. I'd love having module-scoped visibility modifier (so we could share static utility methods without resorting to non-exported utility classes), but without that this was the best option to get the full benefit without duplicating the logic in places like URLUtil.urlNoFragString

@cl4es
Copy link
Member Author

cl4es commented Sep 30, 2022

Should be all cleaned up now.

Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

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

LGTM now.

@openjdk
Copy link

openjdk bot commented Sep 30, 2022

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

8294626: Improve URL protocol lower casing

Reviewed-by: dfuchs

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

  • 64da862: 8287597: List all preview features on the javadoc PREVIEW page
  • b4e1e41: 8293000: Review running times of jshell regression tests
  • 6d83482: 8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts
  • 6974978: 8294521: Parallel: Remove unused field in UpdateDensePrefixAndCompactionTask
  • 81fda1b: 8294569: Remove CardTable::_last_valid_index
  • 7c60e6d: 8293770: RISC-V: Reuse runtime call trampolines
  • 9dce865: 8294115: JNI local refs exceeds capacity warning in NetworkInterface::getAll
  • b030c7d: 8225235: Unused field defaultIndex in NetworkInterface
  • a07975b: 8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output
  • 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
  • ... and 43 more: https://git.openjdk.org/jdk/compare/bc12e9553d30fbf849b5a681137a231ff083d901...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 Sep 30, 2022
@AlanBateman
Copy link
Contributor

URLUtil already exists, is used during bootstrap from non-java.net packages and would profit from reusing this lower case method. Making the method in URL public is a non-starter. I'd love having module-scoped visibility modifier (so we could share static utility methods without resorting to non-exported utility classes), but without that this was the best option to get the full benefit without duplicating the logic in places like URLUtil.urlNoFragString

The update looks okay, I see Daniel has approved. Although special casing in a lower casing method is okay I think the main thing we have to avoid is doing special casing for built-in protocol handlers in several places, only because there are so many issues that can arise if we change it in one place and not another. There are also changes in the works that need to do more validation with the built-in protocol handlers.

@cl4es
Copy link
Member Author

cl4es commented Sep 30, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 30, 2022

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

  • 052a924: 8294293: Remove unused _width and _newlines field in outputStream
  • c2ce43c: 8291021: JFR: Only one finished state in ChunkHeader class
  • f015733: 8294357: (tz) Update Timezone Data to 2022d
  • 64da862: 8287597: List all preview features on the javadoc PREVIEW page
  • b4e1e41: 8293000: Review running times of jshell regression tests
  • 6d83482: 8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts
  • 6974978: 8294521: Parallel: Remove unused field in UpdateDensePrefixAndCompactionTask
  • 81fda1b: 8294569: Remove CardTable::_last_valid_index
  • 7c60e6d: 8293770: RISC-V: Reuse runtime call trampolines
  • 9dce865: 8294115: JNI local refs exceeds capacity warning in NetworkInterface::getAll
  • ... and 46 more: https://git.openjdk.org/jdk/compare/bc12e9553d30fbf849b5a681137a231ff083d901...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 30, 2022

@cl4es Pushed as commit 3efbd5f.

💡 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
integrated Pull request has been integrated net net-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

4 participants