More debugging code for replyTo address (#3053)

The  replyTo header works in manual tests. Add code emulating
BillingEmailUtils behavior and see if that causes the problem.

Also experimenting not to set the From header in GmaiClient, since
whatever we set is overridden anyway.

.github/workflows/update-dependency-reminder.yml

@@ -0,0 +1,48 @@
+name: Request Lockfile Review
+
+on:
+  pull_request_target:
+    branches: ["master"]
+    types: [opened, synchronize, reopened]
+
+jobs:
+  review-lockfiles:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+
+    steps:
+      # We intentionally do NOT use actions/checkout here. 
+      # This keeps the environment completely secure and satisfies CodeQL.
+
+      - name: Check files via GitHub API
+        id: check_files
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const prNumber = context.payload.pull_request.number;
+ 
+            // Get the list of files in the PR directly from the API
+            const { data: files } = await github.rest.pulls.listFiles({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber,
+              per_page: 100
+            });
+ 
+            // Look for any file **ending** in gradle.lockfile
+            const hasLockfile = files.some(file => file.filename.endsWith('gradle.lockfile'));
+            core.setOutput('has_lockfile', hasLockfile ? 'true' : 'false');
+
+      - name: Post unresolved review comment
+        if: steps.check_files.outputs.has_lockfile == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.pulls.createReview({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number,
+              event: 'REQUEST_CHANGES',
+              body: `### ⚠️ Attention Required: Lockfile Detected\nThis pull request contains modifications to one or more \`*.lockfile\` files. Please confirm that you have run update_dependency.sh to push new dependencies to the private repo.\n\n_Someone with Admin role must manually dismiss this review before merging._`
+            });

GEMINI.md

@@ -13,21 +13,14 @@ This document outlines foundational mandates, architectural patterns, and projec
 - **Verification**: Before finalizing any change, scan the imports section for redundancy.
 - **License Headers**: When creating new files, ensure the license header uses the current year (e.g., 2026). Existing files should retain their original year.
 
-## 2. Time and Precision Handling (java.time Migration)
+## 2. Time and Precision Handling
 
-- **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()`).
-- **CRITICAL MISTAKES TO AVOID:**
-    - NEVER use `toInstant(clock.nowUtc())` or `toInstant(fakeClock.nowUtc())`. Both `Clock` and `FakeClock` have a `now()` method that natively returns a `java.time.Instant`. You MUST use `clock.now()` or `fakeClock.now()` directly.
-    - NEVER double-wrap conversions like `toInstant(toDateTime(...))` or `toDateTime(toInstant(...))`.
-    - NEVER mark method parameters or local variables as `final` unnecessarily, as it clutters the codebase. For class fields and constants, use `final` where applicable (i.e. when the field is assigned once and never mutated) to enforce and communicate immutability.
-    - When using test helpers like `assertThatCommand().atTime(...)` or `ForeignKeyUtils.loadResource(...)`, ALWAYS use the `Instant` overloads. DO NOT wrap `Instant` instances in `toDateTime(...)` just to pass them to deprecated overloads.
 - **UTC Timezones:** Do not use `ZoneId.of("UTC")`. Use a statically imported `UTC` from `ZoneOffset` instead (`import static java.time.ZoneOffset.UTC;`).
-- **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()`.
+    - Avoid direct calls to `Instant.now()`, `OffsetDateTime.now()`, or `System.currentTimeMillis()`.
     - Inject `google.registry.util.Clock` (production) or `google.registry.testing.FakeClock` (tests).
-    - Use `clock.nowDate()` to get a `ZonedDateTime` in UTC.
-    - When defining timestamps for tests, prefer using a fixed, static constant (e.g., `Instant.parse("2024-03-27T10:15:30.105Z")`) over capturing `clock.now()` to prevent flaky tests caused by the passage of real time. Avoid using the Unix epoch (`START_INSTANT`) unless specifically testing epoch-related logic; instead, use realistic dates and vary them across different test suites to ensure logic isn't dependent on a specific "standard" date.
+    - Use `clock.nowDate()` to get a `LocalDate` in UTC, or `clock.nowDateTime()` to get an `OffsetDateTime` in UTC.
+    - When defining timestamps for tests, prefer using a fixed, static constant (e.g., `Instant.parse("2024-03-27T10:15:30.105Z")`) over capturing `clock.now()` to prevent flaky tests caused by the passage of real time.
 - **Beam Pipelines:**
     - Ensure `Clock` is serializable (it is by default in this project) when used in Beam `DoFn`s.
     - Pass the `Clock` through the constructor or via Dagger provider methods in the pipeline module.
@@ -42,7 +35,6 @@ This document outlines foundational mandates, architectural patterns, and projec
 - **Test Components:** Use `TestRegistryToolComponent` for command-line tool tests to bridge the gap between `main` and `nonprod/test` source sets.
 
 ### 4. Database Consistency
-- **JPA Converters:** Be aware that JPA converters (like `DateTimeConverter`) may perform truncation or transformation. Ensure application-level logic matches these transformations to avoid "dirty" state or unexpected diffs.
 - **Transaction Management:**
     - **Top-Level:** Define database transactions (`tm().transact(...)`) at the highest possible level in the call chain (e.g., in an Action, a Command, or a Flow). This ensures all operations are atomic and handled by the retry logic.
     - **DAO Methods:** Avoid declaring transactions inside low-level DAO methods. Use `tm().assertInTransaction()` to ensure that these methods are only called within a valid transactional context.
@@ -57,6 +49,7 @@ This document outlines foundational mandates, architectural patterns, and projec
 - **FakeClock and Sleeper:** Use `FakeClock` and `Sleeper` for any logic involving timeouts, delays, or expiration.
 - **Empirical Reproduction:** Before fixing a bug, always create a test case that reproduces the failure.
 - **Base Classes:** Leverage `CommandTestCase`, `EppToolCommandTestCase`, etc., to reduce boilerplate and ensure consistent setup (e.g., clock initialization).
+- **Gradle Test Patterns:** When running tests to investigate fixes in the "core" directory, try to first use the "standardTest" Gradle task. It is faster than the "test" task, which includes the "fragileTest" task. Only run the full "test" task after "standardTest" succeeds.
 
 ### 6. Project Dependencies
 - **Common Module:** When using `Clock` or other core utilities in a new or separate module (like `load-testing`), ensure `implementation project(':common')` is added to the module's `build.gradle`.
@@ -95,9 +88,8 @@ This document captures high-level architectural patterns, lessons learned from l
 - **Transaction Management:** The codebase uses a custom wrapper around JPA. Always use `tm()` (from `TransactionManagerFactory`) to interact with the database.
 - **Dependency Injection:** Dagger 2 is used extensively. If you see "cannot find symbol" errors for classes starting with `Dagger...`, the project is in a state where annotation processing failed. Fix compilation in core models first to restore generated code.
 - **Value Types:** AutoValue and "ImmutableObject" patterns are dominant. Most models follow a `Buildable` pattern with a nested `Builder`.
-- **Temporal Logic:** The project is migrating from Joda-Time to `java.time`.
+- **Temporal Logic:** The project uses `java.time` for all temporal representations.
   - Core boundaries: `DateTimeUtils.START_INSTANT` (Unix Epoch) and `DateTimeUtils.END_INSTANT` (Long.MAX_VALUE / 1000).
-  - Year Arithmetic: Use `DateTimeUtils.plusYears()` and `DateTimeUtils.minusYears()` to handle February 29th logic correctly.
 
 ## Source Control
 - **Committing:** Always create a new commit on the branch if one hasn't been created yet for the branch's specific work. Only perform amending (`git commit --amend --no-edit`) for subsequent changes once the initial commit has been successfully created.
@@ -115,14 +107,11 @@ This document captures high-level architectural patterns, lessons learned from l
 ## Self-Review Guidelines
 Before finalizing any PR or declaring a task complete, you MUST perform a thorough, rigorous self-review of your entire diff. Run `git diff HEAD^` (or review the staged changes) and actively verify the following against every modified line:
 
-1. **Imports & FQNs:** Did I leave any fully-qualified class names or static variables inline? Did I add the necessary imports for them? *Crucial Exception:* If the file already imports a class with the identical name (e.g., it uses both `java.time.Duration` and `org.joda.time.Duration`), one MUST remain fully qualified to avoid a compilation conflict.
-2. **Redundant Conversions:** Did I use `toDateTime(clock.now())` where `clock.nowUtc()` would suffice? Did I use `toDateTime(END_INSTANT)` instead of `END_OF_TIME`? Did I use `.toInstant()` or `.toDateTime()` on something that could be avoided by using a different method overload (e.g., `tm().getTxTime()`)?
-3. **Verbose Math:** Did I write any verbose time conversions inline? Are there `DateTimeUtils` methods I should be using instead? If not, should I abstract this math into `DateTimeUtils`?
-4. **Assertion Cleanliness:** Am I polluting test assertions with `toDateTime(...)` wraps? If so, I need to add overloaded assertions to the Truth Subjects instead.
-5. **Diff Scope:** Are there any formatting-only changes in files that I did not functionally modify? If so, revert them. Does the total line count of the diff align with the approved scope (e.g., ~1,000 lines for migrations)?
-6. **Commit Message:** Does the commit message title fit within 50 characters? Does the body encapsulate the entirety of the changes across the diff cleanly and professionally?
-7. **Missing Tests & Coverage:** *Perform a structured check for any new methods or modified behavior.* Did I add a new utility method (like `plusMonths(Instant, int)`) or change core logic? If so, I MUST open the corresponding test file and write tests to cover the new functionality (including edge cases, negative values, and leap years) before considering the task complete. A code review is not thorough if it only checks for compilation. I must actively ensure every new branch of logic has a test.
-8. **Package Lock:** Did I include `console-webapp/package-lock.json` in my diff? If so, I MUST revert it (`git checkout console-webapp/package-lock.json`) unless I explicitly intended to modify NPM dependencies. This file is often modified by the build process and should not be committed accidentally.
+1. **Imports & FQNs:** Did I leave any fully-qualified class names or static variables inline? Did I add the necessary imports for them? *Crucial Exception:* If the file already imports a class with the identical name (e.g., it uses both `java.util.Date` and `java.sql.Date`), one MUST remain fully qualified to avoid a compilation conflict.
+2. **Diff Scope:** Are there any formatting-only changes in files that I did not functionally modify? If so, revert them. Does the total line count of the diff align with the approved scope (e.g., ~1,000 lines for migrations)?
+3. **Commit Message:** Does the commit message title fit within 50 characters? Does the body encapsulate the entirety of the changes across the diff cleanly and professionally?
+4. **Missing Tests & Coverage:** *Perform a structured check for any new methods or modified behavior.* Did I add a new utility method (like `plusMonths(Instant, int)`) or change core logic? If so, I MUST open the corresponding test file and write tests to cover the new functionality (including edge cases, negative values, and leap years) before considering the task complete. A code review is not thorough if it only checks for compilation. I must actively ensure every new branch of logic has a test.
+5. **Package Lock:** Did I include `console-webapp/package-lock.json` in my diff? If so, I MUST revert it (`git checkout console-webapp/package-lock.json`) unless I explicitly intended to modify NPM dependencies. This file is often modified by the build process and should not be committed accidentally.
 
 Only after actively confirming these checks against your diff are you permitted to finalize the task.
 
@@ -131,30 +120,16 @@ Only after actively confirming these checks against your diff are you permitted
 
 ### 1. Compiler Warnings are Errors (`-Werror`)
 This project treats Error Prone warnings as errors.
-- **`@InlineMeSuggester`**: When creating deprecated Joda-Time bridge methods (e.g., `getTimestamp() -> return toDateTime(getTimestampInstant())`), you **MUST** immediately add `@SuppressWarnings("InlineMeSuggester")`. If you don't, the build will fail.
 - **Repeatable Annotations**: `@SuppressWarnings` is **NOT** repeatable in this environment. If a method or class already has a suppression (e.g., `@SuppressWarnings("unchecked")`), you must merge them:
-  - ❌ `@SuppressWarnings("unchecked") @SuppressWarnings("InlineMeSuggester")`
-  - ✅ `@SuppressWarnings({"unchecked", "InlineMeSuggester"})`
+  - ❌ `@SuppressWarnings("unchecked") @SuppressWarnings("MustBeClosedChecker")`
+  - ✅ `@SuppressWarnings({"unchecked", "MustBeClosedChecker"})`
 
-### 2. Resolving Ambiguity
-- **Null Overloads**: Adding an `Instant` overload to a method that previously took `DateTime` will break all `create(null)` calls. You must cast them: `create((Instant) null)`.
-- **Type Erasure**: Methods taking `Optional<DateTime>` and `Optional<Instant>` will clash due to erasure. Use distinct names, e.g., `setAutorenewEndTimeInstant(Optional<Instant> time)`.
-
-### 3. Build Strategy
-- **Surgical Changes**: In large-scale migrations, focus on "leaf" nodes first (Utilities -> Models -> Flows -> Actions).
-- **PR Size**: Minimize PR size by retaining Joda-Time bridge methods for high-level "Action" and "Flow" classes unless a full migration is requested. Reverting changes to DNS and Reporting logic while updating the underlying models is a valid strategy to keep PRs reviewable.
+### 2. Build Strategy
 - **Validation**: Always run `./gradlew build -x test` before attempting to run unit tests. Unit tests will not run if there are compilation errors in any part of the `core` module. Before finalizing a PR or declaring a task done, you MUST verify your changes. **Prefer scoped builds** (e.g., `./gradlew :core:build`) if you are only modifying backend Java code. Running the global `./gradlew build` triggers the frontend `console-webapp` build, which unnecessarily runs `npmInstallDeps` and modifies `package-lock.json`. If you must run a global build, you must revert `console-webapp/package-lock.json` afterwards. Do not declare success if formatting checks (e.g., `spotlessCheck` or `javaIncrementalFormatCheck`) or tests fail. If formatting fails, run `./gradlew spotlessApply` and then re-run your build command to verify everything passes.
 
 ## 🚫 Common Pitfalls to Avoid
 
-- **Mixing Joda and Java Durations:** Methods like `Tld.get().getRenewGracePeriodLength()` return a **Joda** `Duration`, which cannot be passed directly to `Instant.plus(...)` because it doesn't implement `TemporalAmount`. You MUST use `.plusMillis(duration.getMillis())` instead.
 - **Serialization Precision (`.000Z`):** When asserting against or generating XML/YAML files, remember that millisecond precision (`.000Z`) is required. Always use `DateTimeUtils.formatInstant(...)` to format `Instant` objects (it preserves the `.000Z` suffix) instead of `Instant.toString()` (which drops it for exact seconds). We have added custom Jackson `InstantKeySerializer`s for this purpose, but you must keep this precision in mind when manually updating `.xml` or `.yaml` test data.
-- **Static Imports:** Methods like `toDateTime`, `toInstant`, `plusYears`, `plusMonths`, and `minusDays` from `DateTimeUtils` MUST be statically imported. Do NOT use them fully qualified (e.g., `DateTimeUtils.plusMonths(...)`).
-
-- **Redundant Parses:** Never write `toDateTime(Instant.parse(...))` or `toInstant(DateTime.parse(...))`. If you need a `DateTime`, use `DateTime.parse(...)` directly. If you need an `Instant`, use `Instant.parse(...)` directly.
-- **cloneProjectedAtTime vs cloneProjectedAtTime:** When converting tests and logic that use `clock.now()` to project resource state into the future or past, do not wrap the Java `Instant` in `toDateTime()` just to call `cloneProjectedAtTime()`. Instead, switch the method call to use the native `cloneProjectedAtTime()` method which is available on all `EppResource` models.
-- **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. Furthermore, do not run a global `./gradlew build` when a scoped `./gradlew :core:build` or `./gradlew :core:test` is faster and more appropriate. Run global builds only when doing final verification.
-- **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.
 

common/build.gradle

@@ -58,7 +58,6 @@ dependencies {
   implementation deps['com.google.code.findbugs:jsr305']
   implementation deps['com.google.guava:guava']
   implementation deps['jakarta.inject:jakarta.inject-api']
-  implementation deps['joda-time:joda-time']
   implementation deps['com.google.flogger:flogger']
   implementation deps['io.github.java-diff-utils:java-diff-utils']
   implementation deps['com.google.truth:truth']

common/gradle.lockfile

@@ -37,7 +37,6 @@ io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotatio
 io.github.java-diff-utils:java-diff-utils:4.16=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-joda-time:joda-time:2.14.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 net.sf.saxon:Saxon-HE:12.5=checkstyle
 org.antlr:antlr4-runtime:4.13.2=checkstyle

common/src/main/java/google/registry/util/Clock.java

@@ -16,15 +16,16 @@ package google.registry.util;
 
 import java.io.Serializable;
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
  * A clock that tells the current time in milliseconds or nanoseconds.
  *
  * <p>Clocks are technically serializable because they are either a stateless wrapper around the
- * system clock, or for testing, are just a wrapper around a DateTime. This means that if you
+ * system clock, or for testing, are just a wrapper around an Instant. This means that if you
  * serialize a clock and deserialize it elsewhere, you won't necessarily get the same time or time
  * zone -- what you will get is a functioning clock.
  */
@@ -34,8 +35,18 @@ public interface Clock extends Serializable {
   /** Returns current Instant (which is always in UTC). */
   Instant now();
 
-  /** Returns the current time as a {@link ZonedDateTime} in UTC. */
-  default ZonedDateTime nowDate() {
-    return ZonedDateTime.ofInstant(now(), ZoneOffset.UTC);
+  /** Returns the current time as an {@link OffsetDateTime} in UTC. */
+  default OffsetDateTime nowDateTime() {
+    return OffsetDateTime.ofInstant(now(), ZoneOffset.UTC);
+  }
+
+  /** Returns the current time as a {@link LocalDate} in UTC. */
+  default LocalDate nowDate() {
+    return LocalDate.ofInstant(now(), ZoneOffset.UTC);
+  }
+
+  /** Returns the current time in milliseconds since the epoch. */
+  default long nowMillis() {
+    return now().toEpochMilli();
   }
 }

common/src/main/java/google/registry/util/DateTimeUtils.java

@@ -15,7 +15,6 @@
 package google.registry.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -24,14 +23,8 @@ import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
-import java.time.format.SignStyle;
-import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
-import javax.annotation.Nullable;
-import org.joda.time.DateTime;
-import org.joda.time.ReadableDuration;
 
 public abstract class DateTimeUtils {
 
@@ -52,15 +45,15 @@ public abstract class DateTimeUtils {
    *
    * <p>Example: {@code 2024-03-27T10:15:30.105Z}
    *
-   * <p>Handles large/negative years by using a sign prefix if necessary, compatible with {@link
-   * Instant#parse}.
+   * <p>Note: We deliberately strip the leading {@code +} sign from the formatted year field if
+   * present. While standard ISO 8601 specifies that years with more than 4 digits should be
+   * prefixed with a {@code +} sign, W3C XML Schema 1.0 (which our EPP RDE XSD uses) strictly
+   * forbids leading plus signs in {@code xsd:dateTime} strings. Suppressing the plus sign ensures
+   * our generated XML continues to pass strict XSD validation for large years (e.g. {@code
+   * 294247-01-10T04:00:54.775Z}).
    */
   private static final DateTimeFormatter ISO_8601_FORMATTER =
-      new DateTimeFormatterBuilder()
-          .appendValue(ChronoField.YEAR, 4, 10, SignStyle.NOT_NEGATIVE)
-          .appendPattern("-MM-dd'T'HH:mm:ss.SSS'Z'")
-          .toFormatter()
-          .withZone(ZoneOffset.UTC);
+      DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").withZone(ZoneOffset.UTC);
 
   /** A formatter that produces lowercase, filename-safe and job-name-safe timestamps. */
   public static final DateTimeFormatter LOWERCASE_TIMESTAMP_FORMATTER =
@@ -68,7 +61,8 @@ public abstract class DateTimeUtils {
 
   /** Formats an {@link Instant} to an ISO-8601 string. */
   public static String formatInstant(Instant instant) {
-    return ISO_8601_FORMATTER.format(instant);
+    String formatted = ISO_8601_FORMATTER.format(instant);
+    return formatted.startsWith("+") ? formatted.substring(1) : formatted;
   }
 
   /**
@@ -79,9 +73,15 @@ public abstract class DateTimeUtils {
    * large years (e.g. {@code 294247-01-10T04:00:54.775Z}).
    */
   public static Instant parseInstant(String timestamp) {
+    if (!timestamp.startsWith("+") && !timestamp.startsWith("-")) {
+      int dashIndex = timestamp.indexOf('-');
+      if (dashIndex > 4) {
+        timestamp = "+" + timestamp;
+      }
+    }
     try {
       // Try the standard millisecond precision format first.
-      return Instant.from(ISO_8601_FORMATTER.parse(timestamp));
+      return Instant.from(DateTimeFormatter.ISO_INSTANT.parse(timestamp));
     } catch (DateTimeParseException e) {
       // Fall back to the standard ISO instant parser which handles varied precision.
       return Instant.parse(timestamp);
@@ -93,7 +93,7 @@ public abstract class DateTimeUtils {
     return earliestOf(Lists.asList(first, rest));
   }
 
-  /** Returns the earliest element in a {@link Instant} iterable. */
+  /** Returns the earliest element in an {@link Instant} iterable. */
   public static Instant earliestOf(Iterable<Instant> instants) {
     checkArgument(!Iterables.isEmpty(instants));
     return Ordering.<Instant>natural().min(instants);
@@ -104,24 +104,12 @@ public abstract class DateTimeUtils {
     return latestOf(Lists.asList(first, rest));
   }
 
-  /** Returns the latest element in a {@link Instant} iterable. */
+  /** Returns the latest element in an {@link Instant} iterable. */
   public static Instant latestOf(Iterable<Instant> instants) {
     checkArgument(!Iterables.isEmpty(instants));
     return Ordering.<Instant>natural().max(instants);
   }
 
-  /** Converts a Joda-Time Duration to a java.time.Duration. */
-  @Nullable
-  public static java.time.Duration toJavaDuration(@Nullable ReadableDuration duration) {
-    return duration == null ? null : java.time.Duration.ofMillis(duration.getMillis());
-  }
-
-  /** Converts a java.time.Duration to a Joda-Time Duration. */
-  @Nullable
-  public static org.joda.time.Duration toJodaDuration(@Nullable java.time.Duration duration) {
-    return duration == null ? null : org.joda.time.Duration.millis(duration.toMillis());
-  }
-
   /** Returns whether the first {@link Instant} is equal to or earlier than the second. */
   public static boolean isBeforeOrAt(Instant timeToCheck, Instant timeToCompareTo) {
     return !timeToCheck.isAfter(timeToCompareTo);
@@ -134,7 +122,7 @@ public abstract class DateTimeUtils {
 
   /**
    * Adds years to a date, in the {@code Duration} sense of semantic years. Use this instead of
-   * {@link java.time.ZonedDateTime#plusYears} to ensure that we never end up on February 29.
+   * {@link java.time.OffsetDateTime#plusYears} to ensure that we never end up on February 29.
    */
   public static Instant plusYears(Instant now, int years) {
     checkArgument(years >= 0);
@@ -157,7 +145,7 @@ public abstract class DateTimeUtils {
 
   /**
    * Subtracts years from a date, in the {@code Duration} sense of semantic years. Use this instead
-   * of {@link java.time.ZonedDateTime#minusYears} to ensure that we never end up on February 29.
+   * of {@link java.time.OffsetDateTime#minusYears} to ensure that we never end up on February 29.
    */
   public static Instant minusYears(Instant now, long years) {
     checkArgument(years >= 0);
@@ -171,24 +159,6 @@ public abstract class DateTimeUtils {
     return instant.atZone(ZoneOffset.UTC).toLocalDate();
   }
 
-  /** Convert a joda {@link DateTime} to a java.time {@link Instant}, null-safe. */
-  @Nullable
-  public static Instant toInstant(@Nullable DateTime dateTime) {
-    return (dateTime == null) ? null : Instant.ofEpochMilli(dateTime.getMillis());
-  }
-
-  /** Convert a java.time {@link Instant} to a joda {@link DateTime}, null-safe. */
-  @Nullable
-  public static DateTime toDateTime(@Nullable Instant instant) {
-    return (instant == null) ? null : new DateTime(instant.toEpochMilli(), UTC);
-  }
-
-  /** Convert a java.time {@link java.time.Instant} to a joda {@link org.joda.time.Instant}. */
-  @Nullable
-  public static org.joda.time.Instant toJodaInstant(@Nullable java.time.Instant instant) {
-    return (instant == null) ? null : org.joda.time.Instant.ofEpochMilli(instant.toEpochMilli());
-  }
-
   public static Instant plusHours(Instant instant, long hours) {
     return instant.plus(hours, ChronoUnit.HOURS);
   }

common/src/main/java/google/registry/util/SystemClock.java

@@ -31,10 +31,9 @@ public class SystemClock implements Clock {
 
   @Override
   public Instant now() {
-    // Truncate to milliseconds to match the precision of Joda DateTime and our database schema
-    // (which uses millisecond precision via DateTimeConverter). This prevents subtle comparison
-    // bugs where a high-precision Instant would be considered "after" a truncated database
-    // timestamp.
+    // Truncate to milliseconds to match the precision of our database schema.
+    // This prevents subtle comparison bugs where a high-precision Instant would be
+    // considered "after" a truncated database timestamp.
     return Instant.now().truncatedTo(MILLIS);
   }
 }

common/src/testing/java/google/registry/testing/FakeClock.java

@@ -21,8 +21,6 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.concurrent.ThreadSafe;
-import org.joda.time.ReadableDuration;
-import org.joda.time.ReadableInstant;
 
 /** A mock clock for testing purposes that supports telling, setting, and advancing the time. */
 @ThreadSafe
@@ -41,12 +39,6 @@ public final class FakeClock implements Clock {
     this(START_INSTANT);
   }
 
-  /** Creates a FakeClock initialized to a specific time. */
-  @Deprecated
-  public FakeClock(ReadableInstant startTime) {
-    setTo(startTime);
-  }
-
   /** Creates a FakeClock initialized to a specific time. */
   public FakeClock(Instant startTime) {
     setTo(startTime);
@@ -66,12 +58,6 @@ public final class FakeClock implements Clock {
    * @param autoIncrementStep the new auto increment duration
    * @return this
    */
-  @Deprecated
-  public FakeClock setAutoIncrementStep(ReadableDuration autoIncrementStep) {
-    this.autoIncrementStepMs = autoIncrementStep.getMillis();
-    return this;
-  }
-
   /**
    * Sets the increment applied to the clock whenever it is queried. The increment is zero by
    * default: the clock is left unchanged when queried.
@@ -91,23 +77,11 @@ public final class FakeClock implements Clock {
     advanceBy(Duration.ofMillis(1));
   }
 
-  /** Advances clock by some duration. */
-  @Deprecated
-  public void advanceBy(ReadableDuration duration) {
-    currentTimeMillis.addAndGet(duration.getMillis());
-  }
-
   /** Advances clock by some duration. */
   public void advanceBy(Duration duration) {
     currentTimeMillis.addAndGet(duration.toMillis());
   }
 
-  /** Sets the time to the specified instant. */
-  @Deprecated
-  public void setTo(ReadableInstant time) {
-    currentTimeMillis.set(time.getMillis());
-  }
-
   /** Sets the time to the specified instant. */
   public void setTo(Instant time) {
     currentTimeMillis.set(time.toEpochMilli());

config/nom_build.py

@@ -409,4 +409,3 @@ if __name__ == '__main__':
         sys.exit(main(sys.argv))
     except Abort as ex:
         sys.exit(1)
-

config/presubmits.py

@@ -102,6 +102,22 @@ PRESUBMITS = {
                    {"node_modules/", ".idea"}, REQUIRED):
         "Source files must end in a newline.",
 
+    # Files must not end with extraneous blank lines
+    PresubmitCheck(
+        r".*\n\n$",
+        ("java", "js", "soy", "sql", "py", "sh", "gradle", "ts", "xml"),
+        {"node_modules/", ".idea", "nomulus.golden.sql"},
+    ):
+        "Source files must not end with extraneous blank lines.",
+
+    # Duplicate empty lines
+    PresubmitCheck(
+        r".*\n\n\n.*",
+        ("java", "js", "soy", "sh", "gradle", "ts", "xml"),
+        {"node_modules/", ".idea"},
+    ):
+        "Source files must not contain duplicate empty lines.",
+
     # System.(out|err).println should only appear in tools/ or load-testing/
     PresubmitCheck(
         r".*\bSystem\s*\.\s*(?:out|err)\s*\.\s*print.*", "java", {
@@ -160,7 +176,8 @@ PRESUBMITS = {
             "SelfSignedCaCertificate.java",
             "X509Utils.java",
             "TmchCertificateAuthority.java",
-            "DelegatedCredentials.java"
+            "DelegatedCredentials.java",
+            "SslInitializerTestUtils.java"
         },
     ):
         "Do not use java.util.Date. Use classes in java.time package instead.",
@@ -202,85 +219,24 @@ PRESUBMITS = {
         {},
     ):
         "Do not use .isEqualTo(Optional.of(...)). Use Truth's .hasValue(...) instead.",
-    # TODO: Remove the java.time migration presubmit checks below once the entire codebase has been migrated to java.time.
     PresubmitCheck(
-        r".*toDateTime\(\s*toInstant\(.*",
-        "java",
-        {"DateTimeUtilsTest.java"},
-    ):
-        "Do not double-wrap toDateTime(toInstant(...)).",
-    PresubmitCheck(
-        r".*toInstant\(\s*toDateTime\(.*",
-        "java",
-        {"DateTimeUtilsTest.java"},
-    ):
-        "Do not double-wrap toInstant(toDateTime(...)).",
-    PresubmitCheck(
-        r".*toInstant\([^;]*[cC]lock\.now\(\).*",
+        r".*java\.time\.ZonedDateTime.*",
         "java",
         {},
     ):
-        "Do not use toInstant(clock.now()). Use clock.now() instead.",
-    PresubmitCheck(
-        r".*toDateTime\([^;]*[cC]lock\.now\(\).*",
-        "java",
-        {},
-    ):
-        "Do not use toDateTime(clock.now()). Use clock.now() and Instant overloads instead.",
-    PresubmitCheck(
-        r".*toInstant\([^;]*tm\(\)\.getTxTime\(\).*",
-        "java",
-        {},
-    ):
-        "Do not use toInstant(tm().getTxTime()). Use tm().getTxTime() instead.",
-    PresubmitCheck(
-        r".*toDateTime\([^;]*tm\(\)\.getTxTime\(\).*",
-        "java",
-        {},
-    ):
-        "Do not use toDateTime(tm().getTxTime()). Use tm().getTxTime() and Instant overloads instead.",
-    PresubmitCheck(
-        r".*\(\s*Instant\s*\)\s*(?:this\.)?(?:fakeClock|clock)\.now\(\s*\).*",
-        "java",
-        {},
-    ):
-        "Do not unnecessarily cast clock.now() to Instant.",
-    PresubmitCheck(
-        r".*toDateTime\(\s*Instant\.now\(.*",
-        "java",
-        {},
-    ):
-        "Do not wrap Instant.now() in toDateTime. Use DateTime.now(UTC) directly.",
-    PresubmitCheck(
-        r".*toInstant\(\s*DateTime\.now\(.*",
-        "java",
-        {},
-    ):
-        "Do not wrap DateTime.now() in toInstant. Use Instant.now().truncatedTo(ChronoUnit.MILLIS) directly.",
-    PresubmitCheck(
-        r".*toDateTime\(\s*Instant\.parse\(.*",
-        "java",
-        {"DateTimeUtilsTest.java"},
-    ):
-        "Do not wrap Instant.parse in toDateTime. Use DateTime.parse directly.",
-    PresubmitCheck(
-        r".*toInstant\(\s*DateTime\.parse\(.*",
-        "java",
-        {"DateTimeUtilsTest.java"},
-    ):
-        "Do not wrap DateTime.parse in toInstant. Use Instant.parse directly.",
-    PresubmitCheck(
-        r".*cloneProjectedAtTime\(\s*toDateTime\(.*",
-        "java",
-        {},
-    ):
-        "Do not use cloneProjectedAtTime(toDateTime(...)). Use cloneProjectedAtTime(...) instead.",
+        "Do not use java.time.ZonedDateTime. Use java.time.OffsetDateTime per go/avoid-zdt.",
     PresubmitCheck(
         r".*ZoneId\.of\(\s*\"UTC\"\s*\).*",
         "java",
         {},
     ):
-        "Do not use ZoneId.of(\"UTC\"). Use java.time.ZoneOffset.UTC."
+        "Do not use ZoneId.of(\"UTC\"). Use java.time.ZoneOffset.UTC.",
+    PresubmitCheck(
+        r".*org\.joda\.time.*",
+        "java",
+        {"SafeBrowsingTransforms.java"},
+    ):
+        "Do not use Joda-Time. Use java.time instead.",
 }
 
 # Note that this regex only works for one kind of Flyway file.  If we want to

console-webapp/package-lock.json

@@ -628,6 +628,18 @@
         }
       }
     },
+    "node_modules/@angular/build/node_modules/@types/node": {
+      "version": "25.7.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/@types/node/-/node-25.7.0.tgz",
+      "integrity": "sha512-z+pdZyxE+RTQE9AcboAZCb4otwcrvgHD+GlBpPgn0emDVt0ohrTMhAwlr2Wd9nZ+nihhYFxO2pThz3C5qSu2Eg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~7.21.0"
+      }
+    },
     "node_modules/@angular/build/node_modules/@vitejs/plugin-basic-ssl": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.1.0.tgz",
@@ -641,6 +653,24 @@
         "vite": "^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/@angular/build/node_modules/chokidar": {
+      "version": "5.0.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "readdirp": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@angular/build/node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
@@ -664,6 +694,22 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/@angular/build/node_modules/readdirp": {
+      "version": "5.0.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/readdirp/-/readdirp-5.0.0.tgz",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@angular/build/node_modules/rxjs": {
       "version": "7.8.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
@@ -697,6 +743,15 @@
         "node": ">= 12"
       }
     },
+    "node_modules/@angular/build/node_modules/undici-types": {
+      "version": "7.21.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/undici-types/-/undici-types-7.21.0.tgz",
+      "integrity": "sha512-w9IMgQrz4O0YN1LtB7K5P63vhlIOvC7opSmouCJ+ZywlPAlO9gIkJ+otk6LvGpAs2wg4econaCz3TvQ9xPoyuQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/@angular/build/node_modules/vite": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
@@ -916,6 +971,24 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@angular/cli/node_modules/chokidar": {
+      "version": "5.0.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "readdirp": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@angular/cli/node_modules/cli-spinners": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.4.0.tgz",
@@ -1019,6 +1092,22 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/@angular/cli/node_modules/readdirp": {
+      "version": "5.0.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/readdirp/-/readdirp-5.0.0.tgz",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@angular/cli/node_modules/rxjs": {
       "version": "7.8.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
@@ -4606,6 +4695,24 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@schematics/angular/node_modules/chokidar": {
+      "version": "5.0.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "readdirp": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@schematics/angular/node_modules/cli-spinners": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.4.0.tgz",
@@ -4709,6 +4816,22 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/@schematics/angular/node_modules/readdirp": {
+      "version": "5.0.0",
+      "resolved": "https://us-npm.pkg.dev/artifact-foundry-prod/ah-3p-staging-npm/readdirp/-/readdirp-5.0.0.tgz",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@schematics/angular/node_modules/rxjs": {
       "version": "7.8.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",

console-webapp/src/app/app.module.ts

@@ -23,7 +23,11 @@ import { MaterialModule } from './material.module';
 
 import { BackendService } from './shared/services/backend.service';
 
-import { provideHttpClient } from '@angular/common/http';
+import {
+  HttpClientXsrfModule,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 import { BillingInfoComponent } from './billingInfo/billingInfo.component';
 import {
@@ -118,6 +122,10 @@ export class SelectedRegistrarModule {}
     MaterialModule,
     SelectedRegistrarModule,
     SnackBarModule,
+    HttpClientXsrfModule.withOptions({
+      cookieName: 'X-CSRF-Token',
+      headerName: 'X-CSRF-Token',
+    }),
   ],
   providers: [
     BackendService,
@@ -130,7 +138,7 @@ export class SelectedRegistrarModule {}
         subscriptSizing: 'dynamic',
       },
     },
-    provideHttpClient(),
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 export class AppModule {}

core/build.gradle

@@ -198,7 +198,6 @@ dependencies {
   implementation deps['jakarta.persistence:jakarta.persistence-api']
   implementation deps['jakarta.servlet:jakarta.servlet-api']
   implementation deps['jakarta.xml.bind:jakarta.xml.bind-api']
-  implementation deps['joda-time:joda-time']
   implementation deps['org.antlr:antlr4']
   implementation deps['org.antlr:antlr4-runtime']
   implementation deps['org.apache.avro:avro']
@@ -479,7 +478,6 @@ Optional<List<String>> getToolArgsList() {
   return Optional.empty()
 }
 
-
 // To run the nomulus tools with these command line tokens:
 // "--foo", "bar baz", "--qux=quz"
 //   gradle core:registryTool --args="--foo 'bar baz' --qux=quz"
@@ -819,7 +817,6 @@ test {
   // TODO(weiminyu): Remove dependency on sqlIntegrationTest
 }.dependsOn(fragileTest, standardTest, registryToolIntegrationTest, sqlIntegrationTest)
 
-
 // When we override tests, we also break the cleanTest command.
 cleanTest.dependsOn(cleanFragileTest, cleanStandardTest,
                     cleanRegistryToolIntegrationTest, cleanSqlIntegrationTest)

core/gradle.lockfile

@@ -321,26 +321,26 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.1
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-api:1.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-api:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-context:1.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-context:1.60.1=testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-logging:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.62.0=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-logging:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-extension-incubator:1.35.0-alpha=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-sdk-common:1.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.47.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.60.1=testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.62.0=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-sdk-logs:1.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-sdk-logs:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-logs:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-sdk-metrics:1.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-sdk-trace:1.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-sdk:1.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.60.1=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.62.0=testCompileClasspath,testRuntimeClasspath
 io.outfoxx:swiftpoet:1.3.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.27.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 io.protostuff:protostuff-api:1.8.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -465,8 +465,8 @@ org.eclipse.jetty:jetty-server:12.1.9=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-session:12.1.9=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util:12.1.9=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-xml:12.1.9=testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-core:12.6.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-database-postgresql:12.6.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-core:12.6.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-database-postgresql:12.6.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:codemodel:4.0.8=jaxb
 org.glassfish.jaxb:jaxb-core:4.0.6=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-core:4.0.8=jaxb
@@ -553,23 +553,23 @@ org.pcollections:pcollections:4.0.1=annotationProcessor,nonprodAnnotationProcess
 org.postgresql:postgresql:42.7.11=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.reflections:reflections:0.10.2=checkstyle
 org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-api:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-chrome-driver:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-chromium-driver:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-devtools-v145:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-devtools-v146:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-devtools-v147:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-edge-driver:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-firefox-driver:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-http:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-ie-driver:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-java:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-json:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-manager:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-os:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-remote-driver:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-safari-driver:4.43.0=testCompileClasspath,testRuntimeClasspath
-org.seleniumhq.selenium:selenium-support:4.43.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-api:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-chrome-driver:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-chromium-driver:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-devtools-v146:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-devtools-v147:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-devtools-v148:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-edge-driver:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-firefox-driver:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-http:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-ie-driver:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-java:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-json:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-manager:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-os:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-remote-driver:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-safari-driver:4.44.0=testCompileClasspath,testRuntimeClasspath
+org.seleniumhq.selenium:selenium-support:4.44.0=testCompileClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:1.7.36=testCompileClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.30=testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

core/src/main/java/google/registry/batch/BatchModule.java

@@ -54,9 +54,15 @@ public class BatchModule {
   static final int DEFAULT_MAX_QPS = 10;
 
   @Provides
-  @Parameter("url")
-  static String provideUrl(HttpServletRequest req) {
-    return extractRequiredParameter(req, "url");
+  @Parameter("replyTo")
+  static String provideReplyTo(HttpServletRequest req) {
+    return extractRequiredParameter(req, "replyTo");
+  }
+
+  @Provides
+  @Parameter("receiver")
+  static String provideReceiver(HttpServletRequest req) {
+    return extractRequiredParameter(req, "receiver");
   }
 
   @Provides

core/src/main/java/google/registry/batch/CannedScriptExecutionAction.java

@@ -16,30 +16,35 @@ package google.registry.batch;
 
 import static google.registry.request.Action.Method.GET;
 import static google.registry.request.Action.Method.POST;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.google.api.services.gmail.Gmail;
+import com.google.common.collect.ImmutableList;
 import com.google.common.flogger.FluentLogger;
+import com.google.common.net.MediaType;
+import dagger.Lazy;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.groups.GmailClient;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
-import google.registry.request.UrlConnectionService;
-import google.registry.request.UrlConnectionUtils;
 import google.registry.request.auth.Auth;
+import google.registry.util.EmailMessage;
+import google.registry.util.Retrier;
 import jakarta.inject.Inject;
-import java.net.URL;
-import javax.net.ssl.HttpsURLConnection;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import java.util.Optional;
 
 /**
  * Action that executes a canned script specified by the caller.
  *
  * <p>This class provides a hook for invoking hard-coded methods. The main use case is to verify in
  * Sandbox and Production environments new features that depend on environment-specific
- * configurations. For example, the {@code DelegatedCredential}, which requires correct GWorkspace
- * configuration, has been tested this way. Since it is a hassle to add or remove endpoints, we keep
- * this class all the time.
+ * configurations.
  *
  * <p>This action can be invoked using the Nomulus CLI command: {@code nomulus -e ${env} curl
- * --service BACKEND -X POST -u '/_dr/task/executeCannedScript}'}
+ * --service BACKEND -X POST -d 'sender=sender@example.com' -d 'receiver=receiver@example.com' -u
+ * '/_dr/task/executeCannedScript'}
  */
 @Action(
     service = Action.Service.BACKEND,
@@ -50,39 +55,69 @@ import javax.net.ssl.HttpsURLConnection;
 public class CannedScriptExecutionAction implements Runnable {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
-  @Inject UrlConnectionService urlConnectionService;
+  @Inject Lazy<Gmail> gmail;
+  @Inject Retrier retrier;
+
+  @Inject
+  @Config("isEmailSendingEnabled")
+  boolean isEmailSendingEnabled;
+
   @Inject Response response;
 
   @Inject
-  @Parameter("url")
-  String url;
+  @Parameter("replyTo")
+  String replyTo;
+
+  @Inject
+  @Parameter("receiver")
+  String receiver;
+
+  @Config("invoiceReplyToEmailAddress")
+  Optional<InternetAddress> replyToEmailAddressFromConfig;
 
   @Inject
   CannedScriptExecutionAction() {}
 
   @Override
   public void run() {
-    Integer responseCode = null;
-    String responseContent = null;
+    // For b/510340944, validating a new G Workspace user can send email. Code below can be
+    // removed or changed afterward.
     try {
-      logger.atInfo().log("Connecting to: %s", url);
-      HttpsURLConnection connection =
-          (HttpsURLConnection) urlConnectionService.createConnection(new URL(url));
-      responseCode = connection.getResponseCode();
-      logger.atInfo().log("Code: %d", responseCode);
-      logger.atInfo().log("Headers: %s", connection.getHeaderFields());
-      responseContent = new String(UrlConnectionUtils.getResponseBytes(connection), UTF_8);
-      logger.atInfo().log("Response: %s", responseContent);
+      logger.atInfo().log("Sending email to %s with replyTo %s", receiver, replyTo);
+      GmailClient gmailClient =
+          new GmailClient(gmail, retrier, isEmailSendingEnabled, new InternetAddress(replyTo));
+      gmailClient.sendEmail(
+          EmailMessage.newBuilder()
+              .addRecipient(new InternetAddress(receiver))
+              .setSubject(String.format("Email with manually set replyTo header %s", replyTo))
+              .setBody("See subject")
+              .build());
+
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
+
+      gmailClient.sendEmail(
+          EmailMessage.newBuilder()
+              .setSubject(
+                  String.format(
+                      "Email with injected replyTo header %s", replyToEmailAddressFromConfig))
+              .setBody("See header")
+              .setRecipients(ImmutableList.of(new InternetAddress(receiver)))
+              .setReplyToEmailAddress(replyToEmailAddressFromConfig)
+              .setContentType(MediaType.HTML_UTF_8)
+              .build());
+      response.setPayload("Emails sent successfully.");
+    } catch (AddressException e) {
+      logger.atWarning().withCause(e).log(
+          "Invalid email address: sender=%s, receiver=%s", replyTo, receiver);
+      response.setStatus(400);
+      response.setPayload("Invalid email address provided.");
     } catch (Exception e) {
-      logger.atWarning().withCause(e).log("Connection to %s failed", url);
+      logger.atSevere().withCause(e).log("Failed to send email");
       throw new RuntimeException(e);
-    } finally {
-      if (responseCode != null) {
-        response.setStatus(responseCode);
-      }
-      if (responseContent != null) {
-        response.setPayload(responseContent);
-      }
     }
   }
 }

core/src/main/java/google/registry/batch/DeleteProberDataAction.java

@@ -92,7 +92,7 @@ public class DeleteProberDataAction implements Runnable {
   //    prevents accidental double-map with the same key from immediately deleting active domains)
   //
   // Note: creationTime must be compared to a Java object (CreateAutoTimestamp) but deletionTime can
-  // be compared directly to the SQL timestamp (it's a DateTime)
+  // be compared directly to the SQL timestamp (it's an Instant)
   private static final String DOMAIN_QUERY_STRING =
       "FROM Domain d WHERE d.tld IN :tlds AND d.domainName NOT LIKE 'nic.%%' AND"
           + " (d.subordinateHosts IS NULL OR array_length(d.subordinateHosts) = 0) AND"

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

@@ -39,8 +39,8 @@ import org.jetbrains.annotations.NotNull;
  * A record representing a single billable event, parsed from a {@code SchemaAndRecord}.
  *
  * @param id The unique ID for the {@code BillingEvent} associated with this event.
- * @param billingTime The DateTime (in UTC) this event becomes billable.
- * @param eventTime The DateTime (in UTC) this event was generated.
+ * @param billingTime The Instant (in UTC) this event becomes billable.
+ * @param eventTime The Instant (in UTC) this event was generated.
  * @param registrarId The billed registrar's name.
  * @param billingId The billed registrar's billing account key.
  * @param poNumber The Purchase Order number.
@@ -225,7 +225,6 @@ public record BillingEvent(
             "UnitPriceCurrency",
             "PONumber");
 
-
     /** Generates the CSV header for the overall invoice. */
     static String invoiceHeader() {
       return Joiner.on(",").join(INVOICE_HEADERS);

core/src/main/java/google/registry/beam/common/RegistryQuery.java

@@ -22,12 +22,10 @@ import jakarta.persistence.Query;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaQuery;
 import java.io.Serializable;
-import java.time.Instant;
 import java.util.Map;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import org.joda.time.DateTime;
 
 /** Interface for query instances used by {@link RegistryJpaIO.Read}. */
 public interface RegistryQuery<T> extends Serializable {
@@ -61,11 +59,7 @@ public interface RegistryQuery<T> extends Serializable {
       if (parameters != null) {
         parameters.forEach(
             (key, value) -> {
-              if (value instanceof DateTime dt) {
-                query.setParameter(key, Instant.ofEpochMilli(dt.getMillis()));
-              } else {
-                query.setParameter(key, value);
-              }
+              query.setParameter(key, value);
             });
       }
       JpaTransactionManager.setQueryFetchSize(query, QUERY_FETCH_SIZE);

core/src/main/java/google/registry/beam/rde/RdeIO.java

@@ -220,6 +220,9 @@ public class RdeIO {
           }
         }
 
+        output.write(marshaller.marshalRdeEppParams());
+        counter.increment(RdeResourceType.EPP_PARAMS);
+
         // Output XML that says how many resources were emitted.
         header = counter.makeHeader(tld, mode);
         output.write(marshaller.marshalOrDie(new XjcRdeHeaderElement(header)));

core/src/main/java/google/registry/beam/rde/RdePipeline.java

@@ -21,7 +21,6 @@ import static google.registry.beam.rde.RdePipeline.TupleTags.DOMAIN_FRAGMENTS;
 import static google.registry.beam.rde.RdePipeline.TupleTags.EXTERNAL_HOST_FRAGMENTS;
 import static google.registry.beam.rde.RdePipeline.TupleTags.HOST_TO_PENDING_DEPOSIT;
 import static google.registry.beam.rde.RdePipeline.TupleTags.PENDING_DEPOSIT;
-import static google.registry.beam.rde.RdePipeline.TupleTags.REFERENCED_CONTACTS;
 import static google.registry.beam.rde.RdePipeline.TupleTags.REFERENCED_HOSTS;
 import static google.registry.beam.rde.RdePipeline.TupleTags.REVISION_ID;
 import static google.registry.beam.rde.RdePipeline.TupleTags.SUPERORDINATE_DOMAINS;
@@ -131,9 +130,8 @@ import org.apache.beam.sdk.values.TypeDescriptor;
  *
  * After the most recent (live) domain resources are loaded from the corresponding history objects,
  * we marshall them to deposit fragments and emit the (pending deposit: deposit fragment) pairs for
- * further processing. We also find all the contacts and hosts referenced by a given domain and emit
- * pairs of (contact/host repo ID: pending deposit) for all RDE pending deposits for further
- * processing.
+ * further processing. We also find all the hosts referenced by a given domain and emit pairs of
+ * (host repo ID: pending deposit) for all RDE pending deposits for further processing.
  *
  * <h3>{@link Host}</h3>
  *
@@ -358,7 +356,6 @@ public class RdePipeline implements Serializable {
 
   private <T extends HistoryEntry> EppResource loadResourceByHistoryEntryId(
       Class<T> historyEntryClazz, String repoId, long revisionId) {
-
     return tm().transact(
             () ->
                 tm().loadByKey(
@@ -372,8 +369,8 @@ public class RdePipeline implements Serializable {
    * Remove unreferenced resources by joining the (repoId, pendingDeposit) pair with the (repoId,
    * revisionId) on the repoId.
    *
-   * <p>The (repoId, pendingDeposit) pairs denote resources (contact, host) that are referenced from
-   * a domain, that are to be included in the corresponding pending deposit.
+   * <p>The (repoId, pendingDeposit) pairs denote hosts that are referenced from a domain, that are
+   * to be included in the corresponding pending deposit.
    *
    * <p>The (repoId, revisionId) paris come from the most recent history entry query, which can be
    * used to load the embedded resources themselves.
@@ -423,7 +420,7 @@ public class RdePipeline implements Serializable {
     Counter domainFragmentCounter = Metrics.counter("RDE", "DomainFragment");
     Counter referencedHostCounter = Metrics.counter("RDE", "ReferencedHost");
     return domainHistories.apply(
-        "Map DomainHistory to DepositFragment " + "and emit referenced Contact and Host",
+        "Map DomainHistory to DepositFragment and emit referenced Host",
         ParDo.of(
                 new DoFn<KV<String, Long>, KV<PendingDeposit, DepositFragment>>() {
                   @ProcessElement
@@ -465,8 +462,7 @@ public class RdePipeline implements Serializable {
                             });
                   }
                 })
-            .withOutputTags(
-                DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_CONTACTS).and(REFERENCED_HOSTS)));
+            .withOutputTags(DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_HOSTS)));
   }
 
   private PCollectionTuple processHostHistories(
@@ -627,9 +623,6 @@ public class RdePipeline implements Serializable {
     protected static final TupleTag<KV<PendingDeposit, DepositFragment>> DOMAIN_FRAGMENTS =
         new TupleTag<>() {};
 
-    protected static final TupleTag<KV<String, PendingDeposit>> REFERENCED_CONTACTS =
-        new TupleTag<>() {};
-
     protected static final TupleTag<KV<String, PendingDeposit>> REFERENCED_HOSTS =
         new TupleTag<>() {};
 

core/src/main/java/google/registry/beam/spec11/SafeBrowsingTransforms.java

@@ -14,7 +14,6 @@
 
 package google.registry.beam.spec11;
 
-import static google.registry.util.DateTimeUtils.toJodaInstant;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.http.HttpStatus.SC_OK;
 
@@ -132,7 +131,13 @@ public class SafeBrowsingTransforms {
       if (!domainNameInfoBuffer.isEmpty()) {
         ImmutableSet<KV<DomainNameInfo, ThreatMatch>> results = evaluateAndFlush();
         results.forEach(
-            (kv) -> context.output(kv, toJodaInstant(clock.now()), GlobalWindow.INSTANCE));
+            kv -> {
+              // The Apache Beam API requires org.joda.time.Instant here.
+              @SuppressWarnings("UnnecessarilyFullyQualified")
+              org.joda.time.Instant timestamp =
+                  org.joda.time.Instant.ofEpochMilli(clock.nowMillis());
+              context.output(kv, timestamp, GlobalWindow.INSTANCE);
+            });
       }
     }
 

core/src/main/java/google/registry/bsa/persistence/DownloadScheduler.java

@@ -114,11 +114,7 @@ public final class DownloadScheduler {
   }
 
   private boolean isTimeAgain(BsaDownload mostRecent, Duration interval) {
-    return mostRecent
-        .getCreationTime()
-        .plusMillis(interval.toMillis())
-        .minusMillis(CRON_JITTER.toMillis())
-        .isBefore(clock.now());
+    return mostRecent.getCreationTime().plus(interval).minus(CRON_JITTER).isBefore(clock.now());
   }
 
   /**

core/src/main/java/google/registry/config/DelegatedCredentials.java

@@ -155,7 +155,7 @@ public class DelegatedCredentials extends GoogleCredentials {
   @Override
   public AccessToken refreshAccessToken() throws IOException {
     JsonFactory jsonFactory = JSON_FACTORY;
-    long currentTime = clock.now().toEpochMilli();
+    long currentTime = clock.nowMillis();
     String assertion = createAssertion(jsonFactory, currentTime);
 
     GenericData tokenRequest = new GenericData();

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -50,6 +50,7 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.net.URI;
 import java.net.URL;
+import java.time.DayOfWeek;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Map.Entry;
@@ -57,7 +58,6 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.joda.time.DateTimeConstants;
 
 /**
  * Central clearing-house for all configuration.
@@ -271,7 +271,7 @@ public final class RegistryConfig {
     @Provides
     @Config("brdaDayOfWeek")
     public static int provideBrdaDayOfWeek() {
-      return DateTimeConstants.TUESDAY;
+      return DayOfWeek.TUESDAY.getValue();
     }
 
     /**
@@ -1637,7 +1637,6 @@ public final class RegistryConfig {
     return CONFIG_SETTINGS.get().registryPolicy.contactAndHostRoidSuffix;
   }
 
-
   /** A discount for all sunrise domain creates, between 0.0 (no discount) and 1.0 (free). */
   public static double getSunriseDomainCreateDiscount() {
     return CONFIG_SETTINGS.get().registryPolicy.sunriseDomainCreateDiscount;

core/src/main/java/google/registry/config/files/cloud-tasks-queue.xml

@@ -71,7 +71,6 @@
     <max-backoff>180s</max-backoff>
   </queue>
 
-
   <!-- Queue for tasks that communicate with TMCH MarksDB webserver. -->
   <queue>
     <name>marksdb</name>

core/src/main/java/google/registry/flows/EppTlsAction.java

@@ -49,4 +49,3 @@ public class EppTlsAction implements Runnable {
         inputXmlBytes);
   }
 }
-

core/src/main/java/google/registry/flows/FlowComponent.java

@@ -19,16 +19,6 @@ import dagger.Provides;
 import dagger.Subcomponent;
 import google.registry.batch.BatchModule;
 import google.registry.dns.DnsModule;
-import google.registry.flows.contact.ContactCheckFlow;
-import google.registry.flows.contact.ContactCreateFlow;
-import google.registry.flows.contact.ContactDeleteFlow;
-import google.registry.flows.contact.ContactInfoFlow;
-import google.registry.flows.contact.ContactTransferApproveFlow;
-import google.registry.flows.contact.ContactTransferCancelFlow;
-import google.registry.flows.contact.ContactTransferQueryFlow;
-import google.registry.flows.contact.ContactTransferRejectFlow;
-import google.registry.flows.contact.ContactTransferRequestFlow;
-import google.registry.flows.contact.ContactUpdateFlow;
 import google.registry.flows.custom.CustomLogicModule;
 import google.registry.flows.domain.DomainCheckFlow;
 import google.registry.flows.domain.DomainClaimsCheckFlow;
@@ -54,6 +44,8 @@ import google.registry.flows.session.HelloFlow;
 import google.registry.flows.session.LoginFlow;
 import google.registry.flows.session.LogoutFlow;
 import google.registry.model.eppcommon.Trid;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 /** Dagger component for flow classes. */
 @FlowScope
@@ -69,16 +61,6 @@ public interface FlowComponent {
   FlowRunner flowRunner();
 
   // Flows must be added here and in FlowComponentModule below.
-  ContactCheckFlow contactCheckFlow();
-  ContactCreateFlow contactCreateFlow();
-  ContactDeleteFlow contactDeleteFlow();
-  ContactInfoFlow contactInfoFlow();
-  ContactTransferApproveFlow contactTransferApproveFlow();
-  ContactTransferCancelFlow contactTransferCancelFlow();
-  ContactTransferQueryFlow contactTransferQueryFlow();
-  ContactTransferRejectFlow contactTransferRejectFlow();
-  ContactTransferRequestFlow contactTransferRequestFlow();
-  ContactUpdateFlow contactUpdateFlow();
   DomainCheckFlow domainCheckFlow();
   DomainClaimsCheckFlow domainClaimsCheckFlow();
   DomainCreateFlow domainCreateFlow();
@@ -118,40 +100,16 @@ public interface FlowComponent {
     // TODO(b/29874464): fix this in a cleaner way.
     @Provides
     static Flow provideFlow(FlowComponent flows, Class<? extends Flow> clazz) {
-      return clazz.equals(ContactCheckFlow.class) ? flows.contactCheckFlow()
-          : clazz.equals(ContactCreateFlow.class) ? flows.contactCreateFlow()
-          : clazz.equals(ContactDeleteFlow.class) ? flows.contactDeleteFlow()
-          : clazz.equals(ContactInfoFlow.class) ? flows.contactInfoFlow()
-          : clazz.equals(ContactTransferApproveFlow.class) ? flows.contactTransferApproveFlow()
-          : clazz.equals(ContactTransferCancelFlow.class) ? flows.contactTransferCancelFlow()
-          : clazz.equals(ContactTransferQueryFlow.class) ? flows.contactTransferQueryFlow()
-          : clazz.equals(ContactTransferRejectFlow.class) ? flows.contactTransferRejectFlow()
-          : clazz.equals(ContactTransferRequestFlow.class) ? flows.contactTransferRequestFlow()
-          : clazz.equals(ContactUpdateFlow.class) ? flows.contactUpdateFlow()
-          : clazz.equals(DomainCheckFlow.class) ? flows.domainCheckFlow()
-          : clazz.equals(DomainClaimsCheckFlow.class) ? flows.domainClaimsCheckFlow()
-          : clazz.equals(DomainCreateFlow.class) ? flows.domainCreateFlow()
-          : clazz.equals(DomainDeleteFlow.class) ? flows.domainDeleteFlow()
-          : clazz.equals(DomainInfoFlow.class) ? flows.domainInfoFlow()
-          : clazz.equals(DomainRenewFlow.class) ? flows.domainRenewFlow()
-          : clazz.equals(DomainRestoreRequestFlow.class) ? flows.domainRestoreRequestFlow()
-          : clazz.equals(DomainTransferApproveFlow.class) ? flows.domainTransferApproveFlow()
-          : clazz.equals(DomainTransferCancelFlow.class) ? flows.domainTransferCancelFlow()
-          : clazz.equals(DomainTransferQueryFlow.class) ? flows.domainTransferQueryFlow()
-          : clazz.equals(DomainTransferRejectFlow.class) ? flows.domainTransferRejectFlow()
-          : clazz.equals(DomainTransferRequestFlow.class) ? flows.domainTransferRequestFlow()
-          : clazz.equals(DomainUpdateFlow.class) ? flows.domainUpdateFlow()
-          : clazz.equals(HostCheckFlow.class) ? flows.hostCheckFlow()
-          : clazz.equals(HostCreateFlow.class) ? flows.hostCreateFlow()
-          : clazz.equals(HostDeleteFlow.class) ? flows.hostDeleteFlow()
-          : clazz.equals(HostInfoFlow.class) ? flows.hostInfoFlow()
-          : clazz.equals(HostUpdateFlow.class) ? flows.hostUpdateFlow()
-          : clazz.equals(PollAckFlow.class) ? flows.pollAckFlow()
-          : clazz.equals(PollRequestFlow.class) ? flows.pollRequestFlow()
-          : clazz.equals(HelloFlow.class) ? flows.helloFlow()
-          : clazz.equals(LoginFlow.class) ? flows.loginFlow()
-          : clazz.equals(LogoutFlow.class) ? flows.logoutFlow()
-          : null;
+      String simpleName = clazz.getSimpleName();
+      // The method name is the same as the class name but with the first character being lowercase
+      String methodName = Character.toLowerCase(simpleName.charAt(0)) + simpleName.substring(1);
+      try {
+        Method method = FlowComponent.class.getMethod(methodName);
+        method.setAccessible(true);
+        return (Flow) method.invoke(flows);
+      } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+        throw new RuntimeException(e);
+      }
     }
   }
 }

core/src/main/java/google/registry/flows/StatelessRequestSessionMetadata.java

@@ -71,6 +71,4 @@ public class StatelessRequestSessionMetadata extends SessionMetadata {
     throw new UnsupportedOperationException();
   }
 
-
 }
-

core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to check whether a contact can be provisioned.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_CHECK)
-public final class ContactCheckFlow extends ContactsProhibitedFlow {
-  @Inject ContactCheckFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow meant to create a new contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_CREATE)
-public final class ContactCreateFlow extends ContactsProhibitedFlow {
-  @Inject ContactCreateFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java

@@ -1,33 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to delete a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_DELETE)
-public final class ContactDeleteFlow extends ContactsProhibitedFlow {
-  @Inject
-  ContactDeleteFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java

@@ -1,33 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to return information about a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_INFO)
-public final class ContactInfoFlow extends ContactsProhibitedFlow {
-  @Inject
-  ContactInfoFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to approve a pending transfer on a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_APPROVE)
-public final class ContactTransferApproveFlow extends ContactsProhibitedFlow {
-  @Inject ContactTransferApproveFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to cancel a pending transfer on a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_CANCEL)
-public final class ContactTransferCancelFlow extends ContactsProhibitedFlow {
-  @Inject ContactTransferCancelFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to query a pending transfer on a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_QUERY)
-public final class ContactTransferQueryFlow extends ContactsProhibitedFlow {
-  @Inject ContactTransferQueryFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to reject a pending transfer on a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_REJECT)
-public final class ContactTransferRejectFlow extends ContactsProhibitedFlow {
-  @Inject ContactTransferRejectFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java

@@ -1,33 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow that is meant to request a transfer on a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_REQUEST)
-public final class ContactTransferRequestFlow extends ContactsProhibitedFlow {
-  @Inject
-  ContactTransferRequestFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-
-import google.registry.flows.annotations.ReportingSpec;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
-import jakarta.inject.Inject;
-
-/**
- * An EPP flow meant to update a contact.
- *
- * @error {@link ContactsProhibitedException}
- */
-@Deprecated
-@ReportingSpec(ActivityReportField.CONTACT_UPDATE)
-public final class ContactUpdateFlow extends ContactsProhibitedFlow {
-  @Inject ContactUpdateFlow() {}
-}

core/src/main/java/google/registry/flows/contact/ContactsProhibitedFlow.java

@@ -1,28 +0,0 @@
-// Copyright 2025 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.flows.contact;
-
-import google.registry.flows.EppException;
-import google.registry.flows.Flow;
-import google.registry.flows.exceptions.ContactsProhibitedException;
-import google.registry.model.eppoutput.EppResponse;
-
-/** Nomulus follows the Minimum Dataset Requirements, meaning it stores no contact information. */
-public abstract class ContactsProhibitedFlow implements Flow {
-  @Override
-  public EppResponse run() throws EppException {
-    throw new ContactsProhibitedException();
-  }
-}

core/src/main/java/google/registry/flows/picker/FlowPicker.java

@@ -22,16 +22,6 @@ import google.registry.flows.EppException;
 import google.registry.flows.EppException.SyntaxErrorException;
 import google.registry.flows.EppException.UnimplementedCommandException;
 import google.registry.flows.Flow;
-import google.registry.flows.contact.ContactCheckFlow;
-import google.registry.flows.contact.ContactCreateFlow;
-import google.registry.flows.contact.ContactDeleteFlow;
-import google.registry.flows.contact.ContactInfoFlow;
-import google.registry.flows.contact.ContactTransferApproveFlow;
-import google.registry.flows.contact.ContactTransferCancelFlow;
-import google.registry.flows.contact.ContactTransferQueryFlow;
-import google.registry.flows.contact.ContactTransferRejectFlow;
-import google.registry.flows.contact.ContactTransferRequestFlow;
-import google.registry.flows.contact.ContactUpdateFlow;
 import google.registry.flows.domain.DomainCheckFlow;
 import google.registry.flows.domain.DomainClaimsCheckFlow;
 import google.registry.flows.domain.DomainCreateFlow;
@@ -55,7 +45,6 @@ import google.registry.flows.poll.PollRequestFlow;
 import google.registry.flows.session.HelloFlow;
 import google.registry.flows.session.LoginFlow;
 import google.registry.flows.session.LogoutFlow;
-import google.registry.model.contact.ContactCommand;
 import google.registry.model.domain.DomainCommand;
 import google.registry.model.domain.launch.LaunchCheckExtension;
 import google.registry.model.domain.launch.LaunchCheckExtension.CheckType;
@@ -202,11 +191,6 @@ public class FlowPicker {
   private static final FlowProvider RESOURCE_CRUD_FLOW_PROVIDER = new FlowProvider() {
     private final Map<Class<?>, Class<? extends Flow>> resourceCrudFlows =
         new ImmutableMap.Builder<Class<?>, Class<? extends Flow>>()
-            .put(ContactCommand.Check.class, ContactCheckFlow.class)
-            .put(ContactCommand.Create.class, ContactCreateFlow.class)
-            .put(ContactCommand.Delete.class, ContactDeleteFlow.class)
-            .put(ContactCommand.Info.class, ContactInfoFlow.class)
-            .put(ContactCommand.Update.class, ContactUpdateFlow.class)
             .put(DomainCommand.Create.class, DomainCreateFlow.class)
             .put(DomainCommand.Delete.class, DomainDeleteFlow.class)
             .put(DomainCommand.Info.class, DomainInfoFlow.class)
@@ -230,24 +214,6 @@ public class FlowPicker {
       new FlowProvider() {
         private final Table<Class<?>, TransferOp, Class<? extends Flow>> transferFlows =
             ImmutableTable.<Class<?>, TransferOp, Class<? extends Flow>>builder()
-                .put(
-                    ContactCommand.Transfer.class,
-                    TransferOp.APPROVE,
-                    ContactTransferApproveFlow.class)
-                .put(
-                    ContactCommand.Transfer.class,
-                    TransferOp.CANCEL,
-                    ContactTransferCancelFlow.class)
-                .put(
-                    ContactCommand.Transfer.class, TransferOp.QUERY, ContactTransferQueryFlow.class)
-                .put(
-                    ContactCommand.Transfer.class,
-                    TransferOp.REJECT,
-                    ContactTransferRejectFlow.class)
-                .put(
-                    ContactCommand.Transfer.class,
-                    TransferOp.REQUEST,
-                    ContactTransferRequestFlow.class)
                 .put(
                     DomainCommand.Transfer.class,
                     TransferOp.APPROVE,

core/src/main/java/google/registry/flows/session/LoginFlow.java

@@ -15,7 +15,6 @@
 package google.registry.flows.session;
 
 import static com.google.common.collect.Sets.difference;
-import static google.registry.model.common.FeatureFlag.FeatureName.PROHIBIT_CONTACT_OBJECTS_ON_LOGIN;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.CollectionUtils.nullToEmpty;
 
@@ -40,7 +39,6 @@ import google.registry.flows.TlsCredentials.BadRegistrarIpAddressException;
 import google.registry.flows.TlsCredentials.MissingRegistrarCertificateException;
 import google.registry.flows.TransportCredentials;
 import google.registry.flows.TransportCredentials.BadRegistrarPasswordException;
-import google.registry.model.common.FeatureFlag;
 import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
 import google.registry.model.eppinput.EppInput;
@@ -120,9 +118,7 @@ public class LoginFlow implements MutatingFlow {
     Set<String> unsupportedObjectServices =
         difference(
             nullToEmpty(services.getObjectServices()),
-            FeatureFlag.isActiveNow(PROHIBIT_CONTACT_OBJECTS_ON_LOGIN)
-                ? ProtocolDefinition.SUPPORTED_OBJECT_SERVICES
-                : ProtocolDefinition.SUPPORTED_OBJECT_SERVICES_WITH_CONTACT);
+            ProtocolDefinition.SUPPORTED_OBJECT_SERVICES);
     stopwatch.tick("LoginFlow difference unsupportedObjectServices");
     if (!unsupportedObjectServices.isEmpty()) {
       throw new UnimplementedObjectServiceException();

core/src/main/java/google/registry/groups/GmailClient.java

@@ -56,6 +56,7 @@ public final class GmailClient {
   private final InternetAddress outgoingEmailAddressWithUsername;
   private final InternetAddress replyToEmailAddress;
 
+  // TODO(b/510340944): drop sender info. Sender is determined by the Gmail credential owner.
   @Inject
   GmailClient(
       Lazy<Gmail> gmail,
@@ -77,6 +78,20 @@ public final class GmailClient {
     }
   }
 
+  // TODO(b/510340944): Remove this experiment method
+  public GmailClient(
+      Lazy<Gmail> gmail,
+      Retrier retrier,
+      @Config("isEmailSendingEnabled") boolean isEmailSendingEnabled,
+      @Config("replyToEmailAddress") InternetAddress replyToEmailAddress) {
+
+    this.gmail = gmail;
+    this.retrier = retrier;
+    this.isEmailSendingEnabled = isEmailSendingEnabled;
+    this.replyToEmailAddress = replyToEmailAddress;
+    this.outgoingEmailAddressWithUsername = null;
+  }
+
   /**
    * Sends {@code emailMessage} using {@link Gmail}.
    */
@@ -116,7 +131,9 @@ public final class GmailClient {
     try {
       MimeMessage msg =
           new MimeMessage(Session.getDefaultInstance(new Properties(), /* authenticator= */ null));
-      msg.setFrom(this.outgoingEmailAddressWithUsername);
+      if (this.outgoingEmailAddressWithUsername != null) {
+        msg.setFrom(this.outgoingEmailAddressWithUsername);
+      }
       msg.setReplyTo(
           new InternetAddress[] {emailMessage.replyToEmailAddress().orElse(replyToEmailAddress)});
       msg.addRecipients(

core/src/main/java/google/registry/keyring/api/KeySerializer.java

@@ -41,7 +41,6 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBu
  */
 public final class KeySerializer {
 
-
   private KeySerializer() {}
 
   /**

core/src/main/java/google/registry/loadtest/LoadTestModule.java

@@ -21,7 +21,6 @@ import dagger.Module;
 import dagger.Provides;
 import google.registry.request.Parameter;
 import jakarta.servlet.http.HttpServletRequest;
-import org.joda.time.Minutes;
 
 /**
  * Dagger module for loadtest package.
@@ -42,15 +41,13 @@ public final class LoadTestModule {
   @Provides
   @Parameter("delaySeconds")
   static int provideDelaySeconds(HttpServletRequest req) {
-    return extractOptionalIntParameter(req, "delaySeconds")
-        .orElse(Minutes.ONE.toStandardSeconds().getSeconds());
+    return extractOptionalIntParameter(req, "delaySeconds").orElse(60);
   }
 
   @Provides
   @Parameter("runSeconds")
   static int provideRunSeconds(HttpServletRequest req) {
-    return extractOptionalIntParameter(req, "runSeconds")
-        .orElse(Minutes.ONE.toStandardSeconds().getSeconds());
+    return extractOptionalIntParameter(req, "runSeconds").orElse(60);
   }
 
   @Provides

core/src/main/java/google/registry/model/common/Cursor.java

@@ -90,9 +90,9 @@ public class Cursor extends UpdateAutoTimestampEntity {
     RECURRING_BILLING(false),
 
     /**
-     * Cursor for {@link google.registry.export.sheet.SyncRegistrarsSheetAction}. The DateTime
-     * stored is the last time that registrar changes were successfully synced to the sheet. If
-     * there were no changes since the last time the action run, the cursor is not updated.
+     * Cursor for {@link google.registry.export.sheet.SyncRegistrarsSheetAction}. The Instant stored
+     * is the last time that registrar changes were successfully synced to the sheet. If there were
+     * no changes since the last time the action run, the cursor is not updated.
      */
     SYNC_REGISTRAR_SHEET(false),
 

core/src/main/java/google/registry/model/common/TimeOfYear.java

@@ -33,7 +33,7 @@ import jakarta.persistence.Embeddable;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.ZonedDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;
 
 /**
@@ -63,7 +63,7 @@ public class TimeOfYear extends ImmutableObject implements UnsafeSerializable {
    * February 28. It is impossible to construct a {@link TimeOfYear} for February 29th.
    */
   public static TimeOfYear fromInstant(Instant instant) {
-    ZonedDateTime zdt = ZonedDateTime.ofInstant(instant, UTC);
+    OffsetDateTime zdt = OffsetDateTime.ofInstant(instant, UTC);
     int month = zdt.getMonthValue();
     int day = zdt.getDayOfMonth();
     if (month == 2 && day == 29) {
@@ -88,8 +88,8 @@ public class TimeOfYear extends ImmutableObject implements UnsafeSerializable {
     Range<Instant> normalizedRange = range.intersection(Range.closed(START_INSTANT, END_INSTANT));
     Range<Integer> yearRange =
         Range.closed(
-            ZonedDateTime.ofInstant(normalizedRange.lowerEndpoint(), UTC).getYear(),
-            ZonedDateTime.ofInstant(normalizedRange.upperEndpoint(), UTC).getYear());
+            OffsetDateTime.ofInstant(normalizedRange.lowerEndpoint(), UTC).getYear(),
+            OffsetDateTime.ofInstant(normalizedRange.upperEndpoint(), UTC).getYear());
     return ContiguousSet.create(yearRange, integers()).stream()
         .map(this::toInstantWithYear)
         .filter(normalizedRange)
@@ -112,13 +112,13 @@ public class TimeOfYear extends ImmutableObject implements UnsafeSerializable {
 
   /** Get the first {@link Instant} with this month/day/millis that is at or after the start. */
   public Instant getNextInstanceAtOrAfter(Instant start) {
-    Instant withSameYear = toInstantWithYear(ZonedDateTime.ofInstant(start, UTC).getYear());
+    Instant withSameYear = toInstantWithYear(OffsetDateTime.ofInstant(start, UTC).getYear());
     return isAtOrAfter(withSameYear, start) ? withSameYear : plusYears(withSameYear, 1);
   }
 
   /** Get the first {@link Instant} with this month/day/millis that is at or before the end. */
   public Instant getLastInstanceBeforeOrAt(Instant end) {
-    Instant withSameYear = toInstantWithYear(ZonedDateTime.ofInstant(end, UTC).getYear());
+    Instant withSameYear = toInstantWithYear(OffsetDateTime.ofInstant(end, UTC).getYear());
     return isBeforeOrAt(withSameYear, end) ? withSameYear : minusYears(withSameYear, 1);
   }
 

core/src/main/java/google/registry/model/contact/ContactAddress.java

@@ -1,37 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.model.contact;
-
-import google.registry.model.eppcommon.Address;
-import jakarta.persistence.Embeddable;
-
-/**
- * EPP Contact Address
- *
- * <p>This class is embedded inside the {@link PostalInfo} of an EPP contact to hold its address.
- * The fields are all defined in parent class {@link Address}, but the subclass is still necessary
- * to pick up the contact namespace.
- *
- * <p>This does not implement {@code Overlayable} because it is intended to be bulk replaced on
- * update.
- *
- * @see PostalInfo
- */
-@Embeddable
-public class ContactAddress extends Address {
-
-  /** Builder for {@link ContactAddress}. */
-  public static class Builder extends Address.Builder<ContactAddress> {}
-}

core/src/main/java/google/registry/model/contact/ContactAuthInfo.java

@@ -1,30 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.model.contact;
-
-import google.registry.model.eppcommon.AuthInfo;
-import jakarta.persistence.Embeddable;
-import jakarta.xml.bind.annotation.XmlType;
-
-/** A version of authInfo specifically for contacts. */
-@Embeddable
-@XmlType(namespace = "urn:ietf:params:xml:ns:contact-1.0")
-public class ContactAuthInfo extends AuthInfo {
-  public static ContactAuthInfo create(PasswordAuth pw) {
-    ContactAuthInfo instance = new ContactAuthInfo();
-    instance.pw = pw;
-    return instance;
-  }
-}

core/src/main/java/google/registry/model/contact/ContactCommand.java

@@ -1,198 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.model.contact;
-
-import static com.google.common.base.Preconditions.checkState;
-import static google.registry.util.CollectionUtils.nullToEmpty;
-
-import com.google.common.collect.Maps;
-import google.registry.model.EppResource;
-import google.registry.model.ImmutableObject;
-import google.registry.model.contact.PostalInfo.Type;
-import google.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand;
-import google.registry.model.eppinput.ResourceCommand.ResourceCheck;
-import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange;
-import google.registry.model.eppinput.ResourceCommand.ResourceUpdate;
-import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlTransient;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.List;
-import java.util.Map;
-
-/** A collection of (vestigial) Contact commands. */
-public class ContactCommand {
-
-  /** The fields on "chgType" from <a href="http://tools.ietf.org/html/rfc5733">RFC5733</a>. */
-  @XmlTransient
-  public static class ContactCreateOrChange extends ImmutableObject
-      implements ResourceCreateOrChange<EppResource.Builder<?, ?>> {
-
-    /** Postal info for the contact. */
-    List<PostalInfo> postalInfo;
-
-     /** Contact’s voice number. */
-    ContactPhoneNumber voice;
-
-    /** Contact’s fax number. */
-    ContactPhoneNumber fax;
-
-    /** Contact’s email address. */
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    String email;
-
-    /** Authorization info (aka transfer secret) of the contact. */
-    ContactAuthInfo authInfo;
-
-    /** Disclosure policy. */
-    Disclose disclose;
-
-    /** Helper method to move between the postal infos list and the individual getters. */
-    protected Map<Type, PostalInfo> getPostalInfosAsMap() {
-      // There can be no more than 2 postalInfos (enforced by the schema), and if there are 2 they
-      // must be of different types (not enforced). If the type is repeated, uniqueIndex will throw.
-      checkState(nullToEmpty(postalInfo).size() <= 2);
-      return Maps.uniqueIndex(nullToEmpty(postalInfo), PostalInfo::getType);
-    }
-
-    public ContactPhoneNumber getVoice() {
-      return voice;
-    }
-
-    public ContactPhoneNumber getFax() {
-      return fax;
-    }
-
-    public String getEmail() {
-      return email;
-    }
-
-    public ContactAuthInfo getAuthInfo() {
-      return authInfo;
-    }
-
-    public Disclose getDisclose() {
-      return disclose;
-    }
-
-    public PostalInfo getInternationalizedPostalInfo() {
-      return getPostalInfosAsMap().get(Type.INTERNATIONALIZED);
-    }
-
-    public PostalInfo getLocalizedPostalInfo() {
-      return getPostalInfosAsMap().get(Type.LOCALIZED);
-    }
-  }
-
-  /** An abstract contact command that contains authorization info. */
-  @XmlTransient
-  public static class AbstractContactAuthCommand extends AbstractSingleResourceCommand {
-    /** Authorization info used to validate if client has permissions to perform this operation. */
-    ContactAuthInfo authInfo;
-
-    @Override
-    public ContactAuthInfo getAuthInfo() {
-      return authInfo;
-    }
-  }
-
-  /**
-   * A create command for a (vestigial) Contact, mapping "createType" from <a
-   * href="http://tools.ietf.org/html/rfc5733">RFC5733</a>}.
-   */
-  @XmlType(propOrder = {"contactId", "postalInfo", "voice", "fax", "email", "authInfo", "disclose"})
-  @XmlRootElement
-  public static class Create extends ContactCreateOrChange
-      implements SingleResourceCommand, ResourceCreateOrChange<EppResource.Builder<?, ?>> {
-    /**
-     * Unique identifier for this contact.
-     *
-     * <p>This is only unique in the sense that for any given lifetime specified as the time range
-     * from (creationTime, deletionTime) there can only be one contact in the database with this id.
-     * However, there can be many contacts with the same id and non-overlapping lifetimes.
-     */
-    @XmlElement(name = "id")
-    String contactId;
-
-    @Override
-    public String getTargetId() {
-      return contactId;
-    }
-
-    @Override
-    public ContactAuthInfo getAuthInfo() {
-      return authInfo;
-    }
-  }
-
-  /** A delete command for a (vestigial) Contact. */
-  @XmlRootElement
-  public static class Delete extends AbstractSingleResourceCommand {}
-
-  /** An info request for a (vestigial) Contact. */
-  @XmlRootElement
-  @XmlType(propOrder = {"targetId", "authInfo"})
-  public static class Info extends AbstractContactAuthCommand {}
-
-  /** A check request for (vestigial) Contact. */
-  @XmlRootElement
-  public static class Check extends ResourceCheck {}
-
-  /** A transfer operation for a (vestigial) Contact. */
-  @XmlRootElement
-  @XmlType(propOrder = {"targetId", "authInfo"})
-  public static class Transfer extends AbstractContactAuthCommand {}
-
-  /** An update to a (vestigial) Contact. */
-  @XmlRootElement
-  @XmlType(propOrder = {"targetId", "innerAdd", "innerRemove", "innerChange"})
-  public static class Update
-      extends ResourceUpdate<Update.AddRemove, EppResource.Builder<?, ?>, Update.Change> {
-
-    @XmlElement(name = "chg")
-    protected Change innerChange;
-
-    @XmlElement(name = "add")
-    protected AddRemove innerAdd;
-
-    @XmlElement(name = "rem")
-    protected AddRemove innerRemove;
-
-    @Override
-    protected Change getNullableInnerChange() {
-      return innerChange;
-    }
-
-    @Override
-    protected AddRemove getNullableInnerAdd() {
-      return innerAdd;
-    }
-
-    @Override
-    protected AddRemove getNullableInnerRemove() {
-      return innerRemove;
-    }
-
-    /** The inner change type on a contact update command. */
-    public static class AddRemove extends ResourceUpdate.AddRemove {}
-
-    /** The inner change type on a contact update command. */
-    @XmlType(propOrder = {"postalInfo", "voice", "fax", "email", "authInfo", "disclose"})
-    public static class Change extends ContactCreateOrChange {}
-  }
-}

core/src/main/java/google/registry/model/contact/ContactInfoData.java

@@ -1,140 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.model.contact;
-
-import com.google.auto.value.AutoValue;
-import com.google.auto.value.AutoValue.CopyAnnotations;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.eppoutput.EppResponse.ResponseData;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.time.Instant;
-import javax.annotation.Nullable;
-
-/** The {@link ResponseData} returned for an EPP info flow on a contact. */
-@XmlRootElement(name = "infData")
-@XmlType(
-    propOrder = {
-      "contactId",
-      "repoId",
-      "statusValues",
-      "postalInfos",
-      "voiceNumber",
-      "faxNumber",
-      "emailAddress",
-      "currentSponsorRegistrarId",
-      "creationRegistrarId",
-      "creationTime",
-      "lastEppUpdateRegistrarId",
-      "lastEppUpdateTime",
-      "lastTransferTime",
-      "authInfo",
-      "disclose"
-    })
-@AutoValue
-@CopyAnnotations
-public abstract class ContactInfoData implements ResponseData {
-
-  @XmlElement(name = "id")
-  abstract String getContactId();
-
-  @XmlElement(name = "roid")
-  abstract String getRepoId();
-
-  @XmlElement(name = "status")
-  abstract ImmutableSet<StatusValue> getStatusValues();
-
-  @XmlElement(name = "postalInfo")
-  abstract ImmutableList<PostalInfo> getPostalInfos();
-
-  @XmlElement(name = "voice")
-  @Nullable
-  abstract ContactPhoneNumber getVoiceNumber();
-
-  @XmlElement(name = "fax")
-  @Nullable
-  abstract ContactPhoneNumber getFaxNumber();
-
-  @XmlElement(name = "email")
-  @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-  @Nullable
-  abstract String getEmailAddress();
-
-  @XmlElement(name = "clID")
-  abstract String getCurrentSponsorRegistrarId();
-
-  @XmlElement(name = "crID")
-  abstract String getCreationRegistrarId();
-
-  @XmlElement(name = "crDate")
-  abstract Instant getCreationTime();
-
-  @XmlElement(name = "upID")
-  @Nullable
-  abstract String getLastEppUpdateRegistrarId();
-
-  @XmlElement(name = "upDate")
-  @Nullable
-  abstract Instant getLastEppUpdateTime();
-
-  @XmlElement(name = "trDate")
-  @Nullable
-  abstract Instant getLastTransferTime();
-
-  @XmlElement(name = "authInfo")
-  @Nullable
-  abstract ContactAuthInfo getAuthInfo();
-
-  @XmlElement(name = "disclose")
-  @Nullable
-  abstract Disclose getDisclose();
-
-  /** Builder for {@link ContactInfoData}. */
-  @AutoValue.Builder
-  public abstract static class Builder {
-    public abstract Builder setContactId(String contactId);
-    public abstract Builder setRepoId(String repoId);
-    public abstract Builder setStatusValues(ImmutableSet<StatusValue> statusValues);
-    public abstract Builder setPostalInfos(ImmutableList<PostalInfo> postalInfos);
-    public abstract Builder setVoiceNumber(@Nullable ContactPhoneNumber voiceNumber);
-    public abstract Builder setFaxNumber(@Nullable ContactPhoneNumber faxNumber);
-    public abstract Builder setEmailAddress(@Nullable String emailAddress);
-
-    public abstract Builder setCurrentSponsorRegistrarId(String currentSponsorRegistrarId);
-
-    public abstract Builder setCreationRegistrarId(String creationRegistrarId);
-
-    public abstract Builder setCreationTime(Instant creationTime);
-
-    public abstract Builder setLastEppUpdateRegistrarId(@Nullable String lastEppUpdateRegistrarId);
-
-    public abstract Builder setLastEppUpdateTime(@Nullable Instant lastEppUpdateTime);
-
-    public abstract Builder setLastTransferTime(@Nullable Instant lastTransferTime);
-
-    public abstract Builder setAuthInfo(@Nullable ContactAuthInfo authInfo);
-    public abstract Builder setDisclose(@Nullable Disclose disclose);
-    public abstract ContactInfoData build();
-  }
-
-  public static Builder newBuilder() {
-    return new AutoValue_ContactInfoData.Builder();
-  }
-}

core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.model.contact;
-
-import google.registry.model.eppcommon.PhoneNumber;
-import jakarta.persistence.Embeddable;
-
-/**
- * EPP Contact Phone Number
- *
- * <p>This class is embedded inside a (vestigial) Contact to hold the phone number of an EPP
- * contact. The fields are all defined in the parent class {@link PhoneNumber}, but the subclass is
- * still necessary to pick up the contact namespace.
- */
-@Embeddable
-public class ContactPhoneNumber extends PhoneNumber {
-
-  /** Builder for {@link ContactPhoneNumber}. */
-  public static class Builder extends PhoneNumber.Builder<ContactPhoneNumber> {}
-}

core/src/main/java/google/registry/model/contact/Disclose.java

@@ -1,137 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.model.contact;
-
-import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
-
-import com.google.common.collect.ImmutableList;
-import google.registry.model.Buildable;
-import google.registry.model.ImmutableObject;
-import google.registry.model.UnsafeSerializable;
-import google.registry.model.eppcommon.PresenceMarker;
-import google.registry.persistence.converter.PostalInfoChoiceListUserType;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.Embedded;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlType;
-import java.io.Serializable;
-import java.util.List;
-import org.hibernate.annotations.Type;
-
-/** The "discloseType" from <a href="http://tools.ietf.org/html/rfc5733">RFC5733</a>. */
-@Embeddable
-@XmlType(propOrder = {"name", "org", "addr", "voice", "fax", "email"})
-public class Disclose extends ImmutableObject implements UnsafeSerializable {
-
-  @Type(PostalInfoChoiceListUserType.class)
-  List<PostalInfoChoice> name;
-
-  @Type(PostalInfoChoiceListUserType.class)
-  List<PostalInfoChoice> org;
-
-  @Type(PostalInfoChoiceListUserType.class)
-  List<PostalInfoChoice> addr;
-
-  @Embedded PresenceMarker voice;
-
-  @Embedded PresenceMarker fax;
-
-  @Embedded PresenceMarker email;
-
-  @XmlAttribute
-  Boolean flag;
-
-  public ImmutableList<PostalInfoChoice> getNames() {
-    return nullToEmptyImmutableCopy(name);
-  }
-
-  public ImmutableList<PostalInfoChoice> getOrgs() {
-    return nullToEmptyImmutableCopy(org);
-  }
-
-  public ImmutableList<PostalInfoChoice> getAddrs() {
-    return nullToEmptyImmutableCopy(addr);
-  }
-
-  public PresenceMarker getVoice() {
-    return voice;
-  }
-
-  public PresenceMarker getFax() {
-    return fax;
-  }
-
-  public PresenceMarker getEmail() {
-    return email;
-  }
-
-  public Boolean getFlag() {
-    return flag;
-  }
-
-  /** The "intLocType" from <a href="http://tools.ietf.org/html/rfc5733">RFC5733</a>. */
-  public static class PostalInfoChoice extends ImmutableObject implements Serializable {
-    @XmlAttribute
-    PostalInfo.Type type;
-
-    public PostalInfo.Type getType() {
-      return type;
-    }
-
-    public static PostalInfoChoice create(PostalInfo.Type type) {
-      PostalInfoChoice instance = new PostalInfoChoice();
-      instance.type = type;
-      return instance;
-    }
-  }
-
-  /** A builder for {@link Disclose} since it is immutable. */
-  public static class Builder extends Buildable.Builder<Disclose> {
-    public Builder setNames(ImmutableList<PostalInfoChoice> names) {
-      getInstance().name = names;
-      return this;
-    }
-
-    public Builder setOrgs(ImmutableList<PostalInfoChoice> orgs) {
-      getInstance().org = orgs;
-      return this;
-    }
-
-    public Builder setAddrs(ImmutableList<PostalInfoChoice> addrs) {
-      getInstance().addr = addrs;
-      return this;
-    }
-
-    public Builder setVoice(PresenceMarker voice) {
-      getInstance().voice = voice;
-      return this;
-    }
-
-    public Builder setFax(PresenceMarker fax) {
-      getInstance().fax = fax;
-      return this;
-    }
-
-    public Builder setEmail(PresenceMarker email) {
-      getInstance().email = email;
-      return this;
-    }
-
-    public Builder setFlag(boolean flag) {
-      getInstance().flag = flag;
-      return this;
-    }
-  }
-}

core/src/main/java/google/registry/model/contact/PostalInfo.java

@@ -1,124 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.model.contact;
-
-import static com.google.common.base.Preconditions.checkState;
-
-import google.registry.model.Buildable;
-import google.registry.model.Buildable.Overlayable;
-import google.registry.model.ImmutableObject;
-import google.registry.model.UnsafeSerializable;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlEnumValue;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.Optional;
-
-/**
- * Implementation of both "postalInfoType" and "chgPostalInfoType" from <a href=
- * "http://tools.ietf.org/html/rfc5733">RFC5733</a>.
- */
-@Embeddable
-@XmlType(propOrder = {"name", "org", "address", "type"})
-public class PostalInfo extends ImmutableObject
-    implements Overlayable<PostalInfo>, UnsafeSerializable {
-
-  /** The type of the address, either localized or international. */
-  public enum Type {
-    @XmlEnumValue("loc")
-    LOCALIZED,
-    @XmlEnumValue("int")
-    INTERNATIONALIZED
-  }
-
-  @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-  String name;
-
-  @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
-  String org;
-
-  @XmlElement(name = "addr")
-  ContactAddress address;
-
-  @Enumerated(EnumType.STRING)
-  @XmlAttribute
-  Type type;
-
-  public String getName() {
-    return name;
-  }
-
-  public String getOrg() {
-    return org;
-  }
-
-  public ContactAddress getAddress() {
-    return address;
-  }
-
-  public Type getType() {
-    return type;
-  }
-
-  @Override
-  public PostalInfo overlay(PostalInfo source) {
-    // Don't overlay the type field, as that should never change.
-    checkState(source.type == null || source.type == type);
-    return asBuilder()
-        .setName(Optional.ofNullable(source.getName()).orElse(name))
-        .setOrg(Optional.ofNullable(source.getOrg()).orElse(org))
-        .setAddress(Optional.ofNullable(source.getAddress()).orElse(address))
-        .build();
-  }
-
-  @Override
-  public Builder asBuilder() {
-    return new Builder(clone(this));
-  }
-
-  /** A builder for constructing {@link PostalInfo}, since its changes get overlayed. */
-  public static class Builder extends Buildable.Builder<PostalInfo> {
-    public Builder() {}
-
-    private Builder(PostalInfo instance) {
-      super(instance);
-    }
-
-    public Builder setName(String name) {
-      getInstance().name = name;
-      return this;
-    }
-
-    public Builder setOrg(String org) {
-      getInstance().org = org;
-      return this;
-    }
-
-    public Builder setAddress(ContactAddress address) {
-      getInstance().address = address;
-      return this;
-    }
-
-    public Builder setType(Type type) {
-      getInstance().type = type;
-      return this;
-    }
-  }
-}

core/src/main/java/google/registry/model/contact/package-info.java

@@ -1,32 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-@XmlSchema(
-    namespace = "urn:ietf:params:xml:ns:contact-1.0",
-    xmlns = @XmlNs(prefix = "contact", namespaceURI = "urn:ietf:params:xml:ns:contact-1.0"),
-    elementFormDefault = XmlNsForm.QUALIFIED)
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapters({
-  @XmlJavaTypeAdapter(UtcInstantAdapter.class)
-})
-package google.registry.model.contact;
-
-import google.registry.xml.UtcInstantAdapter;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlNs;
-import jakarta.xml.bind.annotation.XmlNsForm;
-import jakarta.xml.bind.annotation.XmlSchema;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;

core/src/main/java/google/registry/model/domain/Domain.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.domain;
 
-
 import google.registry.model.EppResource;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.annotations.ExternalMessagingName;

core/src/main/java/google/registry/model/domain/DomainBase.java

@@ -246,7 +246,7 @@ public class DomainBase extends EppResource {
    *
    * <p>When a domain is scheduled to not autorenew, this field is set to the current value of its
    * {@link #registrationExpirationTime}, after which point the next invocation of a periodic
-   * cronjob will explicitly delete the domain. This field is a DateTime and not a boolean because
+   * cronjob will explicitly delete the domain. This field is an Instant and not a boolean because
    * of edge cases that occur during the autorenew grace period. We need to be able to tell the
    * difference domains that have reached their life and must be deleted now, and domains that
    * happen to be in the autorenew grace period now but should be deleted in roughly a year.

core/src/main/java/google/registry/model/domain/DomainRenewData.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.domain;
 
-
 import google.registry.model.eppoutput.EppResponse.ResponseData;
 import google.registry.xml.UtcInstantAdapter;
 import jakarta.xml.bind.annotation.XmlElement;

core/src/main/java/google/registry/model/domain/GracePeriodBase.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.domain;
 
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.UnsafeSerializable;
 import google.registry.model.billing.BillingEvent;

core/src/main/java/google/registry/model/domain/fee/BaseFee.java

@@ -31,8 +31,8 @@ import jakarta.xml.bind.annotation.XmlValue;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.math.BigDecimal;
 import java.time.Instant;
+import java.time.Period;
 import java.util.stream.Stream;
-import org.joda.time.Period;
 
 /** Base class for the fee and credit types. */
 @XmlTransient

core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java

@@ -34,4 +34,3 @@ public abstract class FeeCheckResponseExtensionItem extends FeeQueryResponseExte
     }
   }
 }
-

core/src/main/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java

@@ -69,4 +69,3 @@ public class FeeInfoCommandExtensionV06
     return Optional.empty();
   }
 }
-

core/src/main/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java

@@ -36,7 +36,6 @@ public class FeeInfoResponseExtensionV06
   /** The command that was checked. */
   FeeExtensionCommandDescriptor command;
 
-
   /** Builder for {@link FeeInfoResponseExtensionV06}. */
   public static class Builder
       extends FeeQueryResponseExtensionItem.Builder<FeeInfoResponseExtensionV06, Builder> {

core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java

@@ -34,7 +34,6 @@ public class FeeCheckResponseExtensionV11
   @XmlElement(name = "cd")
   ImmutableList<FeeCheckResponseExtensionItemV11> items;
 
-
   @Override
   public void setCurrencyIfSupported(CurrencyUnit currency) {}
 

core/src/main/java/google/registry/model/domain/launch/package-info.java

@@ -17,9 +17,7 @@
     xmlns = @XmlNs(prefix = "launch", namespaceURI = "urn:ietf:params:xml:ns:launch-1.0"),
     elementFormDefault = XmlNsForm.QUALIFIED)
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapters({
-  @XmlJavaTypeAdapter(UtcInstantAdapter.class)
-})
+@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(UtcInstantAdapter.class)})
 package google.registry.model.domain.launch;
 
 import google.registry.xml.UtcInstantAdapter;

core/src/main/java/google/registry/model/domain/token/AllocationToken.java

@@ -335,8 +335,6 @@ public class AllocationToken extends UpdateAutoTimestampEntity implements Builda
     return tokenType;
   }
 
-
-
   @JsonIgnore
   public TimedTransitionProperty<TokenStatus> getTokenStatusTransitions() {
     return tokenStatusTransitions;

core/src/main/java/google/registry/model/eppcommon/Address.java

@@ -49,7 +49,6 @@ import java.util.stream.Stream;
  * also matches the "addrType" type from <a
  * href="http://tools.ietf.org/html/draft-lozano-tmch-smd">Mark and Signed Mark Objects Mapping</a>.
  *
- * @see google.registry.model.contact.ContactAddress
  * @see google.registry.model.mark.MarkAddress
  * @see google.registry.model.registrar.RegistrarAddress
  */

core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java

@@ -40,7 +40,6 @@ public class EppXmlTransformer  {
       ImmutableList.of(
           "eppcom.xsd",
           "epp.xsd",
-          "contact.xsd",
           "host.xsd",
           "domain.xsd",
           "rgp.xsd",

core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java

@@ -44,7 +44,6 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *
  * </blockquote>
  *
- * @see google.registry.model.contact.ContactPhoneNumber
  * @see google.registry.model.mark.MarkPhoneNumber
  */
 @XmlTransient

core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java

@@ -52,12 +52,6 @@ public class ProtocolDefinition {
   public static final ImmutableSet<String> SUPPORTED_OBJECT_SERVICES =
       ImmutableSet.of("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0");
 
-  public static final ImmutableSet<String> SUPPORTED_OBJECT_SERVICES_WITH_CONTACT =
-      new ImmutableSet.Builder<String>()
-          .addAll(SUPPORTED_OBJECT_SERVICES)
-          .add("urn:ietf:params:xml:ns:contact-1.0")
-          .build();
-
   /** Enum representing which environments should have which service extensions enabled. */
   private enum ServiceExtensionVisibility {
     ALL,

core/src/main/java/google/registry/model/eppinput/EppInput.java

@@ -21,7 +21,6 @@ import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.ImmutableObject;
-import google.registry.model.contact.ContactCommand;
 import google.registry.model.domain.DomainCommand;
 import google.registry.model.domain.bulktoken.BulkTokenExtension;
 import google.registry.model.domain.fee06.FeeCheckCommandExtensionV06;
@@ -170,12 +169,6 @@ public class EppInput extends ImmutableObject {
   /** A command that has an extension inside of it. */
   public static class ResourceCommandWrapper extends InnerCommand {
     @XmlElementRefs({
-        @XmlElementRef(type = ContactCommand.Check.class),
-        @XmlElementRef(type = ContactCommand.Create.class),
-        @XmlElementRef(type = ContactCommand.Delete.class),
-        @XmlElementRef(type = ContactCommand.Info.class),
-        @XmlElementRef(type = ContactCommand.Transfer.class),
-        @XmlElementRef(type = ContactCommand.Update.class),
         @XmlElementRef(type = DomainCommand.Check.class),
         @XmlElementRef(type = DomainCommand.Create.class),
         @XmlElementRef(type = DomainCommand.Delete.class),

core/src/main/java/google/registry/model/eppinput/package-info.java

@@ -17,9 +17,7 @@
     xmlns = @XmlNs(prefix = "", namespaceURI = "urn:ietf:params:xml:ns:epp-1.0"),
     elementFormDefault = XmlNsForm.QUALIFIED)
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapters({
-  @XmlJavaTypeAdapter(UtcInstantAdapter.class)
-})
+@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(UtcInstantAdapter.class)})
 package google.registry.model.eppinput;
 
 import google.registry.xml.UtcInstantAdapter;

core/src/main/java/google/registry/model/eppoutput/CheckData.java

@@ -32,8 +32,6 @@ public abstract class CheckData extends ImmutableObject implements ResponseData
 
   /** The check responses. We must explicitly list the namespaced versions of {@link Check}. */
   @XmlElements({
-      @XmlElement(
-          name = "cd", namespace = "urn:ietf:params:xml:ns:contact-1.0", type = ContactCheck.class),
       @XmlElement(
           name = "cd", namespace = "urn:ietf:params:xml:ns:domain-1.0", type = DomainCheck.class),
       @XmlElement(
@@ -114,14 +112,6 @@ public abstract class CheckData extends ImmutableObject implements ResponseData
     }
   }
 
-  /** A version with contact namespacing. */
-  @XmlType(namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  public static class ContactCheck extends Check {
-    public static ContactCheck create(boolean avail, String id, String reason) {
-      return init(new ContactCheck(), CheckID.create(avail, id), reason);
-    }
-  }
-
   /** A version with domain namespacing. */
   @XmlType(namespace = "urn:ietf:params:xml:ns:domain-1.0")
   public static class DomainCheck extends Check {
@@ -146,14 +136,6 @@ public abstract class CheckData extends ImmutableObject implements ResponseData
     }
   }
 
-  /** A version with contact namespacing. */
-  @XmlRootElement(name = "chkData", namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  public static class ContactCheckData extends CheckData {
-    public static ContactCheckData create(ImmutableList<ContactCheck> checks) {
-      return init(new ContactCheckData(), checks);
-    }
-  }
-
   /** A version with domain namespacing. */
   @XmlRootElement(name = "chkData", namespace = "urn:ietf:params:xml:ns:domain-1.0")
   public static class DomainCheckData extends CheckData {

core/src/main/java/google/registry/model/eppoutput/CreateData.java

@@ -28,21 +28,6 @@ public abstract class CreateData implements ResponseData {
   @XmlElement(name = "crDate")
   protected Instant creationDate;
 
-  /** An acknowledgment message indicating that a contact was created. */
-  @XmlRootElement(name = "creData", namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  @XmlType(propOrder = {"id", "creationDate"}, namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  public static class ContactCreateData extends CreateData {
-
-    String id;
-
-    public static ContactCreateData create(String id, Instant creationDate) {
-      ContactCreateData instance = new ContactCreateData();
-      instance.id = id;
-      instance.creationDate = creationDate;
-      return instance;
-    }
-  }
-
   /** An acknowledgment message indicating that a domain was created. */
   @XmlRootElement(name = "creData", namespace = "urn:ietf:params:xml:ns:domain-1.0")
   @XmlType(

core/src/main/java/google/registry/model/eppoutput/EppResponse.java

@@ -20,7 +20,6 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 import com.google.common.collect.ImmutableList;
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
-import google.registry.model.contact.ContactInfoData;
 import google.registry.model.domain.DomainInfoData;
 import google.registry.model.domain.DomainRenewData;
 import google.registry.model.domain.bulktoken.BulkTokenResponseExtension;
@@ -53,19 +52,15 @@ import google.registry.model.domain.launch.LaunchCheckResponseExtension;
 import google.registry.model.domain.rgp.RgpInfoExtension;
 import google.registry.model.domain.secdns.SecDnsInfoExtension;
 import google.registry.model.eppcommon.Trid;
-import google.registry.model.eppoutput.CheckData.ContactCheckData;
 import google.registry.model.eppoutput.CheckData.DomainCheckData;
 import google.registry.model.eppoutput.CheckData.HostCheckData;
-import google.registry.model.eppoutput.CreateData.ContactCreateData;
 import google.registry.model.eppoutput.CreateData.DomainCreateData;
 import google.registry.model.eppoutput.CreateData.HostCreateData;
 import google.registry.model.eppoutput.EppOutput.ResponseOrGreeting;
 import google.registry.model.host.HostInfoData;
 import google.registry.model.poll.MessageQueueInfo;
-import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse;
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.poll.PendingActionNotificationResponse.HostPendingActionNotificationResponse;
-import google.registry.model.transfer.TransferResponse.ContactTransferResponse;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlElementRef;
@@ -107,11 +102,6 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting {
 
   /** Zero or more response "resData" results. */
   @XmlElementRefs({
-    @XmlElementRef(type = ContactCheckData.class),
-    @XmlElementRef(type = ContactCreateData.class),
-    @XmlElementRef(type = ContactInfoData.class),
-    @XmlElementRef(type = ContactPendingActionNotificationResponse.class),
-    @XmlElementRef(type = ContactTransferResponse.class),
     @XmlElementRef(type = DomainCheckData.class),
     @XmlElementRef(type = DomainCreateData.class),
     @XmlElementRef(type = DomainInfoData.class),

core/src/main/java/google/registry/model/eppoutput/package-info.java

@@ -17,9 +17,7 @@
     xmlns = @XmlNs(prefix = "", namespaceURI = "urn:ietf:params:xml:ns:epp-1.0"),
     elementFormDefault = XmlNsForm.QUALIFIED)
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapters({
-  @XmlJavaTypeAdapter(UtcInstantAdapter.class)
-})
+@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(UtcInstantAdapter.class)})
 package google.registry.model.eppoutput;
 
 import google.registry.xml.UtcInstantAdapter;

core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java

@@ -39,15 +39,13 @@ public class PendingActionNotificationResponse extends ImmutableObject
   /** The inner name type that contains a name and the result boolean. */
   @Embeddable
   static class NameOrId extends ImmutableObject implements UnsafeSerializable {
-    @XmlValue
-    String value;
+    @XmlValue String value;
 
     @XmlAttribute(name = "paResult")
     boolean actionResult;
   }
 
-  @XmlTransient
-  NameOrId nameOrId;
+  @XmlTransient NameOrId nameOrId;
 
   @XmlElement(name = "paTRID")
   Trid trid;
@@ -104,36 +102,11 @@ public class PendingActionNotificationResponse extends ImmutableObject
     }
   }
 
-  /** An adapter to output the XML in response to resolving a pending command on a contact. */
-  @XmlRootElement(name = "panData", namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  @XmlType(
-      propOrder = {"id", "trid", "processedDate"},
-      namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  public static class ContactPendingActionNotificationResponse
-      extends PendingActionNotificationResponse {
-
-    @XmlElement
-    NameOrId getId() {
-      return nameOrId;
-    }
-
-    public static ContactPendingActionNotificationResponse create(
-        String contactId, boolean actionResult, Trid trid, Instant processedDate) {
-      return init(
-          new ContactPendingActionNotificationResponse(),
-          contactId,
-          actionResult,
-          trid,
-          processedDate);
-    }
-  }
-
   /** An adapter to output the XML in response to resolving a pending command on a host. */
   @XmlRootElement(name = "panData", namespace = "urn:ietf:params:xml:ns:domain-1.0")
   @XmlType(
-    propOrder = {"name", "trid", "processedDate"},
-    namespace = "urn:ietf:params:xml:ns:domain-1.0"
-  )
+      propOrder = {"name", "trid", "processedDate"},
+      namespace = "urn:ietf:params:xml:ns:domain-1.0")
   public static class HostPendingActionNotificationResponse
       extends PendingActionNotificationResponse {
 

core/src/main/java/google/registry/model/poll/PollMessageExternalKeyConverter.java

@@ -18,7 +18,7 @@ import static java.time.ZoneOffset.UTC;
 
 import com.google.common.base.Splitter;
 import google.registry.persistence.VKey;
-import java.time.ZonedDateTime;
+import java.time.OffsetDateTime;
 import java.util.List;
 
 /**
@@ -46,7 +46,7 @@ public final class PollMessageExternalKeyConverter {
   public static String makePollMessageExternalId(PollMessage pollMessage) {
     return String.format(
         "%d-%d",
-        pollMessage.getId(), ZonedDateTime.ofInstant(pollMessage.getEventTime(), UTC).getYear());
+        pollMessage.getId(), OffsetDateTime.ofInstant(pollMessage.getEventTime(), UTC).getYear());
   }
 
   /**

core/src/main/java/google/registry/model/poll/package-info.java

@@ -17,9 +17,7 @@
     xmlns = @XmlNs(prefix = "", namespaceURI = "urn:ietf:params:xml:ns:epp-1.0"),
     elementFormDefault = XmlNsForm.QUALIFIED)
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapters({
-  @XmlJavaTypeAdapter(UtcInstantAdapter.class)
-})
+@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(UtcInstantAdapter.class)})
 package google.registry.model.poll;
 
 import google.registry.xml.UtcInstantAdapter;

core/src/main/java/google/registry/model/registrar/Registrar.java

@@ -182,7 +182,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
     DISABLED
   }
 
-  /** Regex for E.164 phone number format specified by {@code contact.xsd}. */
+  /** Regex for E.164 phone number format. */
   private static final Pattern E164_PATTERN = Pattern.compile("\\+[0-9]{1,3}\\.[0-9]{1,14}");
 
   /** Regex for telephone support passcode (5 digit string). */

core/src/main/java/google/registry/model/reporting/IcannReportingTypes.java

@@ -43,17 +43,7 @@ public final class IcannReportingTypes {
     HOST_CREATE("srs-host-create"),
     HOST_DELETE("srs-host-delete"),
     HOST_INFO("srs-host-info"),
-    HOST_UPDATE("srs-host-update"),
-    CONTACT_CHECK("srs-cont-check"),
-    CONTACT_CREATE("srs-cont-create"),
-    CONTACT_DELETE("srs-cont-delete"),
-    CONTACT_INFO("srs-cont-info"),
-    CONTACT_TRANSFER_APPROVE("srs-cont-transfer-approve"),
-    CONTACT_TRANSFER_CANCEL("srs-cont-transfer-cancel"),
-    CONTACT_TRANSFER_QUERY("srs-cont-transfer-query"),
-    CONTACT_TRANSFER_REJECT("srs-cont-transfer-reject"),
-    CONTACT_TRANSFER_REQUEST("srs-cont-transfer-request"),
-    CONTACT_UPDATE("srs-cont-update");
+    HOST_UPDATE("srs-host-update");
 
     /** Returns the actual field name from the specification. */
     private final String fieldName;

core/src/main/java/google/registry/model/transfer/BaseTransferObject.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.transfer;
 
-
 import google.registry.model.Buildable.GenericBuilder;
 import google.registry.model.ImmutableObject;
 import google.registry.model.UnsafeSerializable;

core/src/main/java/google/registry/model/transfer/TransferResponse.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.transfer;
 
-
 import google.registry.model.EppResource;
 import google.registry.model.eppoutput.EppResponse.ResponseData;
 import google.registry.xml.UtcInstantAdapter;
@@ -84,33 +83,4 @@ public class TransferResponse extends BaseTransferObject implements ResponseData
       }
     }
   }
-
-  /** An adapter to output the XML in response to a transfer command on a contact. */
-  @XmlRootElement(name = "trnData", namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  @XmlType(propOrder = {
-      "contactId",
-      "transferStatus",
-      "gainingClientId",
-      "transferRequestTime",
-      "losingClientId",
-      "pendingTransferExpirationTime"},
-    namespace = "urn:ietf:params:xml:ns:contact-1.0")
-  public static class ContactTransferResponse extends TransferResponse {
-
-    @XmlElement(name = "id")
-    String contactId;
-
-    public String getContactId() {
-      return contactId;
-    }
-
-    /** Builder for {@link ContactTransferResponse}. */
-    public static class Builder
-        extends BaseTransferObject.Builder<ContactTransferResponse, Builder> {
-      public Builder setContactId(String contactId) {
-        getInstance().contactId = contactId;
-        return this;
-      }
-    }
-  }
 }

core/src/main/java/google/registry/model/transfer/package-info.java

@@ -17,9 +17,7 @@
     xmlns = @XmlNs(prefix = "", namespaceURI = "urn:ietf:params:xml:ns:epp-1.0"),
     elementFormDefault = XmlNsForm.QUALIFIED)
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapters({
-  @XmlJavaTypeAdapter(UtcInstantAdapter.class)
-})
+@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(UtcInstantAdapter.class)})
 package google.registry.model.transfer;
 
 import google.registry.xml.UtcInstantAdapter;

core/src/main/java/google/registry/monitoring/whitebox/CheckApiMetric.java

@@ -81,7 +81,6 @@ public record CheckApiMetric(
     }
   }
 
-
   public static Builder builder(Clock clock) {
     return new AutoBuilder_CheckApiMetric_Builder().startTimestamp(clock.now()).setClock(clock);
   }

core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java

@@ -1,43 +0,0 @@
-// Copyright 2019 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.persistence.converter;
-import static org.joda.time.DateTimeZone.UTC;
-
-import jakarta.persistence.AttributeConverter;
-import jakarta.persistence.Converter;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import javax.annotation.Nullable;
-import org.joda.time.DateTime;
-
-/** JPA converter to for storing/retrieving {@link org.joda.time.DateTime} objects. */
-@Converter(autoApply = true)
-public class DateTimeConverter implements AttributeConverter<DateTime, ZonedDateTime> {
-
-  @Override
-  @Nullable
-  public ZonedDateTime convertToDatabaseColumn(@Nullable DateTime attribute) {
-    return attribute == null
-        ? null
-        : ZonedDateTime.ofInstant(Instant.ofEpochMilli(attribute.getMillis()), ZoneOffset.UTC);
-  }
-
-  @Override
-  @Nullable
-  public DateTime convertToEntityAttribute(@Nullable ZonedDateTime dbData) {
-    return (dbData == null) ? null : new DateTime(dbData.toInstant().toEpochMilli(), UTC);
-  }
-}

core/src/main/java/google/registry/persistence/converter/MapUserType.java

@@ -14,7 +14,6 @@
 
 package google.registry.persistence.converter;
 
-
 import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java

@@ -1,50 +0,0 @@
-// Copyright 2024 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.persistence.converter;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
-import google.registry.model.contact.Disclose.PostalInfoChoice;
-import google.registry.model.contact.PostalInfo;
-import java.util.List;
-import java.util.stream.Stream;
-
-/** Hibernate custom type for {@link List} of {@link PostalInfoChoice}. */
-public class PostalInfoChoiceListUserType
-    extends StringCollectionUserType<PostalInfoChoice, List<PostalInfoChoice>> {
-
-  @Override
-  String[] toJdbcObject(List<PostalInfoChoice> collection) {
-    return collection.stream()
-        .map(PostalInfoChoice::getType)
-        .map(Enum::name)
-        .toList()
-        .toArray(new String[0]);
-  }
-
-  @Override
-  List<PostalInfoChoice> toEntity(String[] data) {
-    return Stream.of(data)
-        .map(PostalInfo.Type::valueOf)
-        .map(PostalInfoChoice::create)
-        .collect(toImmutableList());
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public Class<List<PostalInfoChoice>> returnedClass() {
-    return (Class<List<PostalInfoChoice>>) ((Object) List.class);
-  }
-}

core/src/main/java/google/registry/privileges/secretmanager/SecretManagerModule.java

@@ -14,7 +14,6 @@
 
 package google.registry.privileges.secretmanager;
 
-
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceSettings;
 import dagger.Module;

core/src/main/java/google/registry/rdap/AbstractJsonableObject.java

@@ -40,7 +40,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 import javax.annotation.Nullable;
-import org.joda.time.DateTime;
 
 /**
  * An Jsonable that can turn itself into a JSON object using reflection.
@@ -53,16 +52,12 @@ import org.joda.time.DateTime;
  * will be "JSONified" and added to the generated JSON object.
  *
  * <p>This implementation is geared towards RDAP replies, and hence has RDAP-specific quirks.
- * Specifically:
- * - Fields with empty arrays are not shown at all
- * - VCards are a built-in special case (Not implemented yet)
- * - DateTime conversion is specifically supported as if it were a primitive
- * - Arrays are considered to be SETS rather than lists, meaning repeated values are removed and the
- *   order isn't guaranteed
+ * Specifically: - Fields with empty arrays are not shown at all - VCards are a built-in special
+ * case (Not implemented yet) - Instant conversion is specifically supported as if it were a
+ * primitive - Arrays are considered to be SETS rather than lists, meaning repeated values are
+ * removed and the order isn't guaranteed
  *
- * Usage:
- * {@link JsonableElement}
- * -----------------------
+ * <p>Usage: {@link JsonableElement} -----------------------
  *
  * <pre>
  * - JsonableElement annotates Members that become JSON object fields:
@@ -90,7 +85,7 @@ import org.joda.time.DateTime;
  *   "b": "value1"
  * }
  *
- * - the supported object types are String, Boolean, Number, DateTime, Jsonable. In addition,
+ * - the supported object types are String, Boolean, Number, Instant, Jsonable. In addition,
  *   Iterable and Optional are respected.
  *
  * - An Optional that's empty is skipped, while a present Optional acts exactly like the object it
@@ -134,8 +129,7 @@ import org.joda.time.DateTime;
  * }
  * </pre>
  *
- * {@link RestrictJsonNames}
- * -------------------------
+ * {@link RestrictJsonNames} -------------------------
  *
  * <pre>
  * - RestrictJsonNames is a way to prevent typos in the JsonableElement names.
@@ -334,12 +328,6 @@ abstract class AbstractJsonableObject implements Jsonable {
     if (object instanceof Boolean b) {
       return new JsonPrimitive(b);
     }
-    if (object instanceof DateTime) {
-      // According to RFC 9083 section 3, the syntax of dates and times is defined in RFC3339.
-      //
-      // According to RFC3339, we should use ISO8601, which is what DateTime.toString does!
-      return new JsonPrimitive(object.toString());
-    }
     if (object instanceof Instant instant) {
       // According to RFC 9083 section 3, the syntax of dates and times is defined in RFC3339.
       //

core/src/main/java/google/registry/rdap/RdapDataStructures.java

@@ -244,7 +244,6 @@ final class RdapDataStructures {
 
     @JsonableElement abstract ImmutableList<Link> links();
 
-
     abstract static class Builder<B extends Builder<?>> {
       abstract B setEventAction(EventAction eventAction);
 
@@ -304,7 +303,6 @@ final class RdapDataStructures {
       return new AutoValue_RdapDataStructures_EventWithoutActor.Builder();
     }
 
-
     @AutoValue.Builder
     abstract static class Builder extends EventBase.Builder<Builder> {
       abstract EventWithoutActor build();
@@ -321,7 +319,6 @@ final class RdapDataStructures {
       return new AutoValue_RdapDataStructures_Event.Builder();
     }
 
-
     @AutoValue.Builder
     abstract static class Builder extends EventBase.Builder<Builder> {
       abstract Builder setEventActor(String eventActor);

core/src/main/java/google/registry/rdap/RdapMetrics.java

@@ -272,7 +272,6 @@ public class RdapMetrics {
       RdapMetricInformation build();
     }
 
-
     static Builder builder() {
       return new AutoBuilder_RdapMetrics_RdapMetricInformation_Builder()
           .setSearchType(SearchType.NONE)

core/src/main/java/google/registry/rdap/RdapObjectClasses.java

@@ -235,7 +235,6 @@ final class RdapObjectClasses {
       this.objectClassName = objectClassName;
     }
 
-
     abstract static class Builder<B extends Builder<?>> {
       abstract B setHandle(String handle);
       abstract ImmutableList.Builder<PublicId> publicIdsBuilder();

core/src/main/java/google/registry/rdap/RdapSearchPattern.java

@@ -14,7 +14,6 @@
 
 package google.registry.rdap;
 
-
 import com.google.common.base.Strings;
 import google.registry.request.HttpException.BadRequestException;
 import google.registry.request.HttpException.UnprocessableEntityException;

core/src/main/java/google/registry/rde/BrdaCopyAction.java

@@ -14,7 +14,6 @@
 
 package google.registry.rde;
 
-
 import static google.registry.model.common.Cursor.CursorType.BRDA;
 import static google.registry.model.common.Cursor.getCursorTimeOrStartOfTime;
 import static google.registry.model.rde.RdeMode.THIN;

core/src/main/java/google/registry/rde/PendingDeposit.java

@@ -14,7 +14,6 @@
 
 package google.registry.rde;
 
-
 import google.registry.model.common.Cursor.CursorType;
 import google.registry.model.rde.RdeMode;
 import java.io.IOException;

core/src/main/java/google/registry/rde/RdeMarshaller.java

@@ -20,15 +20,26 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.common.flogger.FluentLogger;
 import google.registry.model.ImmutableObject;
 import google.registry.model.domain.Domain;
+import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.model.host.Host;
 import google.registry.model.rde.RdeMode;
 import google.registry.model.registrar.Registrar;
 import google.registry.tldconfig.idn.IdnTable;
 import google.registry.xjc.XjcXmlTransformer;
+import google.registry.xjc.epp.XjcEppDcpAccessType;
+import google.registry.xjc.epp.XjcEppDcpOursType;
+import google.registry.xjc.epp.XjcEppDcpPurposeType;
+import google.registry.xjc.epp.XjcEppDcpRecipientType;
+import google.registry.xjc.epp.XjcEppDcpRetentionType;
+import google.registry.xjc.epp.XjcEppDcpStatementType;
+import google.registry.xjc.epp.XjcEppDcpType;
+import google.registry.xjc.epp.XjcEppExtURIType;
 import google.registry.xjc.rde.XjcRdeContentsType;
 import google.registry.xjc.rde.XjcRdeDeposit;
 import google.registry.xjc.rde.XjcRdeDepositTypeType;
 import google.registry.xjc.rde.XjcRdeMenuType;
+import google.registry.xjc.rdeeppparams.XjcRdeEppParams;
+import google.registry.xjc.rdeeppparams.XjcRdeEppParamsElement;
 import google.registry.xjc.rdeidn.XjcRdeIdn;
 import google.registry.xjc.rdeidn.XjcRdeIdnElement;
 import google.registry.xjc.rdepolicy.XjcRdePolicy;
@@ -151,6 +162,43 @@ public final class RdeMarshaller implements Serializable {
     return marshalOrDie(new XjcRdeIdnElement(bean));
   }
 
+  public String marshalRdeEppParams() {
+    XjcRdeEppParams bean = new XjcRdeEppParams();
+    bean.getVersions().add("1.0");
+    bean.getLangs().add("en");
+    bean.getObjURIs().add(RdeResourceType.DOMAIN.getUri());
+    bean.getObjURIs().add(RdeResourceType.HOST.getUri());
+
+    XjcEppExtURIType serviceExtensions = new XjcEppExtURIType();
+    serviceExtensions.getExtURIs().addAll(ProtocolDefinition.getVisibleServiceExtensionUris());
+    bean.setSvcExtension(serviceExtensions);
+
+    XjcEppDcpType dcpType = new XjcEppDcpType();
+    XjcEppDcpAccessType accessType = new XjcEppDcpAccessType();
+    accessType.setAll(new XjcEppDcpAccessType.All());
+    dcpType.setAccess(accessType);
+
+    XjcEppDcpStatementType statementType = new XjcEppDcpStatementType();
+
+    XjcEppDcpPurposeType purposeType = new XjcEppDcpPurposeType();
+    purposeType.setAdmin(new XjcEppDcpPurposeType.Admin());
+    purposeType.setProv(new XjcEppDcpPurposeType.Prov());
+    statementType.setPurpose(purposeType);
+
+    XjcEppDcpRecipientType recipientType = new XjcEppDcpRecipientType();
+    recipientType.getOurs().add(new XjcEppDcpOursType());
+    recipientType.setPublic(new XjcEppDcpRecipientType.Public());
+    statementType.setRecipient(recipientType);
+
+    XjcEppDcpRetentionType retentionType = new XjcEppDcpRetentionType();
+    retentionType.setStated(new XjcEppDcpRetentionType.Stated());
+    statementType.setRetention(retentionType);
+
+    dcpType.getStatements().add(statementType);
+    bean.setDcp(dcpType);
+    return marshalOrDie(new XjcRdeEppParamsElement(bean));
+  }
+
   private DepositFragment marshalResource(
       RdeResourceType type, ImmutableObject resource, JAXBElement<?> element) {
     String xml = "";

core/src/main/java/google/registry/rde/RdeReportAction.java

@@ -14,7 +14,6 @@
 
 package google.registry.rde;
 
-
 import static com.google.common.base.Verify.verify;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static google.registry.model.common.Cursor.getCursorTimeOrStartOfTime;

core/src/main/java/google/registry/rde/RdeResourceType.java

@@ -29,7 +29,8 @@ public enum RdeResourceType {
   HOST("urn:ietf:params:xml:ns:rdeHost-1.0", EnumSet.of(FULL)),
   REGISTRAR("urn:ietf:params:xml:ns:rdeRegistrar-1.0", EnumSet.of(FULL, THIN)),
   IDN("urn:ietf:params:xml:ns:rdeIDN-1.0", EnumSet.of(FULL)),
-  HEADER("urn:ietf:params:xml:ns:rdeHeader-1.0", EnumSet.of(FULL, THIN));
+  HEADER("urn:ietf:params:xml:ns:rdeHeader-1.0", EnumSet.of(FULL, THIN)),
+  EPP_PARAMS("urn:ietf:params:xml:ns:rdeEppParams-1.0", EnumSet.of(FULL, THIN));
 
   private final String uri;
   private final ImmutableSet<RdeMode> modes;

core/src/main/java/google/registry/rde/RdeUploadAction.java

@@ -14,7 +14,6 @@
 
 package google.registry.rde;
 
-
 import static com.google.common.base.Verify.verify;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static com.jcraft.jsch.ChannelSftp.OVERWRITE;