Skip to content
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

8263202: Update Hebrew/Indonesian/Yiddish ISO 639 language codes to current #4069

Closed
wants to merge 8 commits into from

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented May 17, 2021

Please review the changes to the subject issue. java.util.Locale class has a long-standing issue for those obsolete ISO 639 languages where its normalization ends up in the obsolete codes. This change intends to flip the normalization towards the current codes, providing a system property for compatibility behavior. ResourceBundle class is also modified to load either obsolete/current bundles. For more detail, take a look at the CSR.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8263202: Update Hebrew/Indonesian/Yiddish ISO 639 language codes to current

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4069/head:pull/4069
$ git checkout pull/4069

Update a local copy of the PR:
$ git checkout pull/4069
$ git pull https://git.openjdk.java.net/jdk pull/4069/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4069

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4069.diff

@naotoj
Copy link
Member Author

naotoj commented May 17, 2021

/csr

@bridgekeeper
Copy link

bridgekeeper bot commented May 17, 2021

👋 Welcome back naoto! 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 openjdk bot added rfr Pull request is ready for review csr Pull request needs approved CSR before integration labels May 17, 2021
@openjdk
Copy link

openjdk bot commented May 17, 2021

@naotoj this pull request will not be integrated until the CSR request JDK-8267069 for issue JDK-8263202 has been approved.

@openjdk
Copy link

openjdk bot commented May 17, 2021

@naotoj The following labels will be automatically applied to this pull request:

  • awt
  • build
  • core-libs
  • i18n

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.

@openjdk openjdk bot added build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org awt client-libs-dev@openjdk.org labels May 17, 2021
@mlbridge
Copy link

mlbridge bot commented May 17, 2021

Webrevs

@erikj79
Copy link
Member

erikj79 commented May 17, 2021

I see no relevant build changes to comment on as the build label was only added because the buildtool java source was touched, so this looks ok from a build perspective.

@naotoj
Copy link
Member Author

naotoj commented May 17, 2021

/label remove build

@naotoj
Copy link
Member Author

naotoj commented May 17, 2021

I see no relevant build changes to comment on as the build label was only added because the buildtool java source was touched, so this looks ok from a build perspective.

Removed build label.

@openjdk openjdk bot removed the build build-dev@openjdk.org label May 17, 2021
@openjdk
Copy link

openjdk bot commented May 17, 2021

@naotoj
The build label was successfully removed.

* {@systemProperty java.locale.useOldISOCodes} reverts the behavior
* back to prior to Java SE 17 one. If the system property is set
* to {@code true}, those three current language codes are mapped to their
* backward compatible forms.
*
* <p>The APIs added in 1.7 map between the old and new language codes,
Copy link
Member

@JoeWang-Java JoeWang-Java May 18, 2021

Choose a reason for hiding this comment

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

This paragraph needs a rewrite as well it seems, esp. the part that states "getLanguage and toString reflect the old code" is no longer true.

Copy link
Member Author

@naotoj naotoj May 18, 2021

Choose a reason for hiding this comment

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

Good catch! In fact, I had modified this paragraph in my preliminary fix, but it slipped away somehow along the fix. Corrected the PR and CSR as well.

@@ -677,7 +678,7 @@ public void TestUninstalledISO3Names() {
}

/**
* @bug 4052404 4778440
* @bug 4052404 4778440 8263202
*/
public void TestChangedISO639Codes() {
Copy link
Member

@JoeWang-Java JoeWang-Java May 18, 2021

Choose a reason for hiding this comment

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

Could probably be simplified with a DataProvider.

Copy link
Member Author

@naotoj naotoj May 18, 2021

Choose a reason for hiding this comment

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

That would be nice, but the test is not testng based, and it would be an entire test rewrite which I would not do it at this time.

Copy link
Member

@JoeWang-Java JoeWang-Java May 19, 2021

Choose a reason for hiding this comment

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

I see. Good old test is still good.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label May 26, 2021
@openjdk
Copy link

openjdk bot commented May 26, 2021

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

8263202: Update Hebrew/Indonesian/Yiddish ISO 639 language codes to current

Reviewed-by: joehw

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

  • b33b8bc: 8267750: Incomplete fix for JDK-8267683
  • ac36b7d: 8267452: Delegate forEachRemaining in Spliterators.iterator()
  • d0d2ddc: 8267651: runtime/handshake/HandshakeTimeoutTest.java times out when dumping core
  • a98e476: 8267311: vmTestbase/gc/gctests/StringInternGC/StringInternGC.java eventually OOMEs
  • 5aa45f2: 8267403: tools/jpackage/share/FileAssociationsTest.java#id0 failed with "Error: Bundler "Mac PKG Package" (pkg) failed to produce a package"
  • c20ca42: 8267691: Change table to obsolete CriticalJNINatives in JDK 18, not 17
  • e751b7b: 8267683: rfc7301Grease8F value not displayed correctly in SSLParameters javadoc
  • 0b77359: 8224243: Add implSpec's to AccessibleObject and seal Executable
  • 594d454: 8267574: Dead code in HtmlStyle/HtmlDocletWriter
  • 2ef2450: 8263445: Duplicate key compiler.err.expected.module in compiler.properties
  • ... and 120 more: https://git.openjdk.java.net/jdk/compare/cf97252f3fd4e7bdb57271b92dd2866101d4a94b...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 openjdk bot added the ready Pull request is ready to be integrated label May 26, 2021
@naotoj
Copy link
Member Author

naotoj commented May 26, 2021

/integrate

@openjdk openjdk bot closed this May 26, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 26, 2021
@openjdk
Copy link

openjdk bot commented May 26, 2021

@naotoj Since your change was applied there have been 138 commits pushed to the master branch:

  • 9c346a1: 8266963: Remove safepoint poll introduced in 8262443 due to reentrance issue
  • 45e0597: 8264302: Create implementation for Accessibility native peer for Splitpane java role
  • 4343997: 8267708: Remove references to com.sun.tools.javadoc.**
  • f632254: 8267221: jshell feedback is incorrect when creating method with array varargs parameter
  • bf8d4a8: 8267583: jmod fails on symlink to class file
  • 083416d: 8267130: Memory Overflow in Disassembler::load_library
  • 9d305b9: 8252372: Check if cloning is required to move loads out of loops in PhaseIdealLoop::split_if_with_blocks_post()
  • 0394416: 8267468: Rename refill waster counters in ThreadLocalAllocBuffer
  • b33b8bc: 8267750: Incomplete fix for JDK-8267683
  • ac36b7d: 8267452: Delegate forEachRemaining in Spliterators.iterator()
  • ... and 128 more: https://git.openjdk.java.net/jdk/compare/cf97252f3fd4e7bdb57271b92dd2866101d4a94b...master

Your commit was automatically rebased without conflicts.

Pushed as commit a4c46e1.

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

@naotoj naotoj deleted the JDK-8263202 branch Jun 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awt client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated
3 participants