Migrate TMCH, SMD, Mark models, EPP InfoData, and Fee Extensions to use java.time.Instant

This commit completes the java.time migration for the Trademark Clearinghouse (TMCH), Signed Mark Data (SMD), and Mark models, the EPP Response & InfoData Objects, and the Fee Extension ecosystem, transitioning them from Joda-Time's DateTime to java.time.Instant.

Changes made:
1. Core Models Migration:
   - ClaimsList: Converted tmdbGenerationTime to Instant. Removed deprecated toDateTime bridge methods and replaced them directly with Instant getters.
   - TmchCrl: Converted updated to Instant, utilizing tm().getTxTime() natively for accurate database transaction time injection.
   - SignedMark: Updated creationTime and expirationTime to use Instant.
   - SignedMarkRevocationList: Changed creationTime to Instant and the map values of revokes from DateTime to Instant.
   - Mark Models (ProtectedMark, Trademark, TreatyOrStatuteMark): Migrated all date properties (protectionDate, applicationDate, registrationDate, expirationDate, executionDate) to Instant.
   - PremiumPricingEngine & PricingEngineProxy: Migrated priceTime parameters and DomainPrices outputs to Instant.

2. Fee Extensions & EPP Response Models:
   - BaseFee & Fee: Converted validDateRange to Range<Instant> and eliminated getValidDateRangeInstant bridge methods.
   - All Fee Extension Versions (v06, v11, v12, stdv1): Migrated effectiveDate and notAfterDate fields to Instant.
   - DomainInfoData, HostInfoData, ContactInfoData, CreateData, Greeting, MessageQueueInfo: Migrated all date fields to Instant.

3. JAXB XML Adapter Updates:
   - Added and applied UtcInstantAdapter.class in package-info.java definitions (smd, mark, contact, eppoutput, fee*) to natively marshall/unmarshall Instant properties instead of DateTime.

4. Parsers & Flow Integrations:
   - SmdrlCsvParser & ClaimsListParser: Modified to invoke Instant.parse() when parsing external CSV artifacts. Added new strict header validation and row consistency checks to ClaimsListParser to ensure records match expected fields before parsing.
   - DomainPricingLogic: Updated to natively pass and compute Instant for all domain pricing, renewals, and restore logic.
   - DomainFlowTmchUtils and DomainCreateFlow: Adapted method signatures and callers to natively receive and validate against Instant instead of relying on conversions, updating chronological comparisons to leverage isBefore() and isAfter().
   - Stripped out toDateTime() conversions previously necessary when mapping between core entities and these EPP response objects across multiple flow classes (e.g. DomainInfoFlow, HostInfoFlow, DomainCreateFlow, HostCreateFlow, PollRequestFlow, and HelloFlow).

5. Test Suite Refactoring:
   - Transformed org.joda.time.DateTime usage into java.time.Instant in associated tests (SmdrlCsvParserTest, TmchTestDataExpirationTest, UploadClaimsListCommandTest, SignedMarkRevocationListTest, DomainPricingLogicTest, etc.).
   - Replaced uses of fakeClock.nowUtc() with the idiomatic fakeClock.now().
   - Fixed broken tests in UploadClaimsListCommandTest where invalid formats like "foo" previously generated Joda IllegalArgumentException on the first row, hiding the fact that subsequent header/body validation logic was never exercised. The tests now use a valid timestamp header row to properly trigger IllegalArgumentException for structural assertions, and assert DateTimeParseException correctly where applicable.

6. Refinement:
   - Added explicit guidelines to GEMINI.md to avoid calling toInstant() and toDateTime() when equivalent native alternatives like tm().getTxTime() exist.
   - Added guidelines on avoiding Python scripts for formatting in favor of ./gradlew javaIncrementalFormatApply.
   - Added guidelines on checking exceptions in test suites when migrating parsing logic.

Author: CydeWeys

GEMINI.md

@@ -15,7 +15,7 @@ This document outlines foundational mandates, architectural patterns, and projec
 
 ## 2. Time and Precision Handling (java.time Migration)
 
-- **Idiomatic java.time Usage:** Avoid redundant conversions between `Instant` and `DateTime`. If a field or parameter is an `Instant`, use it directly. Do not convert to `DateTime` just to call a deprecated method if an `Instant` alternative exists or can be easily created.
+- **Idiomatic java.time Usage:** Avoid redundant conversions between `Instant` and `DateTime`. If a field or parameter is an `Instant`, use it directly. Do not convert to `DateTime` just to call a deprecated method if an `Instant` alternative exists or can be easily created. Furthermore, you should not call `toInstant()` or `toDateTime()` conversion methods when not strictly necessary; always prefer to use an alternative method that returns the correct type if one exists (e.g. use `tm().getTxTime()` which returns an `Instant` instead of calling `tm().getTransactionTime().toInstant()`).
 - **Millisecond Precision:** Always truncate `Instant.now()` to milliseconds (using `.truncatedTo(ChronoUnit.MILLIS)`) to maintain consistency with Joda `DateTime` and the PostgreSQL schema (which enforces millisecond precision via JPA converters).
 - **Clock Injection:**
     - Avoid direct calls to `Instant.now()`, `DateTime.now()`, `ZonedDateTime.now()`, or `System.currentTimeMillis()`.
@@ -56,6 +56,7 @@ This document outlines foundational mandates, architectural patterns, and projec
 ## Performance and Efficiency
 - **Turn Minimization:** Aim for "perfect" code in the first iteration. Iterative fixes for checkstyle or compilation errors consume significant context and time.
 - **Context Management:** Use sub-agents for batch refactoring or high-volume output tasks to keep the main session history lean and efficient.
+- **Code Formatting:** Do not write custom Python scripts or manual regex replacements to fix code formatting issues (e.g., unused imports, import ordering, line length). Instead, use the project's built-in formatting tools: run `./gradlew spotlessApply` to fix unused/unordered imports and `./gradlew javaIncrementalFormatApply` (or `google-java-format --replace <files>`) to automatically fix Java formatting and indentation errors.
 
 ## General Code Review Lessons & Avoidable Mistakes
 Based on historical PR reviews, avoid the following common mistakes:
@@ -90,8 +91,12 @@ This document captures high-level architectural patterns, lessons learned from l
 - **One Commit Per PR:** All changes for a single PR must be squashed into a single commit before merging.
 - **Default to Amend:** Once an initial commit is created for a PR, all subsequent functional changes should be amended into that same commit by default (`git commit --amend --no-edit`). This ensures the PR remains a single, clean unit of work throughout the development lifecycle.
 - **Commit Message Style:** Follow standard Git commit best practices. The subject line (first line) should be concise, capitalized, and **must not end with punctuation** (e.g., a period).
-- **Final Validation:** Always run `git status` as the final step before declaring a task complete to ensure all changes are committed and the working directory is clean.
-- **Commit Verification:** After any commit or amendment, explicitly verify the success of the operation (e.g., using `git status` and reviewing the diff). Never report a Git operation as "done" without having first successfully executed the command and confirmed the repository state.
+- **Strict Completion Verification:** You MUST NEVER declare a task, commit, or amendment as complete until you have explicitly verified that the workspace is clean. You MUST follow this exact sequence of actions across multiple conversational turns if necessary:
+  1. Execute the `git commit` or `git commit --amend` command.
+  2. Wait for the tool to return successfully.
+  3. Execute `git status`.
+  4. Wait for the tool to return and explicitly verify the output contains `nothing to commit, working tree clean` (or similar indication that no unstaged changes remain). If changes remain, stage them and amend the commit, then repeat this verification loop.
+  5. **Only after** step 4 has successfully returned a clean working directory may you generate a text response to the user declaring that the task is complete.
 - **Diff Review:** Before finalizing a task, review the full diff (e.g., `git diff HEAD^`) to ensure all changes are functional and relevant. Identify and revert any formatting-only changes in files that do not contain functional updates to keep the commit focused.
 
 ## Refactoring & Migration Guardrails
@@ -116,6 +121,7 @@ This project treats Error Prone warnings as errors.
 ## 🚫 Common Pitfalls to Avoid
 
 - **Do not go in circles with the build:** If you see an `InlineMeSuggester` error, apply the suppression to **ALL** similar methods in that file and related files in one turn. Do not fix them one by one.
+- **Exception Conversion in Tests:** When migrating time types (e.g., from Joda `DateTime` to Java `Instant`), be extremely careful with tests that verify parsing failures (e.g., `assertThrows(IllegalArgumentException.class, ...)`). Joda's `DateTime.parse()` throws an `IllegalArgumentException` on failure, but `Instant.parse()` throws a `java.time.format.DateTimeParseException`. You must update the expected exception type in these tests to ensure they actually test the correct behavior, and verify the tests are not failing prematurely on the first line if it contains invalid data meant to be ignored.
 - Dagger/AutoValue corruption: If you modify a builder or a component incorrectly, Dagger will fail to generate code, leading to hundreds of "cannot find symbol" errors. If this happens, `git checkout` the last working state of the specific file and re-apply changes more surgically.
 - **`replace` tool context**: When using `replace` on large files (like `Tld.java` or `DomainBase.java`), provide significant surrounding context. These files have many similar method signatures (getters/setters) that can lead to incorrect replacements.
 

core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java

@@ -402,7 +402,7 @@ private void expandOneRecurrence(
                       .getRenewPrice(
                           tld,
                           billingRecurrence.getTargetId(),
-                          toDateTime(eventTime),
+                          eventTime,
                           1,
                           billingRecurrence,
                           Optional.empty())

core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java

@@ -53,6 +53,7 @@
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.END_INSTANT;
 import static google.registry.util.DateTimeUtils.plusYears;
+import static google.registry.util.DateTimeUtils.toInstant;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -313,7 +314,7 @@ public EppResponse run() throws EppException {
       // at this point so that we can verify it before the "after validation" extension point.
       signedMarkId =
           tmchUtils
-              .verifySignedMarks(launchCreate.get().getSignedMarks(), domainLabel, now)
+              .verifySignedMarks(launchCreate.get().getSignedMarks(), domainLabel, toInstant(now))
               .getId();
     }
     verifyNotBlockedByBsa(domainName, tld, now, allocationToken);
@@ -440,7 +441,9 @@ public EppResponse run() throws EppException {
     BeforeResponseReturnData responseData =
         flowCustomLogic.beforeResponse(
             BeforeResponseParameters.newBuilder()
-                .setResData(DomainCreateData.create(targetId, now, registrationExpirationTime))
+                .setResData(
+                    DomainCreateData.create(
+                        targetId, toInstant(now), toInstant(registrationExpirationTime)))
                 .setResponseExtensions(createResponseExtensions(feeCreate, responseFeesAndCredits))
                 .build());
     return responseBuilder

core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java

@@ -38,10 +38,10 @@
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.CertificateRevokedException;
+import java.time.Instant;
 import javax.xml.crypto.MarshalException;
 import javax.xml.crypto.dsig.XMLSignatureException;
 import javax.xml.parsers.ParserConfigurationException;
-import org.joda.time.DateTime;
 import org.xml.sax.SAXException;
 
 /** TMCH utility functions for domain flows. */
@@ -55,7 +55,7 @@ public DomainFlowTmchUtils(TmchXmlSignature tmchXmlSignature) {
   }
 
   public SignedMark verifySignedMarks(
-      ImmutableList<AbstractSignedMark> signedMarks, String domainLabel, DateTime now)
+      ImmutableList<AbstractSignedMark> signedMarks, String domainLabel, Instant now)
       throws EppException {
     if (signedMarks.size() > 1) {
       throw new TooManySignedMarksException();
@@ -75,7 +75,7 @@ public SignedMark verifySignedMarkValidForDomainLabel(SignedMark signedMark, Str
     return signedMark;
   }
 
-  public SignedMark verifyEncodedSignedMark(EncodedSignedMark encodedSignedMark, DateTime now)
+  public SignedMark verifyEncodedSignedMark(EncodedSignedMark encodedSignedMark, Instant now)
       throws EppException {
     if (!encodedSignedMark.getEncoding().equals("base64")) {
       throw new Base64RequiredForEncodedSignedMarksException();

core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java

@@ -504,7 +504,7 @@ public static BillingRecurrence.Builder newAutorenewBillingEvent(Domain domain)
         .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
         .setTargetId(domain.getDomainName())
         .setRegistrarId(domain.getCurrentSponsorRegistrarId())
-        .setEventTime(domain.getRegistrationExpirationDateTime());
+        .setEventTime(domain.getRegistrationExpirationTime());
   }
 
   /**
@@ -515,7 +515,7 @@ public static Autorenew.Builder newAutorenewPollMessage(Domain domain) {
     return new Autorenew.Builder()
         .setTargetId(domain.getDomainName())
         .setRegistrarId(domain.getCurrentSponsorRegistrarId())
-        .setEventTime(domain.getRegistrationExpirationDateTime())
+        .setEventTime(domain.getRegistrationExpirationTime())
         .setMsg("Domain was auto-renewed.");
   }
 
@@ -659,7 +659,7 @@ static void handleFeeRequest(
         // process, don't count as expired for the purposes of requiring an added year of renewal on
         // restore because they can't be restored in the first place.
         boolean isExpired =
-            domain.isPresent() && domain.get().getRegistrationExpirationDateTime().isBefore(now);
+            domain.isPresent() && domain.get().getRegistrationExpirationTime().isBefore(now);
         fees = pricingLogic.getRestorePrice(tld, domainNameString, now, isExpired).getFees();
       }
       case TRANSFER -> {

core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java

@@ -121,10 +121,10 @@ public EppResponse run() throws EppException {
             .setStatusValues(domain.getStatusValues())
             .setNameservers(
                 hostsRequest.requestDelegated() ? domain.loadNameserverHostNames() : null)
-            .setCreationTime(domain.getCreationTime())
-            .setLastEppUpdateTime(domain.getLastEppUpdateDateTime())
-            .setRegistrationExpirationTime(domain.getRegistrationExpirationDateTime())
-            .setLastTransferTime(domain.getLastTransferTime());
+            .setCreationTime(domain.getCreationTimeInstant())
+            .setLastEppUpdateTime(domain.getLastEppUpdateTime())
+            .setRegistrationExpirationTime(domain.getRegistrationExpirationTime())
+            .setLastTransferTime(domain.getLastTransferTimeInstant());
 
     // If authInfo is non-null, then the caller is authorized to see the full information since we
     // will have already verified the authInfo is valid.

core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java

@@ -41,11 +41,11 @@
 import google.registry.model.tld.Tld;
 import jakarta.inject.Inject;
 import java.math.RoundingMode;
+import java.time.Instant;
 import java.util.Optional;
 import javax.annotation.Nullable;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
-import org.joda.time.DateTime;
 
 /**
  * Provides pricing for create, renew, etc, operations, with call-outs that can be customized by
@@ -70,7 +70,7 @@ public DomainPricingLogic(DomainPricingCustomLogic customLogic) {
   public FeesAndCredits getCreatePrice(
       Tld tld,
       String domainName,
-      DateTime dateTime,
+      Instant dateTime,
       int years,
       boolean isAnchorTenant,
       boolean isSunriseCreate,
@@ -125,7 +125,7 @@ public FeesAndCredits getCreatePrice(
   public FeesAndCredits getRenewPrice(
       Tld tld,
       String domainName,
-      DateTime dateTime,
+      Instant dateTime,
       int years,
       @Nullable BillingRecurrence billingRecurrence,
       Optional<AllocationToken> allocationToken) {
@@ -194,7 +194,7 @@ public FeesAndCredits getRenewPrice(
 
   /** Returns a new restore price for the pricer. */
   public FeesAndCredits getRestorePrice(
-      Tld tld, String domainName, DateTime dateTime, boolean isExpired) throws EppException {
+      Tld tld, String domainName, Instant dateTime, boolean isExpired) throws EppException {
     DomainPrices domainPrices = getPricesForDomainName(domainName, dateTime);
     FeesAndCredits.Builder feesAndCredits =
         new FeesAndCredits.Builder()
@@ -217,7 +217,7 @@ public FeesAndCredits getRestorePrice(
 
   /** Returns a new transfer price for the pricer. */
   public FeesAndCredits getTransferPrice(
-      Tld tld, String domainName, DateTime dateTime, @Nullable BillingRecurrence billingRecurrence)
+      Tld tld, String domainName, Instant dateTime, @Nullable BillingRecurrence billingRecurrence)
       throws EppException {
     FeesAndCredits renewPrice =
         getRenewPrice(tld, domainName, dateTime, 1, billingRecurrence, Optional.empty());
@@ -239,7 +239,7 @@ public FeesAndCredits getTransferPrice(
   }
 
   /** Returns a new update price for the pricer. */
-  public FeesAndCredits getUpdatePrice(Tld tld, String domainName, DateTime dateTime)
+  public FeesAndCredits getUpdatePrice(Tld tld, String domainName, Instant dateTime)
       throws EppException {
     CurrencyUnit currency = tld.getCurrency();
     BaseFee feeOrCredit = Fee.create(zeroInCurrency(currency), FeeType.UPDATE, false);
@@ -272,7 +272,7 @@ private Money getDomainCreateCostWithDiscount(
   private Money getDomainRenewCostWithDiscount(
       Tld tld,
       DomainPrices domainPrices,
-      DateTime dateTime,
+      Instant dateTime,
       int years,
       Optional<AllocationToken> allocationToken) {
     // Short-circuit if the user sent an anchor-tenant or otherwise NONPREMIUM-renewal token
@@ -349,7 +349,7 @@ private Money getDomainCostWithDiscount(
   }
 
   private DomainPrices applyTokenToDomainPrices(
-      DomainPrices domainPrices, Tld tld, DateTime dateTime, int years, AllocationToken token) {
+      DomainPrices domainPrices, Tld tld, Instant dateTime, int years, AllocationToken token) {
     // Convert to nonpremium iff no premium charges are included (either in create or any renewal)
     boolean convertToNonPremium =
         token.getRegistrationBehavior().equals(RegistrationBehavior.NONPREMIUM_CREATE)

core/src/main/java/google/registry/flows/host/HostCreateFlow.java

@@ -25,6 +25,7 @@
 import static google.registry.model.reporting.HistoryEntry.Type.HOST_CREATE;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.CollectionUtils.isNullOrEmpty;
+import static google.registry.util.DateTimeUtils.toInstant;
 
 import com.google.common.collect.ImmutableSet;
 import google.registry.config.RegistryConfig.Config;
@@ -141,7 +142,7 @@ public EppResponse run() throws EppException {
       requestHostDnsRefresh(targetId);
     }
     tm().insertAll(entitiesToInsert);
-    return responseBuilder.setResData(HostCreateData.create(targetId, now)).build();
+    return responseBuilder.setResData(HostCreateData.create(targetId, toInstant(now))).build();
   }
 
   /** Subordinate hosts must have an ip address. */

core/src/main/java/google/registry/flows/host/HostInfoFlow.java

@@ -19,7 +19,6 @@
 import static google.registry.flows.host.HostFlowUtils.validateHostName;
 import static google.registry.model.EppResourceUtils.isLinked;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-import static google.registry.util.DateTimeUtils.toDateTime;
 
 import com.google.common.collect.ImmutableSet;
 import google.registry.flows.EppException;
@@ -81,14 +80,14 @@ public EppResponse run() throws EppException {
           tm().loadByKey(host.getSuperordinateDomain()).cloneProjectedAtTime(now);
       hostInfoDataBuilder
           .setCurrentSponsorRegistrarId(superordinateDomain.getCurrentSponsorRegistrarId())
-          .setLastTransferTime(toDateTime(host.computeLastTransferTime(superordinateDomain)));
+          .setLastTransferTime(host.computeLastTransferTime(superordinateDomain));
       if (superordinateDomain.getStatusValues().contains(StatusValue.PENDING_TRANSFER)) {
         statusValues.add(StatusValue.PENDING_TRANSFER);
       }
     } else {
       hostInfoDataBuilder
           .setCurrentSponsorRegistrarId(host.getPersistedCurrentSponsorRegistrarId())
-          .setLastTransferTime(host.getLastTransferTime());
+          .setLastTransferTime(host.getLastTransferTimeInstant());
     }
     return responseBuilder
         .setResData(
@@ -98,9 +97,9 @@ public EppResponse run() throws EppException {
                 .setStatusValues(statusValues.build())
                 .setInetAddresses(host.getInetAddresses())
                 .setCreationRegistrarId(host.getCreationRegistrarId())
-                .setCreationTime(host.getCreationTime())
+                .setCreationTime(host.getCreationTimeInstant())
                 .setLastEppUpdateRegistrarId(host.getLastEppUpdateRegistrarId())
-                .setLastEppUpdateTime(host.getLastEppUpdateDateTime())
+                .setLastEppUpdateTime(host.getLastEppUpdateTime())
                 .build())
         .build();
   }

core/src/main/java/google/registry/flows/poll/PollRequestFlow.java

@@ -21,6 +21,7 @@
 import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_NO_MESSAGES;
 import static google.registry.model.poll.PollMessageExternalKeyConverter.makePollMessageExternalId;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.util.DateTimeUtils.toInstant;
 
 import google.registry.flows.EppException;
 import google.registry.flows.EppException.ParameterValueSyntaxErrorException;
@@ -77,7 +78,7 @@ public EppResponse run() throws EppException {
         .setResultFromCode(SUCCESS_WITH_ACK_MESSAGE)
         .setMessageQueueInfo(
             new MessageQueueInfo.Builder()
-                .setQueueDate(pollMessage.getEventTime())
+                .setQueueDate(toInstant(pollMessage.getEventTime()))
                 .setMsg(pollMessage.getMsg())
                 .setQueueLength(getPollMessageCount(registrarId, now))
                 .setMessageId(makePollMessageExternalId(pollMessage))