Remove various ContactHistory references

gbrodman · gbrodman · commit cffca0c035d6 · 2026-01-29T14:00:34.000-05:00
This keeps the ContactHistory class and tests, to avoid changing any
database-related code in this PR.
diff --git a/core/src/main/java/google/registry/flows/FlowModule.java b/core/src/main/java/google/registry/flows/FlowModule.java
@@ -22,7 +22,6 @@
 import dagger.Module;
 import dagger.Provides;
 import google.registry.flows.picker.FlowPicker;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.eppcommon.AuthInfo;
@@ -267,23 +266,6 @@ B makeHistoryEntryBuilder(
     return builder;
   }
 
-  /**
-   * Provides a partially filled in {@link ContactHistory.Builder}
-   *
-   * <p>This is not marked with {@link FlowScope} so that each retry gets a fresh one. Otherwise,
-   * the fact that the builder is one-use would cause NPEs.
-   */
-  @Provides
-  static ContactHistory.Builder provideContactHistoryBuilder(
-      Trid trid,
-      @InputXml byte[] inputXmlBytes,
-      @Superuser boolean isSuperuser,
-      @RegistrarId String registrarId,
-      EppInput eppInput) {
-    return makeHistoryEntryBuilder(
-        new ContactHistory.Builder(), trid, inputXmlBytes, isSuperuser, registrarId, eppInput);
-  }
-
   /**
    * Provides a partially filled in {@link HostHistory.Builder}
    *
diff --git a/core/src/main/java/google/registry/model/poll/PollMessage.java b/core/src/main/java/google/registry/model/poll/PollMessage.java
@@ -27,7 +27,6 @@
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.annotations.IdAllocation;
 import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.DomainRenewData;
@@ -272,12 +271,6 @@ public B setDomainHistoryId(HistoryEntryId historyId) {
       return thisCastToDerived();
     }
 
-    public B setContactHistoryId(HistoryEntryId historyId) {
-      getInstance().contactRepoId = historyId.getRepoId();
-      getInstance().contactHistoryRevisionId = historyId.getRevisionId();
-      return thisCastToDerived();
-    }
-
     public B setHostHistoryId(HistoryEntryId historyId) {
       getInstance().hostRepoId = historyId.getRepoId();
       getInstance().hostHistoryRevisionId = historyId.getRevisionId();
@@ -290,9 +283,6 @@ public B setHistoryEntry(HistoryEntry history) {
       if (history instanceof DomainHistory) {
         return setDomainHistoryId(historyId);
       }
-      if (history instanceof ContactHistory) {
-        return setContactHistoryId(historyId);
-      }
       if (history instanceof HostHistory) {
         return setHostHistoryId(historyId);
       }
diff --git a/core/src/main/java/google/registry/model/reporting/HistoryEntry.java b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java
@@ -23,8 +23,6 @@
 import google.registry.model.ImmutableObject;
 import google.registry.model.UnsafeSerializable;
 import google.registry.model.annotations.IdAllocation;
-import google.registry.model.contact.ContactBase;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.eppcommon.Trid;
@@ -348,8 +346,6 @@ public B setRequestedByRegistrar(Boolean requestedByRegistrar) {
       HistoryEntry.Builder<? extends HistoryEntry, ?> createBuilderForResource(E parent) {
     if (parent instanceof DomainBase) {
       return new DomainHistory.Builder().setDomain((DomainBase) parent);
-    } else if (parent instanceof ContactBase) {
-      return new ContactHistory.Builder().setContact((ContactBase) parent);
     } else if (parent instanceof HostBase) {
       return new HostHistory.Builder().setHost((HostBase) parent);
     } else {
diff --git a/core/src/main/java/google/registry/model/reporting/HistoryEntryDao.java b/core/src/main/java/google/registry/model/reporting/HistoryEntryDao.java
@@ -25,8 +25,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Streams;
 import google.registry.model.EppResource;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.host.Host;
@@ -46,8 +44,6 @@ public class HistoryEntryDao {
   public static ImmutableMap<Class<? extends EppResource>, Class<? extends HistoryEntry>>
       RESOURCE_TYPES_TO_HISTORY_TYPES =
           ImmutableMap.of(
-              Contact.class,
-              ContactHistory.class,
               Domain.class,
               DomainHistory.class,
               Host.class,
@@ -59,7 +55,6 @@ public static ImmutableList<HistoryEntry> loadAllHistoryObjects(
     return tm().transact(
             () ->
                 new ImmutableList.Builder<HistoryEntry>()
-                    .addAll(loadAllHistoryObjects(ContactHistory.class, afterTime, beforeTime))
                     .addAll(loadAllHistoryObjects(DomainHistory.class, afterTime, beforeTime))
                     .addAll(loadAllHistoryObjects(HostHistory.class, afterTime, beforeTime))
                     .build());
@@ -121,7 +116,6 @@ public static Iterable<HistoryEntry> loadHistoryObjectsByRegistrars(
     return tm().reTransact(
             () ->
                 Streams.concat(
-                        loadHistoryObjectByRegistrarsInternal(ContactHistory.class, registrarIds),
                         loadHistoryObjectByRegistrarsInternal(DomainHistory.class, registrarIds),
                         loadHistoryObjectByRegistrarsInternal(HostHistory.class, registrarIds))
                     .sorted(Comparator.comparing(HistoryEntry::getModificationTime))
diff --git a/core/src/test/java/google/registry/beam/resave/ResaveAllEppResourcesPipelineTest.java b/core/src/test/java/google/registry/beam/resave/ResaveAllEppResourcesPipelineTest.java
@@ -22,7 +22,6 @@
 import static google.registry.testing.DatabaseHelper.loadByEntity;
 import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistActiveDomain;
-import static google.registry.testing.DatabaseHelper.persistContactWithPendingTransfer;
 import static google.registry.testing.DatabaseHelper.persistDomainWithDependentResources;
 import static google.registry.testing.DatabaseHelper.persistDomainWithPendingTransfer;
 import static google.registry.testing.DatabaseHelper.persistNewRegistrars;
@@ -89,18 +88,6 @@ void testPipeline_unchangedEntity() {
     assertThat(loadByEntity(contact)).isEqualTo(contact);
   }
 
-  @Test
-  void testPipeline_fulfilledContactTransfer() {
-    Contact contact = persistActiveContact("test123");
-    DateTime now = fakeClock.nowUtc();
-    contact = persistContactWithPendingTransfer(contact, now, now.plusDays(5), now);
-    fakeClock.advanceBy(Duration.standardDays(10));
-    assertThat(loadByEntity(contact).getStatusValues()).contains(StatusValue.PENDING_TRANSFER);
-    runPipeline();
-    assertThat(loadByEntity(contact).getStatusValues())
-        .doesNotContain(StatusValue.PENDING_TRANSFER);
-  }
-
   @Test
   void testPipeline_fulfilledDomainTransfer() {
     options.setFast(true);
diff --git a/core/src/test/java/google/registry/flows/ResourceFlowTestCase.java b/core/src/test/java/google/registry/flows/ResourceFlowTestCase.java
@@ -24,13 +24,10 @@
 import com.google.common.testing.TestLogHandler;
 import google.registry.model.EppResource;
 import google.registry.model.ForeignKeyUtils;
-import google.registry.model.contact.ContactBase;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.eppinput.EppInput.ResourceCommandWrapper;
 import google.registry.model.eppinput.ResourceCommand;
-import google.registry.model.host.HostBase;
 import google.registry.model.host.HostHistory;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.tmch.ClaimsList;
@@ -131,18 +128,12 @@ protected void assertIcannReportingActivityFieldLogged(String fieldName) {
 
   protected void assertLastHistoryContainsResource(EppResource resource) {
     HistoryEntry historyEntry = Iterables.getLast(DatabaseHelper.getHistoryEntries(resource));
-    if (resource instanceof ContactBase) {
-      ContactHistory contactHistory = (ContactHistory) historyEntry;
-      // Don't use direct equals comparison since one might be a subclass of the other
-      assertAboutImmutableObjects()
-          .that(contactHistory.getContactBase().get())
-          .hasFieldsEqualTo(resource);
-    } else if (resource instanceof DomainBase) {
+    if (resource instanceof DomainBase) {
       DomainHistory domainHistory = (DomainHistory) historyEntry;
       assertAboutImmutableObjects()
           .that(domainHistory.getDomainBase().get())
           .isEqualExceptFields(resource, "gracePeriods", "dsData", "nsHosts");
-    } else if (resource instanceof HostBase) {
+    } else {
       HostHistory hostHistory = (HostHistory) historyEntry;
       // Don't use direct equals comparison since one might be a subclass of the other
       assertAboutImmutableObjects()
diff --git a/core/src/test/java/google/registry/flows/poll/PollRequestFlowTest.java b/core/src/test/java/google/registry/flows/poll/PollRequestFlowTest.java
@@ -28,7 +28,6 @@
 import google.registry.flows.FlowTestCase;
 import google.registry.flows.poll.PollRequestFlow.UnexpectedMessageIdException;
 import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.host.Host;
@@ -225,29 +224,6 @@ void testSuccess_futureAutorenew() throws Exception {
     runFlowAssertResponse(loadFile("poll_response_empty.xml"));
   }
 
-  @Test
-  void testSuccess_contactDelete() throws Exception {
-    // Contact delete poll messages do not have any response data, so ensure that no
-    // response data block is produced in the poll message.
-    HistoryEntry historyEntry =
-        persistResource(
-            new ContactHistory.Builder()
-                .setRegistrarId("NewRegistrar")
-                .setModificationTime(clock.nowUtc().minusDays(1))
-                .setType(HistoryEntry.Type.CONTACT_DELETE)
-                .setContact(contact)
-                .build());
-    persistResource(
-        new PollMessage.OneTime.Builder()
-            .setRegistrarId("NewRegistrar")
-            .setMsg("Deleted contact jd1234")
-            .setHistoryEntry(historyEntry)
-            .setEventTime(clock.nowUtc().minusDays(1))
-            .build());
-    assertMutatingFlow(false);
-    runFlowAssertResponse(loadFile("poll_response_contact_delete.xml"));
-  }
-
   @Test
   void testSuccess_hostDelete() throws Exception {
     // Host delete poll messages do not have any response data, so ensure that no
diff --git a/core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java b/core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java
@@ -18,36 +18,33 @@
 import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistActiveDomain;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.EntityTestCase;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.Period;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField;
+import google.registry.model.reporting.HistoryEntry.Type;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link HistoryEntry}. */
 class HistoryEntryTest extends EntityTestCase {
 
+  private Domain domain;
   private DomainHistory domainHistory;
-  private Contact contact;
 
   @BeforeEach
   void setUp() {
     createTld("foobar");
-    Domain domain = persistActiveDomain("foo.foobar");
-    contact = persistActiveContact("someone");
+    domain = persistActiveDomain("foo.foobar");
     DomainTransactionRecord transactionRecord =
         new DomainTransactionRecord.Builder()
             .setTld("foobar")
@@ -91,12 +88,12 @@ void testBuilder_resourceMustBeSpecified() {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
                     .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
                     .setRegistrarId("TheRegistrar")
                     .setReason("Reason")
-                    .setType(HistoryEntry.Type.CONTACT_CREATE)
+                    .setType(Type.DOMAIN_CREATE)
                     .build());
     assertThat(thrown).hasMessageThat().isEqualTo("EPP resource must be specified");
   }
@@ -107,10 +104,10 @@ void testBuilder_typeMustBeSpecified() {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
-                    .setContact(contact)
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
+                    .setDomain(domain)
+                    .setModificationTime(DateTime.parse("1985-07-12T22:30.00Z"))
                     .setRegistrarId("TheRegistrar")
                     .setReason("Reason")
                     .build());
@@ -123,12 +120,12 @@ void testBuilder_modificationTimeMustBeSpecified() {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
-                    .setContact(contact)
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setType(HistoryEntry.Type.CONTACT_CREATE)
+                    .setDomain(domain)
+                    .setType(Type.DOMAIN_CREATE)
                     .setRegistrarId("TheRegistrar")
-                    .setReason("Reason")
+                    .setReason("reason")
                     .build());
     assertThat(thrown).hasMessageThat().isEqualTo("Modification time must be specified");
   }
@@ -139,11 +136,11 @@ void testBuilder_registrarIdMustBeSpecified() {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setContact(contact)
-                    .setType(HistoryEntry.Type.CONTACT_CREATE)
-                    .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
+                    .setDomain(domain)
+                    .setType(Type.DOMAIN_CREATE)
+                    .setModificationTime(DateTime.parse("1985-07-12T22:30.00Z"))
                     .setReason("Reason")
                     .build());
     assertThat(thrown).hasMessageThat().isEqualTo("Registrar ID must be specified");
@@ -155,11 +152,11 @@ void testBuilder_syntheticHistoryEntries_mustNotBeRequestedByRegistrar() {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
-                    .setContact(contact)
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setType(HistoryEntry.Type.SYNTHETIC)
-                    .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
+                    .setDomain(domain)
+                    .setType(Type.SYNTHETIC)
+                    .setModificationTime(DateTime.parse("1985-07-12T22:30.00Z"))
                     .setRegistrarId("TheRegistrar")
                     .setReason("Reason")
                     .setRequestedByRegistrar(true)
diff --git a/core/src/test/java/google/registry/testing/DatabaseHelper.java b/core/src/test/java/google/registry/testing/DatabaseHelper.java
