8376842: Reorganize ZipCoder hierarchies to handle UTF8 in the base classes#30640
Open
eirbjo wants to merge 5 commits intoopenjdk:masterfrom
Open
8376842: Reorganize ZipCoder hierarchies to handle UTF8 in the base classes#30640eirbjo wants to merge 5 commits intoopenjdk:masterfrom
eirbjo wants to merge 5 commits intoopenjdk:masterfrom
Conversation
…e new subclass CharsetZipCoder handles arbitrary charsets
|
👋 Welcome back eirbjo! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR reorganizes
java.util.zip.ZipCoderclass hierarchies to handle UTF-8 in the base class and move support for general charsets down to a subclass. This better reflects reality where most ZIP files are encoded using UTF-8.The motivation can be summarized as:
See core-libs-dev discussion for details: https://mail.openjdk.org/pipermail/core-libs-dev/2026-January/158281.html
I have tried to not move methods around too much, making the side-by-side diff when ignoring whitespace easier to review. We can discuss further cleanups and reorganizaton if so desired.
It may be useful to review commits individually. The first commit fe4a627 moves some methods out the way for the second commit 2926398.
This PR also includes the similar change to the
ZipFileSystemimplementation of ZipCoder to keep these aligned. Could be pulled out to a separate PR if reviewers want to focus on a single area per PR.Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30640/head:pull/30640$ git checkout pull/30640Update a local copy of the PR:
$ git checkout pull/30640$ git pull https://git.openjdk.org/jdk.git pull/30640/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 30640View PR using the GUI difftool:
$ git pr show -t 30640Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30640.diff
Using Webrev
Link to Webrev Comment