Migrate bsa, dns, batch, and reporting packages to java.time by CydeWeys · Pull Request #3031 · google/nomulus

CydeWeys · 2026-04-30T21:01:45Z

This change is

    this.sigOutput = sigOutput;
-    signer = closer.register(new RydePgpSigningOutputStream(checkNotNull(rydeOutput), signingKey));
+    signer =
+        closer.register(new RydePgpSigningOutputStream(checkNotNull(receiverOutput), signingKey));


gbrodman · 2026-05-05T21:01:45Z

    // If cursor time is before now, upload the corresponding report
    cursors.entrySet().stream()
-        .filter(entry -> entry.getKey().getCursorTime().isBefore(clock.nowUtc()))
+        .filter(entry -> toInstant(entry.getKey().getCursorTime()).isBefore(clock.now()))


gbrodman · 2026-05-05T21:01:45Z

  private void uploadReport(
      Cursor cursor, String tldStr, ImmutableMap.Builder<String, Boolean> reportSummaryBuilder) {
-    DateTime cursorTime = cursor.getCursorTime();
+    Instant cursorTime = toInstant(cursor.getCursorTime());


gbrodman · 2026-05-05T21:01:46Z

    Cursor cursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("tld")));
-    assertThat(cursor.getCursorTime()).isEqualTo(DateTime.parse("2006-08-02T10:00:00Z"));
+    assertThat(toInstant(cursor.getCursorTime())).isEqualTo(Instant.parse("2006-08-02T10:00:00Z"));


gbrodman · 2026-05-05T21:01:46Z

    Cursor cursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("tld")));
-    assertThat(cursor.getCursorTime()).isEqualTo(DateTime.parse("2006-07-01TZ"));
+    assertThat(toInstant(cursor.getCursorTime())).isEqualTo(Instant.parse("2006-07-01T00:00:00Z"));


gbrodman · 2026-05-05T21:01:47Z

    Cursor cursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("foo")));
-    assertThat(cursor.getCursorTime()).isEqualTo(DateTime.parse("2006-07-01TZ"));
+    assertThat(toInstant(cursor.getCursorTime())).isEqualTo(Instant.parse("2006-07-01T00:00:00Z"));


gbrodman · 2026-05-05T21:01:47Z

    Cursor newActivityCursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("new")));
-    assertThat(newActivityCursor.getCursorTime()).isEqualTo(DateTime.parse("2006-08-02T10:00:00Z"));
+    assertThat(toInstant(newActivityCursor.getCursorTime()))


gbrodman · 2026-05-05T21:01:47Z

        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_TX, Tld.get("new")));
-    assertThat(newTransactionCursor.getCursorTime())
-        .isEqualTo(DateTime.parse("2006-08-02T10:00:00Z"));
+    assertThat(toInstant(newTransactionCursor.getCursorTime()))


This commit migrates the BSA, DNS, batch, and reporting packages from Joda-Time to java.time. Key changes include: - Updated Sleeper, Clock, and BigqueryUtils to use java.time types natively. - Refactored models like RdeRevision and Tld to eliminate redundant Joda conversions, utilizing new DateTimeUtils static utilities for LocalDate. - Improved test safety by replacing dynamic Instant.now() calls with static parsed constants. - Migrated temporal arithmetic in test suites to use DateTimeUtils convenience methods (plusDays, minusDays). - Updated BigqueryUtils serialization to preserve millisecond precision and formatting for large years, ensuring consistency with previous Joda behavior. - Enhanced code readability by converting long concatenated strings to Java text blocks in LordnLogTest. - Resolved environmental test failures in SyncRegistrarsSheetTest by synchronizing the FakeClock with the JPA extension. - Updated project engineering standards (GEMINI.md) to prefer Truth's .hasValue() for Optional assertions. Verified with a clean full build and all relevant test suites passing.

gbrodman

@gbrodman reviewed 184 files and all commit messages, and made 11 comments.
Reviewable status: all files reviewed, 12 unresolved discussions (waiting on CydeWeys).

core/src/main/java/google/registry/rde/RdeUtils.java line 41 at r3 (raw file):

  private static final int PEEK_SIZE = 2048;

  public static final DateTimeFormatter RDE_WATERMARK_FORMATTER =

this is used in more than just RDE, maybe consider moving it to a more generic class?

core/src/main/java/google/registry/rde/RydeEncoder.java line 144 at r3 (raw file):

    /** Returns the built {@link RydeEncoder}. */
    public RydeEncoder build() throws IOException {

why are these exceptions added?

core/src/main/java/google/registry/rde/RydeTar.java line 47 at r3 (raw file):

  static ImprovedOutputStream openTarWriter(
      @WillNotClose OutputStream os, long expectedSize, String filename, Instant modified)
      throws IOException {

why did it make these changes?

core/src/test/java/google/registry/batch/BulkDomainTransferActionTest.java line 82 at r3 (raw file):

        persistResource(
            persistDomainWithDependentResources(
                    "pendingdelete", "tld", now, minusDays(now, 1), plusDays(now, 30))

why are you switching the plusMonths to plusDays in this test?

gbrodman · 2026-05-05T21:01:45Z

    // If cursor time is before now, upload the corresponding report
    cursors.entrySet().stream()
-        .filter(entry -> entry.getKey().getCursorTime().isBefore(clock.nowUtc()))
+        .filter(entry -> toInstant(entry.getKey().getCursorTime()).isBefore(clock.now()))


gbrodman · 2026-05-05T21:01:45Z

  private void uploadReport(
      Cursor cursor, String tldStr, ImmutableMap.Builder<String, Boolean> reportSummaryBuilder) {
-    DateTime cursorTime = cursor.getCursorTime();
+    Instant cursorTime = toInstant(cursor.getCursorTime());


gbrodman · 2026-05-05T21:01:46Z

    Cursor cursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("tld")));
-    assertThat(cursor.getCursorTime()).isEqualTo(DateTime.parse("2006-08-02T10:00:00Z"));
+    assertThat(toInstant(cursor.getCursorTime())).isEqualTo(Instant.parse("2006-08-02T10:00:00Z"));


gbrodman · 2026-05-05T21:01:46Z

    Cursor cursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("tld")));
-    assertThat(cursor.getCursorTime()).isEqualTo(DateTime.parse("2006-07-01TZ"));
+    assertThat(toInstant(cursor.getCursorTime())).isEqualTo(Instant.parse("2006-07-01T00:00:00Z"));


gbrodman · 2026-05-05T21:01:47Z

    Cursor cursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("foo")));
-    assertThat(cursor.getCursorTime()).isEqualTo(DateTime.parse("2006-07-01TZ"));
+    assertThat(toInstant(cursor.getCursorTime())).isEqualTo(Instant.parse("2006-07-01T00:00:00Z"));


gbrodman · 2026-05-05T21:01:47Z

    Cursor newActivityCursor =
        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_ACTIVITY, Tld.get("new")));
-    assertThat(newActivityCursor.getCursorTime()).isEqualTo(DateTime.parse("2006-08-02T10:00:00Z"));
+    assertThat(toInstant(newActivityCursor.getCursorTime()))


gbrodman · 2026-05-05T21:01:47Z

        loadByKey(Cursor.createScopedVKey(CursorType.ICANN_UPLOAD_TX, Tld.get("new")));
-    assertThat(newTransactionCursor.getCursorTime())
-        .isEqualTo(DateTime.parse("2006-08-02T10:00:00Z"));
+    assertThat(toInstant(newTransactionCursor.getCursorTime()))


CydeWeys force-pushed the javatime-refactor-8th branch from 2fb2275 to 28812b7 Compare May 1, 2026 22:22

github-advanced-security AI found potential problems May 1, 2026

View reviewed changes

CydeWeys force-pushed the javatime-refactor-8th branch 2 times, most recently from 702da9d to a0b8231 Compare May 5, 2026 20:07

CydeWeys enabled auto-merge May 5, 2026 20:07

CydeWeys requested a review from gbrodman May 5, 2026 20:07

CydeWeys force-pushed the javatime-refactor-8th branch from a0b8231 to 67bdec7 Compare May 5, 2026 20:14

gbrodman requested changes May 5, 2026

View reviewed changes

Conversation

CydeWeys commented Apr 30, 2026 • edited by gbrodman Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gbrodman left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

CydeWeys commented Apr 30, 2026 •

edited by gbrodman

Loading