mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-05 07:37:09 +00:00
Code Issues Releases Wiki Activity

Begin migration of joda DateTime to java.time.Instant (#2992)

Browse Source 
java.time has been around since Java 8 and was based on joda DateTime, so this
is an overdue migration.  We're migrating specifically to Instant in most places
rather than ZonedDateTime because we were always using DateTimes in UTC to
reference a specific instant, which is exactly what Instants are
for. ZonedDateTime set to UTC may still be useful in some places that are heavy
on date math (especially in tests).

There is a lot more work to be done after this, but I wanted to put together a
manual PR showing my overall approach for how to do the migration that I can
then hopefully follow along with AI to continue making these changes throughout
the codebase. The basic approach is to migrate a small number of methods at a
time, marking the old methods as @Deprecated when possible (not always possible
because of @InlineMe restrictions). This PR doesn't yet migrate any DateTime
fields in the model classes, so that's the one remaining type of refactor to
figure out after this. We won't be changing how any of the data is actually
stored in the database.

BUG= http://b/496985355
This commit is contained in:
Ben McIlwain
2026-03-31 20:30:29 +00:00
committed by GitHub
parent aedfdd47f1
commit 60e84e72d7
66 changed files with 530 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/src/test/java/google/registry/util/DateTimeUtilsTest.java
+48 -2
View File
@@ -15,7 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.util.DateTimeUtils.END_INSTANT;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.START_INSTANT;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static google.registry.util.DateTimeUtils.earliestOf;
import static google.registry.util.DateTimeUtils.isAtOrAfter;
@@ -23,12 +25,15 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt;
import static google.registry.util.DateTimeUtils.latestOf;
import static google.registry.util.DateTimeUtils.leapSafeAddYears;
import static google.registry.util.DateTimeUtils.leapSafeSubtractYears;
import static google.registry.util.DateTimeUtils.toDateTime;
import static google.registry.util.DateTimeUtils.toInstant;
import static google.registry.util.DateTimeUtils.toLocalDate;
import static google.registry.util.DateTimeUtils.toSqlDate;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.google.common.collect.ImmutableList;
import java.sql.Date;
import java.time.Instant;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.junit.jupiter.api.Test;
@@ -42,7 +47,7 @@ class DateTimeUtilsTest {
@Test
void testSuccess_earliestOf() {
assertThat(earliestOf(START_OF_TIME, END_OF_TIME)).isEqualTo(START_OF_TIME);
assertThat(earliestOf(sampleDates)).isEqualTo(START_OF_TIME);
assertThat(DateTimeUtils.earliestDateTimeOf(sampleDates)).isEqualTo(START_OF_TIME);
}
@Test
@@ -72,6 +77,12 @@ class DateTimeUtilsTest {
assertThat(leapSafeAddYears(startDate, 4)).isEqualTo(DateTime.parse("2016-02-28T00:00:00Z"));
}
@Test
void test_leapSafeAddYears_worksWithInstants() {
Instant startDate = Instant.parse("2012-02-29T00:00:00Z");
assertThat(leapSafeAddYears(startDate, 4)).isEqualTo(Instant.parse("2016-02-28T00:00:00Z"));
}
@Test
void testSuccess_leapSafeSubtractYears() {
DateTime startDate = DateTime.parse("2012-02-29T00:00:00Z");
@@ -80,6 +91,13 @@ class DateTimeUtilsTest {
.isEqualTo(DateTime.parse("2008-02-28T00:00:00Z"));
}
@Test
void test_leapSafeSubtractYears_worksWithInstants() {
Instant startDate = Instant.parse("2012-02-29T00:00:00Z");
assertThat(leapSafeSubtractYears(startDate, 4))
.isEqualTo(Instant.parse("2008-02-28T00:00:00Z"));
}
@Test
void testSuccess_leapSafeSubtractYears_zeroYears() {
DateTime leapDay = DateTime.parse("2012-02-29T00:00:00Z");
@@ -93,7 +111,7 @@ class DateTimeUtilsTest {
@Test
void testFailure_latestOfEmpty() {
assertThrows(IllegalArgumentException.class, () -> earliestOf(ImmutableList.of()));
assertThrows(IllegalArgumentException.class, () -> latestOf(ImmutableList.of()));
}
@Test
@@ -107,4 +125,32 @@ class DateTimeUtilsTest {
Date date = Date.valueOf("2020-02-29");
assertThat(toLocalDate(date)).isEqualTo(LocalDate.parse("2020-02-29"));
}
@Test
void test_startOfTimeConstants_areTheSame() {
assertThat(toInstant(START_OF_TIME)).isEqualTo(START_INSTANT);
assertThat(toDateTime(START_INSTANT)).isEqualTo(START_OF_TIME);
assertThat(toInstant(toDateTime(START_INSTANT))).isEqualTo(START_INSTANT);
assertThat(toDateTime(toInstant(START_OF_TIME))).isEqualTo(START_OF_TIME);
}
@Test
void test_endOfTimeConstants_areTheSame() {
assertThat(toInstant(END_OF_TIME)).isEqualTo(END_INSTANT);
assertThat(toDateTime(END_INSTANT)).isEqualTo(END_OF_TIME);
assertThat(toInstant(toDateTime(END_INSTANT))).isEqualTo(END_INSTANT);
assertThat(toDateTime(toInstant(END_OF_TIME))).isEqualTo(END_OF_TIME);
}
@Test
void test_instantConversionMethods_workCorrectly() {
assertThat(toInstant(DateTime.parse("2024-03-27T10:15:30.105Z")))
.isEqualTo(Instant.parse("2024-03-27T10:15:30.105Z"));
assertThat(toDateTime(Instant.parse("2024-03-27T10:15:30.105Z")))
.isEqualTo(DateTime.parse("2024-03-27T10:15:30.105Z"));
assertThat(toInstant(toDateTime(Instant.parse("2024-03-27T10:15:30.105Z"))))
.isEqualTo(Instant.parse("2024-03-27T10:15:30.105Z"));
assertThat(toDateTime(toInstant(DateTime.parse("2024-03-27T10:15:30.105Z"))))
.isEqualTo(DateTime.parse("2024-03-27T10:15:30.105Z"));
}
}