Skip to content

Conversation

@stuart-marks
Copy link
Member

@stuart-marks stuart-marks commented Apr 17, 2025

  • Windows and Unix: set sprops.stdin_encoding if connected to a console
  • Add specs for stdin.encoding
  • Adjust specs to change "undefined" to "unspecified"
  • Rewrite System.in spec to refer to new property and to clarify usage with classes that perform encoding
  • Update property test

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Change requires CSR request JDK-8355357 to be approved
  • Commit message must refer to an issue

Issues

  • JDK-8350703: Add standard system property stdin.encoding (Enhancement - P4)
  • JDK-8355357: Add standard system property stdin.encoding (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24738

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 17, 2025

👋 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
Copy link

openjdk bot commented Apr 17, 2025

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

8350703: Add standard system property stdin.encoding

Reviewed-by: naoto, alanb

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 138 new commits pushed to 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
Copy link

openjdk bot commented Apr 17, 2025

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

@stuart-marks stuart-marks marked this pull request as ready for review April 22, 2025 22:59
@stuart-marks
Copy link
Member Author

/csr

@openjdk openjdk bot added rfr Pull request is ready for review csr Pull request needs approved CSR before integration labels Apr 22, 2025
@openjdk
Copy link

openjdk bot commented Apr 22, 2025

@stuart-marks has indicated that a compatibility and specification (CSR) request is needed for this pull request.

@stuart-marks please create a CSR request for issue JDK-8350703 with the correct fix version. This pull request cannot be integrated until the CSR request is approved.

@mlbridge
Copy link

mlbridge bot commented Apr 22, 2025

Webrevs

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

Looks good. Is a corresponding CSR being drafted?

// purposes, substitute them with "sun.*" if they don't exist. If "sun.*" aren't
// available either, fall back to "native.encoding".
// Encoding properties for stdin, stdout, and stderr. For stdout and stderr,
// check "sun.*.encoding" properties before falling back to the
Copy link
Member

Choose a reason for hiding this comment

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

Could explain about sun* a bit more (just for compatibility) and stdin.encoding is free from it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the comment could be clearer. As I understand it, it's just trying to saying that the legacy sun.stdout.encoding/sun.stderr.encoding properties for stdout/stderr only, no equivalent for stdin.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah the comment was a bit terse so I tried to clarify it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, it looks okay now.

LCID userDefaultUILCID = MAKELCID(userDefaultUILang, SORTIDFROMLCID(userDefaultLCID));

{
HANDLE hStdIn;
Copy link
Member

Choose a reason for hiding this comment

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

Instead of creating a new variable, hStdOutErr could be reused with a proper name.

Copy link
Member Author

Choose a reason for hiding this comment

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

OK I merged the local variables into a single one named hStdHandle. I'm not sure that's the best name. I surmise that the h prefix is "Hungarian Notation" to indicate that it's a handle, though it makes the name kind of redundant.

@AlanBateman
Copy link
Contributor

Overall I think this looks quite good. Follow-up PR can update APIs beyond System to reference it.

@stuart-marks
Copy link
Member Author

OK thanks. Working on the CSR.

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Apr 25, 2025
@stuart-marks
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2025

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 25, 2025
@openjdk openjdk bot closed this Apr 25, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 25, 2025
@openjdk openjdk bot removed the rfr Pull request is ready for review label Apr 25, 2025
@openjdk
Copy link

openjdk bot commented Apr 25, 2025

@stuart-marks Pushed as commit 15f42e3.

💡 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

core-libs [email protected] integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants