ICU-22407 Implement Java Temporal Calendar API #2526

FrankYFTang · 2023-07-10T23:29:24Z

Checklist

Required: Issue filed: https://unicode-org.atlassian.net/browse/ICU-22407
Required: The PR title must be prefixed with a JIRA Issue number.
Required: The PR description must include the link to the Jira Issue, for example by completing the URL in the first checklist item
Required: Each commit message must be prefixed with a JIRA Issue number.
Issue accepted (done by Technical Committee after discussion)
Tests included, if applicable
API docs and/or User Guide docs changed or added, if applicable

jira-pull-request-webhook · 2023-07-25T21:51:14Z

Notice: the branch changed across the force-push!

icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java is different
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java is different
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2023-07-27T18:14:19Z

Notice: the branch changed across the force-push!

icu4j/main/classes/core/src/com/ibm/icu/impl/CalType.java is now changed in the branch
icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java is different
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java is now changed in the branch
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2023-07-27T19:13:00Z

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2023-07-27T19:55:43Z

Notice: the branch changed across the force-push!

icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java is different
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

jira-pull-request-webhook · 2023-07-27T23:51:14Z

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

FrankYFTang · 2023-07-28T00:44:46Z

Since richgillam reviewed #2274 it probably would be easier for him to be the reviewer since it is a 1:1 porting from the C++ implementation

richgillam

I probably should have read this more closely, but I'm running out of brain cells...

This looks good, and it looks like what I remember from the C side.

richgillam · 2023-07-28T00:50:50Z

icu4c/source/i18n/hebrwcal.cpp

@@ -777,7 +777,7 @@ int32_t HebrewCalendar::internalGetMonth() const {
        HebrewCalendar *nonConstThis = (HebrewCalendar*)this; // cast away const

        int32_t year = nonConstThis->handleGetExtendedYear();
-        return ordinalMonth + ((isLeapYear(year) && (ordinalMonth > ADAR_1)) ? 1: 0);
+        return ordinalMonth + (((!isLeapYear(year)) && (ordinalMonth > ADAR_1)) ? 1: 0);


I take it the lack of ! was a bug, but is the extra pair of parentheses buying you anything?

just make it more explicit that the ! is not applying to A&&B but only to A

and the cpp part is already merged in other PR and removed from this PR

richgillam · 2023-07-28T00:52:07Z

icu4j/main/classes/core/src/com/ibm/icu/util/CECalendar.java

+     * @draft ICU 74
+     */
+    public String getTemporalMonthCode() {
+        if (get(MONTH) == 12) return "M13";


Dumb question, but why isn't "M13" listed in gTemporalMonthCodes above?

good catch, the gTemporalMonthCodes should not be here.

jira-pull-request-webhook · 2023-07-28T05:21:02Z

Notice: the branch changed across the force-push!

icu4c/source/i18n/calendar.cpp is no longer changed in the branch
icu4c/source/i18n/hebrwcal.cpp is no longer changed in the branch
icu4c/source/test/intltest/caltest.cpp is no longer changed in the branch
icu4j/main/classes/core/src/com/ibm/icu/impl/CalType.java is no longer changed in the branch
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

FrankYFTang · 2023-07-29T00:20:21Z

PTAL

richgillam

Looks good. Thanks for the fixes!

See unicode-org#2526

jira-pull-request-webhook · 2023-07-29T00:26:12Z

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

FrankYFTang · 2023-07-31T18:10:38Z

Have post-merge breakage on the following three tests

Testcase: TestConsistencyChinese took 10.636 sec
FAILED
Round trip conversion produces different time from Mon Feb 17 18:06:15 PST 1890 to Wed Feb 27 18:06:15 PST 1889 delta: -30672000000 Gregorian(e=1 1890/2/18)
junit.framework.AssertionFailedError: Round trip conversion produces different time from Mon Feb 17 18:06:15 PST 1890 to Wed Feb 27 18:06:15 PST 1889 delta: -30672000000 Gregorian(e=1 1890/2/18)
at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
at com.ibm.icu.dev.test.calendar.IBMCalendarTest.checkConsistency(IBMCalendarTest.java:2162)
at com.ibm.icu.dev.test.calendar.IBMCalendarTest.TestConsistencyChinese(IBMCalendarTest.java:2077)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

Testcase: TestConsistencyDangi took 9.44 sec
FAILED
Round trip conversion produces different time from Mon Feb 17 18:06:29 PST 1890 to Wed Feb 27 18:06:29 PST 1889 delta: -30672000000 Gregorian(e=1 1890/2/18)
junit.framework.AssertionFailedError: Round trip conversion produces different time from Mon Feb 17 18:06:29 PST 1890 to Wed Feb 27 18:06:29 PST 1889 delta: -30672000000 Gregorian(e=1 1890/2/18)
at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
at com.ibm.icu.dev.test.calendar.IBMCalendarTest.checkConsistency(IBMCalendarTest.java:2162)
at com.ibm.icu.dev.test.calendar.IBMCalendarTest.TestConsistencyDangi(IBMCalendarTest.java:2082)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

Testcase: TestConsistencyIndian took 1.273 sec
FAILED
Round trip conversion produces different time from Fri Apr 26 18:06:44 PST 4713 to Fri May 03 18:06:44 PST 4713 delta: 604800000 Gregorian(e=0 4713/4/27)
junit.framework.AssertionFailedError: Round trip conversion produces different time from Fri Apr 26 18:06:44 PST 4713 to Fri May 03 18:06:44 PST 4713 delta: 604800000 Gregorian(e=0 4713/4/27)
at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
at com.ibm.icu.dev.test.calendar.IBMCalendarTest.checkConsistency(IBMCalendarTest.java:2162)
at com.ibm.icu.dev.test.calendar.IBMCalendarTest.TestConsistencyIndian(IBMCalendarTest.java:2027)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

FrankYFTang · 2023-07-31T18:31:55Z

The post merge breakage are the same as the C++ one in https://unicode-org.atlassian.net/browse/ICU-22252
Will work oon a new PR for Java based on #2298 to address this soon

See unicode-org#2526

FrankYFTang added incomplete Needs work; do not approve/merge as is. api Adds or changes public API. labels Jul 10, 2023

FrankYFTang force-pushed the ICU-22407-try3 branch from 87336d2 to 319cf65 Compare July 25, 2023 21:51

FrankYFTang force-pushed the ICU-22407-try3 branch from adc8b52 to 1e84249 Compare July 27, 2023 18:14

FrankYFTang force-pushed the ICU-22407-try3 branch from 605e78f to 667e848 Compare July 27, 2023 19:12

FrankYFTang changed the title ~~(incomplete) ICU-22407 Implement Java Temporal Calendar API~~ ICU-22407 Implement Java Temporal Calendar API Jul 27, 2023

FrankYFTang force-pushed the ICU-22407-try3 branch from 80102e5 to 26637c0 Compare July 27, 2023 19:55

FrankYFTang force-pushed the ICU-22407-try3 branch from c844bd7 to 6864c08 Compare July 27, 2023 23:51

FrankYFTang removed the incomplete Needs work; do not approve/merge as is. label Jul 28, 2023

FrankYFTang requested a review from richgillam July 28, 2023 00:43

FrankYFTang added the waiting-on-reviewer label Jul 28, 2023

richgillam previously approved these changes Jul 28, 2023

View reviewed changes

FrankYFTang force-pushed the ICU-22407-try3 branch from 6864c08 to 2abbe09 Compare July 28, 2023 05:20

FrankYFTang dismissed richgillam’s stale review via 6f379e0 July 28, 2023 05:38

FrankYFTang requested a review from richgillam July 29, 2023 00:20

richgillam approved these changes Jul 29, 2023

View reviewed changes

ICU-22407 Implement Java Temporal Calendar API

247885a

See unicode-org#2526

FrankYFTang force-pushed the ICU-22407-try3 branch from 6f379e0 to 247885a Compare July 29, 2023 00:26

FrankYFTang merged commit d511cad into unicode-org:main Jul 29, 2023
101 checks passed

FrankYFTang deleted the ICU-22407-try3 branch July 29, 2023 01:17

FrankYFTang mentioned this pull request Aug 1, 2023

ICU-22407 Suppress Calendar Consistency #2536

Merged

7 tasks

catamorphism pushed a commit to catamorphism/icu that referenced this pull request Nov 1, 2023

ICU-22407 Implement Java Temporal Calendar API

510639c

See unicode-org#2526

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ICU-22407 Implement Java Temporal Calendar API #2526

ICU-22407 Implement Java Temporal Calendar API #2526

FrankYFTang commented Jul 10, 2023

jira-pull-request-webhook bot commented Jul 25, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

FrankYFTang commented Jul 28, 2023

richgillam left a comment

richgillam Jul 28, 2023

FrankYFTang Jul 28, 2023

FrankYFTang Jul 28, 2023

richgillam Jul 28, 2023

FrankYFTang Jul 28, 2023

jira-pull-request-webhook bot commented Jul 28, 2023

FrankYFTang commented Jul 29, 2023

richgillam left a comment

jira-pull-request-webhook bot commented Jul 29, 2023

FrankYFTang commented Jul 31, 2023

FrankYFTang commented Jul 31, 2023

ICU-22407 Implement Java Temporal Calendar API #2526

ICU-22407 Implement Java Temporal Calendar API #2526

Conversation

FrankYFTang commented Jul 10, 2023

Checklist

jira-pull-request-webhook bot commented Jul 25, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

jira-pull-request-webhook bot commented Jul 27, 2023

FrankYFTang commented Jul 28, 2023

richgillam left a comment

Choose a reason for hiding this comment

richgillam Jul 28, 2023

Choose a reason for hiding this comment

FrankYFTang Jul 28, 2023

Choose a reason for hiding this comment

FrankYFTang Jul 28, 2023

Choose a reason for hiding this comment

richgillam Jul 28, 2023

Choose a reason for hiding this comment

FrankYFTang Jul 28, 2023

Choose a reason for hiding this comment

jira-pull-request-webhook bot commented Jul 28, 2023

FrankYFTang commented Jul 29, 2023

richgillam left a comment

Choose a reason for hiding this comment

jira-pull-request-webhook bot commented Jul 29, 2023

FrankYFTang commented Jul 31, 2023

FrankYFTang commented Jul 31, 2023