8351740: Clean up some code around initialization of encoding properties #24463

stuart-marks · 2025-04-04T23:42:26Z

Some of the code that creates various encoding properties at JVM initialization time, such as file.encoding and native.encoding, could use some cleaning up. Cleanup is fairly minimal and should be mostly behavior-preserving. Changes include the following:

In the java_props.h and java_props_md.c files, add documentation and asserts that the sprops.encoding and sprops.sun_jnu_encoding members are always set to non-NULL by the platform-specific code.
In SystemProps.java, remove a null check that is now extraneous based on the above assertion.
In SystemProps.java, rearrange logic (with no behavior change) around handling of the "COMPAT" value for the file.encoding property.
In SystemProps.Raw, rename the platform properties array index from _file_encoding_NDX to _native_encoding_NDX.
In SystemProps.Raw.cmdProperties(), adjust the HashMap size computation. This should actually avoid resizing of the HashMap (unlike the earlier code).
Adjust various comments in several places for clarity and correctness.

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-8351740: Clean up some code around initialization of encoding properties (Enhancement - P4)

Reviewers

Naoto Sato (@naotoj - Reviewer)
Alan Bateman (@AlanBateman - Reviewer) Review applies to e8f3d35e
Roger Riggs (@RogerRiggs - Reviewer) Review applies to e8f3d35e

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24463

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…ties

of SystemProps.java in order to reduce bulkiness of the diffs.

bridgekeeper · 2025-04-04T23:42:53Z

👋 Welcome back smarks! 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 · 2025-04-04T23:43:43Z

@stuart-marks 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:

8351740: Clean up some code around initialization of encoding properties

Reviewed-by: naoto, alanb, rriggs

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

af5db51: 8353641: Deprecate core library permission classes for removal
60f3d60: 8351110: ImageIO.write for JPEG can write corrupt JPEG for certain thumbnail dimensions
dc249be: 8350462: MethodTypeForm.LF_INTERPRET can cache the MemberName instead
... and 177 more: https://git.openjdk.org/jdk/compare/e6fe2490bc48acf01ccf81b38d578d20ed09f238...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 · 2025-04-04T23:44:13Z

@stuart-marks 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 · 2025-04-04T23:46:58Z

Webrevs

naotoj

Thanks for the clean-up. Changing the index name from _file_encoding_NDX to _native_encoding_NDX really helps.

src/java.base/share/native/libjava/System.c

naotoj

LGTM

AlanBateman

Renaming the index is fine, the comments/asserts look okay, I assume you've bump the copyright headers before integrating.

AlanBateman · 2025-04-10T08:31:40Z

src/java.base/share/classes/jdk/internal/util/SystemProps.java

-        var nativeEncoding = ((raw.propDefault(Raw._file_encoding_NDX) == null)
-                ? raw.propDefault(Raw._sun_jnu_encoding_NDX)
-                : raw.propDefault(Raw._file_encoding_NDX));
+        var nativeEncoding = raw.propDefault(Raw._native_encoding_NDX);


I'd prefer not see "var" here, only because it's not immediately clear that nativeEncoding is a String.

I changed this var to String and also another occurrence a few lines below.

Also, I updated copyrights.

stuart-marks · 2025-04-10T19:34:43Z

Need re-review on this after my updates, if anyone gets a chance. Thanks.

stuart-marks · 2025-04-10T21:42:17Z

/integrate

openjdk · 2025-04-10T21:43:14Z

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

e35f67b: 8285888: Clarify that java.net.http.HttpClient do NOT support Digest authentication
7382ea1: 8354230: Wrong boot jdk for alpine-linux-x64 in GHA
4890b74: 8354216: Small cleanups relating to Log.DiagnosticHandler
... and 182 more: https://git.openjdk.org/jdk/compare/e6fe2490bc48acf01ccf81b38d578d20ed09f238...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-04-10T21:43:21Z

@stuart-marks Pushed as commit 83c7d3b.

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

stuart-marks added 6 commits March 11, 2025 22:09

8351740: Clean up some logic around initialization of encoding proper…

85b8941

…ties

Move platformProperties() native method declaration back to the bottom

b82f813

of SystemProps.java in order to reduce bulkiness of the diffs.

Merge branch 'master' into JDK-8351740-encoding-properties-cleanup

4c2c212

A couple small tweaks.

7a9320e

WIP: add some non-null asserts and comments on sprops encoding members

50d0957

More minor cleanups, reversion of some extra changes.

f5ba54f

openjdk bot added the rfr Pull request is ready for review label Apr 4, 2025

openjdk bot added the core-libs [email protected] label Apr 4, 2025

naotoj reviewed Apr 7, 2025

View reviewed changes

src/java.base/share/native/libjava/System.c Outdated Show resolved Hide resolved

Fix comment from file.encoding to native.encoding

e8f3d35

naotoj approved these changes Apr 9, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 9, 2025

AlanBateman approved these changes Apr 10, 2025

View reviewed changes

RogerRiggs approved these changes Apr 10, 2025

View reviewed changes

Update copyrights; change var to String in a couple places.

6142027

openjdk bot removed the ready Pull request is ready to be integrated label Apr 10, 2025

naotoj approved these changes Apr 10, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 10, 2025

openjdk bot added the integrated Pull request has been integrated label Apr 10, 2025

openjdk bot closed this Apr 10, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8351740: Clean up some code around initialization of encoding properties #24463

8351740: Clean up some code around initialization of encoding properties #24463

Uh oh!

stuart-marks commented Apr 4, 2025 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Apr 4, 2025

Uh oh!

openjdk bot commented Apr 4, 2025 •

edited

Loading

Uh oh!

openjdk bot commented Apr 4, 2025

Uh oh!

mlbridge bot commented Apr 4, 2025 •

edited

Loading

Uh oh!

naotoj left a comment

Uh oh!

Uh oh!

naotoj left a comment

Uh oh!

AlanBateman left a comment

Uh oh!

AlanBateman Apr 10, 2025

Uh oh!

stuart-marks Apr 10, 2025

Uh oh!

stuart-marks Apr 10, 2025

Uh oh!

stuart-marks commented Apr 10, 2025

Uh oh!

stuart-marks commented Apr 10, 2025

Uh oh!

openjdk bot commented Apr 10, 2025

Uh oh!

openjdk bot commented Apr 10, 2025

Uh oh!

Uh oh!

8351740: Clean up some code around initialization of encoding properties #24463

8351740: Clean up some code around initialization of encoding properties #24463

Uh oh!

Conversation

stuart-marks commented Apr 4, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Apr 4, 2025

Uh oh!

openjdk bot commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Apr 4, 2025

Uh oh!

mlbridge bot commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

naotoj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

naotoj left a comment

Choose a reason for hiding this comment

Uh oh!

AlanBateman left a comment

Choose a reason for hiding this comment

Uh oh!

AlanBateman Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

stuart-marks Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

stuart-marks Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

stuart-marks commented Apr 10, 2025

Uh oh!

stuart-marks commented Apr 10, 2025

Uh oh!

openjdk bot commented Apr 10, 2025

Uh oh!

openjdk bot commented Apr 10, 2025

Uh oh!

Uh oh!

stuart-marks commented Apr 4, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Apr 4, 2025 •

edited

Loading

mlbridge bot commented Apr 4, 2025 •

edited

Loading