8336847: Use pattern match switch in NumberFormat classes #20302

justin-curtis-lu · 2024-07-23T17:28:02Z

As discussed in #19513 (comment), there is code within java.text.NumberFormat (and subclasses) that can use the pattern match switch to improve readability.

As this is simply cleanup, there is no regression test added. (Tiers 1-3 and java_text JCK ran to ensure clean migration).

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-8336847: Use pattern match switch in NumberFormat classes (Bug - P4)

Reviewers

Chen Liang (@liach - Reviewer)
@abdelhak-zaaim (no known openjdk.org user name / role) 🔄 Re-review required (review applies to 2efa5d3f)
Naoto Sato (@naotoj - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20302

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2024-07-23T17:28:59Z

👋 Welcome back jlu! 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.

justin-curtis-lu · 2024-07-23T17:29:10Z

src/java.base/share/classes/java/text/DecimalFormat.java

+            case BigDecimal bd -> digitList.set(isNegative, bd, maxDigits, true);
+            case Long l -> digitList.set(isNegative, l, maxDigits);
+            case BigInteger bi -> digitList.set(isNegative, bi, maxDigits);
+            default -> {} // do nothing


default case could also be thrown AssertionError if preferred.

Or a simple assert statement, as throwing an Error could change the behavior

Either of the 3 is fine with me. In this case, I think AssertionError is harmless, because AFAICT it is internally used by CompactNumberFormat only, and so throwing may prevent potential incorrect uses in the future.

OK, then I think I am inclined to use AssertionError, assuming DigitList is defined to only accept those types. Might want to modify the method description too.

openjdk · 2024-07-23T17:29:31Z

@justin-curtis-lu 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:

8336847: Use pattern match switch in NumberFormat classes

Reviewed-by: liach, naoto

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

4ea4d7c: 8336679: Add @implSpec for the default implementations in Process.waitFor()
04e8cb8: 8336815: Several methods in java.net.Socket and ServerSocket do not specify behavior when already bound, connected or closed
b2599f8: 8336316: JFR: Use SettingControl::getValue() instead of setValue() for ActiveSetting event
aa15b89: 8336485: jdk/jfr/jcmd/TestJcmdView.java RuntimeException: 'Invoked Concurrent' missing from stdout/stderr
332df83: 8336927: Missing equals and hashCode in java.lang.classfile.Annotation
05d88de: 8336098: G1: Refactor G1RebuildRSAndScrubTask
5b4824c: 8336827: compiler/vectorization/TestFloat16VectorConvChain.java timeouts on ppc64 platforms after JDK-8335860
3251eea: 8336499: Failure when creating non-CRT RSA private keys in SunPKCS11
476d2ae: 8336831: Optimize StringConcatHelper.simpleConcat
4c91d5c: 8322133: getParameterSpec(ECGenParameterSpec.class) on EC AlgorithmParameters does not return standard names
... and 15 more: https://git.openjdk.org/jdk/compare/b5575942027281166676678e2081b024ec572644...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 · 2024-07-23T17:30:07Z

@justin-curtis-lu The following labels will be automatically applied to this pull request:

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.

mlbridge · 2024-07-23T17:32:59Z

Webrevs

liach

Appears to be an equivalent migration by naked eye.

liach

The new AssertionError looks neat.

turbanoff · 2024-07-24T19:08:27Z

src/java.base/share/classes/java/text/NumberFormat.java

+            case AtomicLong al -> format(al.longValue(), toAppendTo, pos);
+            case BigInteger bi when bi.bitLength() < 64 -> format(bi.longValue(), toAppendTo, pos);
+            case Number n -> format(n.doubleValue(), toAppendTo, pos);
+            case null, default  -> throw new IllegalArgumentException("Cannot format given Object as a Number");


Suggested change

case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");

case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");

justin-curtis-lu · 2024-07-24T20:12:58Z

Thanks for the reviews.
/integrate

openjdk · 2024-07-24T20:14:02Z

Going to push as commit 5a8861a.
Since your change was applied there have been 26 commits pushed to the master branch:

9e8e359: 8336787: Examine java.text.Format API for implSpec usage
4ea4d7c: 8336679: Add @implSpec for the default implementations in Process.waitFor()
04e8cb8: 8336815: Several methods in java.net.Socket and ServerSocket do not specify behavior when already bound, connected or closed
b2599f8: 8336316: JFR: Use SettingControl::getValue() instead of setValue() for ActiveSetting event
aa15b89: 8336485: jdk/jfr/jcmd/TestJcmdView.java RuntimeException: 'Invoked Concurrent' missing from stdout/stderr
332df83: 8336927: Missing equals and hashCode in java.lang.classfile.Annotation
05d88de: 8336098: G1: Refactor G1RebuildRSAndScrubTask
5b4824c: 8336827: compiler/vectorization/TestFloat16VectorConvChain.java timeouts on ppc64 platforms after JDK-8335860
3251eea: 8336499: Failure when creating non-CRT RSA private keys in SunPKCS11
476d2ae: 8336831: Optimize StringConcatHelper.simpleConcat
... and 16 more: https://git.openjdk.org/jdk/compare/b5575942027281166676678e2081b024ec572644...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-07-24T20:14:07Z

@justin-curtis-lu Pushed as commit 5a8861a.

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

justin-curtis-lu added 2 commits July 22, 2024 13:06

init

231b2fc

add null case to restore IAE behavior

2efa5d3

justin-curtis-lu commented Jul 23, 2024

View reviewed changes

openjdk bot changed the title ~~JDK-8336847: Use pattern match switch in NumberFormat classes~~ 8336847: Use pattern match switch in NumberFormat classes Jul 23, 2024

openjdk bot added the rfr Pull request is ready for review label Jul 23, 2024

openjdk bot added core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Jul 23, 2024

liach approved these changes Jul 23, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 23, 2024

abdelhak-zaaim approved these changes Jul 23, 2024

View reviewed changes

reflect review

7799b0a

openjdk bot removed the ready Pull request is ready to be integrated label Jul 23, 2024

liach approved these changes Jul 24, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 24, 2024

naotoj approved these changes Jul 24, 2024

View reviewed changes

turbanoff reviewed Jul 24, 2024

View reviewed changes

reflect review comment

e9f24bc

openjdk bot removed the ready Pull request is ready to be integrated label Jul 24, 2024

naotoj approved these changes Jul 24, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 24, 2024

liach approved these changes Jul 24, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jul 24, 2024

openjdk bot closed this Jul 24, 2024

openjdk bot removed the ready Pull request is ready to be integrated label Jul 24, 2024

openjdk bot removed the rfr Pull request is ready for review label Jul 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8336847: Use pattern match switch in NumberFormat classes #20302

8336847: Use pattern match switch in NumberFormat classes #20302

justin-curtis-lu commented Jul 23, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jul 23, 2024

justin-curtis-lu Jul 23, 2024

naotoj Jul 23, 2024

justin-curtis-lu Jul 23, 2024

naotoj Jul 23, 2024 •

edited

Loading

openjdk bot commented Jul 23, 2024 •

edited

Loading

openjdk bot commented Jul 23, 2024

mlbridge bot commented Jul 23, 2024 •

edited

Loading

liach left a comment

liach left a comment

turbanoff Jul 24, 2024

justin-curtis-lu commented Jul 24, 2024

openjdk bot commented Jul 24, 2024

openjdk bot commented Jul 24, 2024

	case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");
	case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");

8336847: Use pattern match switch in NumberFormat classes #20302

8336847: Use pattern match switch in NumberFormat classes #20302

Conversation

justin-curtis-lu commented Jul 23, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jul 23, 2024

justin-curtis-lu Jul 23, 2024

Choose a reason for hiding this comment

naotoj Jul 23, 2024

Choose a reason for hiding this comment

justin-curtis-lu Jul 23, 2024

Choose a reason for hiding this comment

naotoj Jul 23, 2024 • edited Loading

Choose a reason for hiding this comment

openjdk bot commented Jul 23, 2024 • edited Loading

openjdk bot commented Jul 23, 2024

mlbridge bot commented Jul 23, 2024 • edited Loading

Webrevs

liach left a comment

Choose a reason for hiding this comment

liach left a comment

Choose a reason for hiding this comment

turbanoff Jul 24, 2024

Choose a reason for hiding this comment

justin-curtis-lu commented Jul 24, 2024

openjdk bot commented Jul 24, 2024

openjdk bot commented Jul 24, 2024

justin-curtis-lu commented Jul 23, 2024 •

edited by openjdk bot

Loading

naotoj Jul 23, 2024 •

edited

Loading

openjdk bot commented Jul 23, 2024 •

edited

Loading

mlbridge bot commented Jul 23, 2024 •

edited

Loading