-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8298046: Fix hidden but significant trailing whitespace in properties files for serviceability code #11490
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
Conversation
… files for serviceability code
|
A note to reviewers: This PR has been automatically generated by converting all trailing spaces in key-value lines (ignoring empty lines and comments) in the property files into unicode sequences. In a way, this is a no-op, converting one representation of the already existing space into another. But I think that most of these instances are likely to be bugs, and should thus be fixed. I think the easiest way to fix those instances is to use the Github "suggestion" review mechanism: But you can also come with review feedback like "remove trailing spaces for all files in directory XXX" and I'll fix that for you. |
|
👋 Welcome back ihse! A progress list of the required criteria for merging this PR into |
Webrevs
|
src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
Outdated
Show resolved
Hide resolved
src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
Outdated
Show resolved
Hide resolved
src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
Outdated
Show resolved
Hide resolved
src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
Outdated
Show resolved
Hide resolved
src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
Outdated
Show resolved
Hide resolved
src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
Outdated
Show resolved
Hide resolved
src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
Outdated
Show resolved
Hide resolved
src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
Outdated
Show resolved
Hide resolved
src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
Outdated
Show resolved
Hide resolved
src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
Outdated
Show resolved
Hide resolved
|
@magicus This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration! |
|
@magicus This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the |
|
It appears that the suggested changes could be include to resume this issue. |
|
/open |
|
@magicus This pull request is now open |
kevinjwalls
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The suggestions from Chris look good, i.e. the trailing \u0020 were unintentional.
|
@magicus this pull request can not be integrated into git checkout properties-eol-serviceability
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
|
@magicus This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration! |
|
@magicus This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the |
|
What was the reason for not moving forward with this PR? |
Me going on medical leave most of 2023... :-/ I intend to get this done now. /open |
|
@magicus This pull request is now open |
|
@magicus 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: 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 9 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
Show resolved
Hide resolved
src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
Show resolved
Hide resolved
|
Several of the original problems has been resolved since this PR was opened, but some remain. I believe this is now ready for integration, but I'd like to get a re-review from @plummercj. |
|
/integrate |
|
Going to push as commit b02599d.
Your commit was automatically rebased without conflicts. |
According to the specification trailing whitespaces in the values of properties files are (somewhat surprisingly) actually significant.
We have multiple files in the JDK with trailing whitespaces in the values. For most of this files, this is likely incorrect and due to oversight, but in a few cases it might actually be intended (like "The value is: ").
After a discussion in the PR for JDK-8295729, the consensus was to replace valid trailing spaces with the corresponding unicode sequence,
\u0020. (And of course remove non-wanted trailing spaces.)Doing so has a dual benefit:
It makes it clear to everyone reading the code that there is a trailing space and it is intended
It will allow us to remove all actual trailing space characters, and turn on the corresponding check in jcheck to keep the properties files, just like all other source code files, free of trailing spaces.
Ultimately, the call of whether a trailing space is supposed to be there, or is a bug, lies with the respective component teams owning these files. Thus I have split up the set of properties files with trailing spaces in several groups, to match the JDK teams, and open a JBS issue for each of them. This issue is for code I believe belong with the serviceability team.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/11490/head:pull/11490$ git checkout pull/11490Update a local copy of the PR:
$ git checkout pull/11490$ git pull https://git.openjdk.org/jdk.git pull/11490/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 11490View PR using the GUI difftool:
$ git pr show -t 11490Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11490.diff
Webrev
Link to Webrev Comment