8336844: ZipConstants64 defines duplicate constants EXTID_ZIP64 and ZIP64_EXTID

[cushon]

This change deduplicates constants in ZipConstants64 for the Zip64 Extended Information Extra Field Header ID (see APPNOTE.TXT 4.5.3).

I think there are arguments for consolidating on either EXTID_ZIP64 or ZIP64_EXTID. The PR currently consolidates on EXTID_ZIP64, ZIP64_EXTID is also an option if there's a preference for that.

I noticed this while working on a zip64 bug in JDK-8328995, I was reviewing places that handled zip64 extra fields and initially missed some because I was only looking at one of the constants.

---

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-8336844: ZipConstants64 defines duplicate constants EXTID_ZIP64 and ZIP64_EXTID (Enhancement - P4)

Reviewers

• Jaikiran Pai (@jaikiran - Reviewer)
• Vyom Tewari (@vyommani - Committer)
• Lance Andersen (@LanceAndersen - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20264

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

8336844: ZipConstants64 defines duplicate constants EXTID_ZIP64 and ZIP64_EXTID

Reviewed-by: jpai, vtewari, lancea

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:

• ad498f5: 8335896: Source launcher should set TCCL
• b21cb44: 8329398: Links in InetAddress class description show "#format"
• c5b7af7: 8336692: Redo fix for JDK-8284620
• 491b9f5: 8336706: Optimize LocalDate.toString with StringBuilder.repeat

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.

[openjdk]

@cushon 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.

[mlbridge]

Webrevs

• 01: Full - Incremental (48bb222e)
• 00: Full (3b975c24)

[jaikiran]

Hello Liam, the changes look fine to me. Choosing EXTID_ZIP64 constant in preference of the other seems OK too, since that constant is more closer in code location with the other extra field header ids.

Some of these files require a copyright year update. Please update those before integrating.

[cushon]

I updated the copyright dates. Thanks for the review!

[jaikiran]

The changes look good to me. Although a trivial change, it would be good to wait for Lance to review this before integrating.

[vyommani]

Looks OK to me.

[LanceAndersen]

The change looks fine.

[cushon]

/integrate

[openjdk]

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

• c1c9704: 8336479: Provide Process.waitFor(Duration)
• 7ea7730: 8332551: Test vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001/TestDescription.java timed out
• c740e1e: 8333772: Incorrect Kerberos behavior when udp_preference_limit = 0
• 0725eb1: 8336753: Don't run serviceability/sa/ClhsdbDumpheap.java with -Xcomp
• c3226aa: 8334394: Race condition in Class::protectionDomain
• 92de2b2: 8336039: Doccheck: HTML warnings, broken links and missing files in java.base documentation
• 7ddd025: 4265389: JSplitPane does not support ComponentOrientation
• c1fdc04: 8336781: Erroneous exhaustivity check with boolean switch
• 0db6c15: 8336833: Endless loop in Javap ClassWriter
• 4da9915: 8333396: Use StringBuilder internally for java.text.Format.* formatting
• ... and 5 more: https://git.openjdk.org/jdk/compare/e3acf4c627c3c75f9a2ef29647daa6f4746fdc62...master

Your commit was automatically rebased without conflicts.

[openjdk]

@cushon Pushed as commit 8438c58.

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