Refactor TransferData to remove unused fields in Contact table (#623)

* Add DomainTransferData and ContactTransferData

* Refactor TransferData to remove unused fields in Contact table

* Add scope for TransferData's type parameter

core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java

@@ -87,6 +87,7 @@ import google.registry.model.poll.PollMessage.OneTime;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.server.Lock;
+import google.registry.model.transfer.ContactTransferData;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferResponse;
 import google.registry.model.transfer.TransferStatus;
@@ -303,7 +304,7 @@ public class DeleteContactsAndHostsActionTest
         false);
     runMapreduce();
     ContactResource contactAfterDeletion = ofy().load().entity(contact).now();
-    assertThat(contactAfterDeletion.getTransferData()).isEqualTo(TransferData.EMPTY);
+    assertThat(contactAfterDeletion.getTransferData()).isEqualTo(ContactTransferData.EMPTY);
   }
 
   @Test

core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java

@@ -43,14 +43,12 @@ import google.registry.flows.exceptions.ObjectAlreadySponsoredException;
 import google.registry.flows.exceptions.ResourceStatusProhibitsOperationException;
 import google.registry.model.contact.ContactAuthInfo;
 import google.registry.model.contact.ContactResource;
-import google.registry.model.domain.Period;
-import google.registry.model.domain.Period.Unit;
 import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.ContactTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
 import org.joda.time.DateTime;
@@ -95,13 +93,11 @@ public class ContactTransferRequestFlowTest
             contact.getTransferData().getTransferRequestTrid().getServerTransactionId());
     assertThat(contact.getTransferData())
         .isEqualTo(
-            new TransferData.Builder()
+            new ContactTransferData.Builder()
                 .setTransferRequestTrid(expectedTrid)
                 .setTransferRequestTime(clock.nowUtc())
                 .setGainingClientId("NewRegistrar")
                 .setLosingClientId("TheRegistrar")
-                // Period is meaningless for contact transfers, but this is the default.
-                .setTransferPeriod(Period.create(1, Unit.YEARS))
                 .setTransferStatus(TransferStatus.PENDING)
                 .setPendingTransferExpirationTime(afterTransfer)
                 // Make the server-approve entities field a no-op comparison; it's easier to

core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java

@@ -90,7 +90,7 @@ import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldType;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferResponse;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
@@ -595,7 +595,7 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow,
     clock.advanceOneMilli();
     runFlowAssertResponse(loadFile("domain_delete_response_pending.xml"));
     DomainBase domain = reloadResourceByForeignKey();
-    assertThat(domain.getTransferData()).isEqualTo(TransferData.EMPTY);
+    assertThat(domain.getTransferData()).isEqualTo(DomainTransferData.EMPTY);
   }
 
   @Test
@@ -603,7 +603,7 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow,
     setClientIdForFlow("TheRegistrar");
     setUpSuccessfulTest();
     // Modify the domain we are testing to include a pending transfer.
-    TransferData oldTransferData =
+    DomainTransferData oldTransferData =
         persistWithPendingTransfer(reloadResourceByForeignKey()).getTransferData();
     clock.advanceOneMilli();
     runFlowAssertResponse(loadFile("domain_delete_response_pending.xml"));

core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java

@@ -68,7 +68,7 @@ import google.registry.model.poll.PollMessage;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
@@ -109,7 +109,7 @@ public class DomainTransferApproveFlowTest
     clock.advanceOneMilli();
   }
 
-  private void assertTransferApproved(DomainBase domain, TransferData oldTransferData) {
+  private void assertTransferApproved(DomainBase domain, DomainTransferData oldTransferData) {
     assertAboutDomains()
         .that(domain)
         .hasCurrentSponsorClientId("NewRegistrar")
@@ -178,7 +178,7 @@ public class DomainTransferApproveFlowTest
     assertThat(getPollMessages(domain, "NewRegistrar", clock.nowUtc().plusMonths(1))).hasSize(1);
     assertThat(getPollMessages(domain, "TheRegistrar", clock.nowUtc().plusMonths(1))).hasSize(1);
     // Setup done; run the test.
-    TransferData originalTransferData = domain.getTransferData();
+    DomainTransferData originalTransferData = domain.getTransferData();
     assertTransactionalFlow(true);
     runFlowAssertResponse(loadFile(expectedXmlFilename));
     // Transfer should have succeeded. Verify correct fields were set.
@@ -616,7 +616,7 @@ public class DomainTransferApproveFlowTest
   @Test
   public void testSuccess_superuserExtension_transferPeriodZero() throws Exception {
     domain = reloadResourceByForeignKey();
-    TransferData.Builder transferDataBuilder = domain.getTransferData().asBuilder();
+    DomainTransferData.Builder transferDataBuilder = domain.getTransferData().asBuilder();
     persistResource(
         domain
             .asBuilder()
@@ -641,7 +641,7 @@ public class DomainTransferApproveFlowTest
     // active autorenew grace period spanning the entire transfer window.
     DateTime autorenewTime = clock.nowUtc().minusDays(1);
     DateTime expirationTime = autorenewTime.plusYears(1);
-    TransferData.Builder transferDataBuilder = domain.getTransferData().asBuilder();
+    DomainTransferData.Builder transferDataBuilder = domain.getTransferData().asBuilder();
     domain =
         persistResource(
             domain

core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java

@@ -98,7 +98,7 @@ import google.registry.model.registrar.Registrar.State;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferResponse;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
@@ -213,7 +213,7 @@ public class DomainTransferRequestFlowTest
             domain.getTransferData().getTransferRequestTrid().getServerTransactionId());
     assertThat(domain.getTransferData())
         .isEqualTo(
-            new TransferData.Builder()
+            new DomainTransferData.Builder()
                 .setGainingClientId("NewRegistrar")
                 .setLosingClientId("TheRegistrar")
                 .setTransferRequestTrid(expectedTrid)

core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java

@@ -44,7 +44,7 @@ import google.registry.model.eppcommon.Trid;
 import google.registry.model.host.HostResource;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import org.joda.time.DateTime;
 import org.junit.Before;
@@ -226,7 +226,7 @@ public class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, Hos
                 .setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't hurt.
                 .addStatusValue(StatusValue.PENDING_TRANSFER)
                 .setTransferData(
-                    new TransferData.Builder()
+                    new DomainTransferData.Builder()
                         .setTransferStatus(TransferStatus.PENDING)
                         .setGainingClientId("NewRegistrar")
                         .setTransferRequestTime(requestTime)
@@ -259,7 +259,7 @@ public class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, Hos
                 .setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't help.
                 .addStatusValue(StatusValue.PENDING_TRANSFER)
                 .setTransferData(
-                    new TransferData.Builder()
+                    new DomainTransferData.Builder()
                         .setTransferStatus(TransferStatus.PENDING)
                         .setGainingClientId("TheRegistrar")
                         .setTransferRequestTime(requestTime)

core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java

@@ -74,7 +74,7 @@ import google.registry.model.host.HostResource;
 import google.registry.model.index.ForeignKeyIndex;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import javax.annotation.Nullable;
@@ -117,7 +117,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
         .setPersistedCurrentSponsorClientId("TheRegistrar")
         .addStatusValue(StatusValue.PENDING_TRANSFER)
         .setTransferData(
-            new TransferData.Builder()
+            new DomainTransferData.Builder()
                 .setTransferStatus(TransferStatus.PENDING)
                 .setGainingClientId("NewRegistrar")
                 .setTransferRequestTime(requestTime)

core/src/test/java/google/registry/model/contact/ContactResourceTest.java

@@ -37,7 +37,7 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
 import google.registry.model.eppcommon.PresenceMarker;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppcommon.Trid;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.ContactTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
 import org.junit.jupiter.api.BeforeEach;
@@ -108,7 +108,7 @@ public class ContactResourceTest extends EntityTestCase {
                     .build())
             .setStatusValues(ImmutableSet.of(StatusValue.OK))
             .setTransferData(
-                new TransferData.Builder()
+                new ContactTransferData.Builder()
                     .setGainingClientId("gaining")
                     .setLosingClientId("losing")
                     .setPendingTransferExpirationTime(fakeClock.nowUtc())
@@ -205,7 +205,8 @@ public class ContactResourceTest extends EntityTestCase {
   @Test
   public void testEmptyTransferDataBecomesNull() {
     ContactResource withNull = new ContactResource.Builder().setTransferData(null).build();
-    ContactResource withEmpty = withNull.asBuilder().setTransferData(TransferData.EMPTY).build();
+    ContactResource withEmpty =
+        withNull.asBuilder().setTransferData(ContactTransferData.EMPTY).build();
     assertThat(withNull).isEqualTo(withEmpty);
     assertThat(withEmpty.transferData).isNull();
   }

core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java

@@ -29,7 +29,7 @@ import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.ContactTransferData;
 import google.registry.persistence.VKey;
 import google.registry.persistence.transaction.JpaTestRules;
 import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationWithCoverageExtension;
@@ -191,7 +191,7 @@ public class DomainBaseSqlTest {
     return new ContactResource.Builder()
         .setRepoId(repoId)
         .setCreationClientId("registrar1")
-        .setTransferData(new TransferData.Builder().build())
+        .setTransferData(new ContactTransferData.Builder().build())
         .setPersistedCurrentSponsorClientId("registrar1")
         .build();
   }

core/src/test/java/google/registry/model/domain/DomainBaseTest.java

@@ -52,7 +52,7 @@ import google.registry.model.host.HostResource;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
 import org.joda.money.Money;
@@ -133,7 +133,7 @@ public class DomainBaseTest extends EntityTestCase {
                     .setLaunchNotice(
                         LaunchNotice.create("tcnid", "validatorId", START_OF_TIME, START_OF_TIME))
                     .setTransferData(
-                        new TransferData.Builder()
+                        new DomainTransferData.Builder()
                             .setGainingClientId("gaining")
                             .setLosingClientId("losing")
                             .setPendingTransferExpirationTime(fakeClock.nowUtc())
@@ -267,7 +267,7 @@ public class DomainBaseTest extends EntityTestCase {
   @Test
   public void testEmptyTransferDataBecomesNull() {
     DomainBase withNull = newDomainBase("example.com").asBuilder().setTransferData(null).build();
-    DomainBase withEmpty = withNull.asBuilder().setTransferData(TransferData.EMPTY).build();
+    DomainBase withEmpty = withNull.asBuilder().setTransferData(DomainTransferData.EMPTY).build();
     assertThat(withNull).isEqualTo(withEmpty);
     assertThat(withEmpty.transferData).isNull();
   }
@@ -478,7 +478,7 @@ public class DomainBaseTest extends EntityTestCase {
         domain
             .asBuilder()
             .setRegistrationExpirationTime(oldExpirationTime)
-            .setTransferData(TransferData.EMPTY)
+            .setTransferData(DomainTransferData.EMPTY)
             .setGracePeriods(ImmutableSet.of())
             .setLastEppUpdateTime(null)
             .setLastEppUpdateClientId(null)
@@ -666,8 +666,8 @@ public class DomainBaseTest extends EntityTestCase {
     DateTime transferExpirationTime = now.minusDays(1);
     DateTime previousExpiration = now.minusDays(2);
 
-    TransferData transferData =
-        new TransferData.Builder()
+    DomainTransferData transferData =
+        new DomainTransferData.Builder()
             .setPendingTransferExpirationTime(transferExpirationTime)
             .setTransferStatus(TransferStatus.PENDING)
             .setGainingClientId("TheRegistrar")
@@ -694,8 +694,8 @@ public class DomainBaseTest extends EntityTestCase {
     DateTime transferExpirationTime = now.minusDays(1);
     DateTime previousExpiration = now.plusWeeks(2);
 
-    TransferData transferData =
-        new TransferData.Builder()
+    DomainTransferData transferData =
+        new DomainTransferData.Builder()
             .setPendingTransferExpirationTime(transferExpirationTime)
             .setTransferStatus(TransferStatus.PENDING)
             .setGainingClientId("TheRegistrar")
@@ -721,8 +721,8 @@ public class DomainBaseTest extends EntityTestCase {
     DateTime transferExpirationTime = now.plusDays(1);
     DateTime previousExpiration = now.plusWeeks(2);
 
-    TransferData transferData =
-        new TransferData.Builder()
+    DomainTransferData transferData =
+        new DomainTransferData.Builder()
             .setPendingTransferExpirationTime(transferExpirationTime)
             .setTransferStatus(TransferStatus.PENDING)
             .setGainingClientId("TheRegistrar")
@@ -747,8 +747,8 @@ public class DomainBaseTest extends EntityTestCase {
     DateTime transferExpirationTime = now.minusDays(1);
     DateTime previousExpiration = now.minusDays(2);
 
-    TransferData transferData =
-        new TransferData.Builder()
+    DomainTransferData transferData =
+        new DomainTransferData.Builder()
             .setPendingTransferExpirationTime(transferExpirationTime)
             .setTransferStatus(TransferStatus.PENDING)
             .setGainingClientId("TheRegistrar")

core/src/test/java/google/registry/model/host/HostResourceTest.java

@@ -31,7 +31,7 @@ import google.registry.model.billing.BillingEvent;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppcommon.Trid;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
 import org.joda.time.DateTime;
@@ -58,7 +58,7 @@ public class HostResourceTest extends EntityTestCase {
                 .asBuilder()
                 .setRepoId("1-COM")
                 .setTransferData(
-                    new TransferData.Builder()
+                    new DomainTransferData.Builder()
                         .setGainingClientId("gaining")
                         .setLosingClientId("losing")
                         .setPendingTransferExpirationTime(fakeClock.nowUtc())

core/src/test/java/google/registry/model/transfer/TransferDataTest.java

@@ -57,8 +57,8 @@ public class TransferDataTest {
 
   @Test
   public void test_copyConstantFieldsToBuilder() {
-    TransferData constantTransferData =
-        new TransferData.Builder()
+    DomainTransferData constantTransferData =
+        new DomainTransferData.Builder()
             .setTransferRequestTrid(Trid.create("server-trid", "client-trid"))
             .setTransferRequestTime(now)
             .setGainingClientId("NewRegistrar")
@@ -66,7 +66,7 @@ public class TransferDataTest {
             // Test must use a non-1-year period, since that's the default value.
             .setTransferPeriod(Period.create(5, Period.Unit.YEARS))
             .build();
-    TransferData fullTransferData =
+    DomainTransferData fullTransferData =
         constantTransferData
             .asBuilder()
             .setPendingTransferExpirationTime(now)

core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java

@@ -39,7 +39,7 @@ import google.registry.model.ofy.Ofy;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.rdap.RdapJsonFormatter.OutputDataType;
 import google.registry.rdap.RdapObjectClasses.BoilerplateType;
@@ -170,7 +170,7 @@ public class RdapJsonFormatterTest {
                                 .asBuilder()
                                 .addStatusValue(StatusValue.PENDING_TRANSFER)
                                 .setTransferData(
-                                    new TransferData.Builder()
+                                    new DomainTransferData.Builder()
                                         .setTransferStatus(TransferStatus.PENDING)
                                         .setGainingClientId("NewRegistrar")
                                         .setTransferRequestTime(clock.nowUtc().minusDays(1))

core/src/test/java/google/registry/rde/ContactResourceToXjcConverterTest.java

@@ -31,7 +31,7 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
 import google.registry.model.eppcommon.PresenceMarker;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppcommon.Trid;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.ContactTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.testing.AppEngineRule;
 import google.registry.xjc.contact.XjcContactPostalInfoEnumType;
@@ -297,46 +297,49 @@ public class ContactResourceToXjcConverterTest {
         .setLastTransferTime(DateTime.parse("1925-04-20TZ"))
         .setLastEppUpdateTime(DateTime.parse("1930-04-20TZ"))
         .setEmailAddress("justine@crr.com")
-        .setStatusValues(ImmutableSet.of(
-            StatusValue.CLIENT_DELETE_PROHIBITED,
-            StatusValue.SERVER_UPDATE_PROHIBITED))
-        .setInternationalizedPostalInfo(new PostalInfo.Builder()
-            .setType(PostalInfo.Type.INTERNATIONALIZED)
-            .setName("Dipsy Doodle")
-            .setOrg("Charleston Road Registry Incorporated")
-            .setAddress(new ContactAddress.Builder()
-                .setStreet(ImmutableList.of("123 Charleston Road", "Suite 123"))
-                .setCity("Mountain View")
-                .setState("CA")
-                .setZip("31337")
-                .setCountryCode("US")
+        .setStatusValues(
+            ImmutableSet.of(
+                StatusValue.CLIENT_DELETE_PROHIBITED, StatusValue.SERVER_UPDATE_PROHIBITED))
+        .setInternationalizedPostalInfo(
+            new PostalInfo.Builder()
+                .setType(PostalInfo.Type.INTERNATIONALIZED)
+                .setName("Dipsy Doodle")
+                .setOrg("Charleston Road Registry Incorporated")
+                .setAddress(
+                    new ContactAddress.Builder()
+                        .setStreet(ImmutableList.of("123 Charleston Road", "Suite 123"))
+                        .setCity("Mountain View")
+                        .setState("CA")
+                        .setZip("31337")
+                        .setCountryCode("US")
+                        .build())
                 .build())
-            .build())
         .setVoiceNumber(
             new ContactPhoneNumber.Builder()
                 .setPhoneNumber("+1.2126660000")
                 .setExtension("123")
                 .build())
-        .setFaxNumber(
-            new ContactPhoneNumber.Builder()
-                .setPhoneNumber("+1.2126660001")
+        .setFaxNumber(new ContactPhoneNumber.Builder().setPhoneNumber("+1.2126660001").build())
+        .setTransferData(
+            new ContactTransferData.Builder()
+                .setGainingClientId("TheRegistrar")
+                .setLosingClientId("NewRegistrar")
+                .setTransferRequestTime(DateTime.parse("1925-04-19TZ"))
+                .setPendingTransferExpirationTime(DateTime.parse("1925-04-21TZ"))
+                .setTransferStatus(TransferStatus.SERVER_APPROVED)
+                .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
+                .build())
+        .setDisclose(
+            new Disclose.Builder()
+                .setFlag(true)
+                .setEmail(new PresenceMarker())
+                .setAddrs(
+                    ImmutableList.of(
+                        Disclose.PostalInfoChoice.create(PostalInfo.Type.INTERNATIONALIZED)))
+                .setNames(
+                    ImmutableList.of(
+                        Disclose.PostalInfoChoice.create(PostalInfo.Type.INTERNATIONALIZED)))
                 .build())
-        .setTransferData(new TransferData.Builder()
-            .setGainingClientId("TheRegistrar")
-            .setLosingClientId("NewRegistrar")
-            .setTransferRequestTime(DateTime.parse("1925-04-19TZ"))
-            .setPendingTransferExpirationTime(DateTime.parse("1925-04-21TZ"))
-            .setTransferStatus(TransferStatus.SERVER_APPROVED)
-            .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
-            .build())
-        .setDisclose(new Disclose.Builder()
-            .setFlag(true)
-            .setEmail(new PresenceMarker())
-            .setAddrs(ImmutableList.of(
-                Disclose.PostalInfoChoice.create(PostalInfo.Type.INTERNATIONALIZED)))
-            .setNames(ImmutableList.of(
-                Disclose.PostalInfoChoice.create(PostalInfo.Type.INTERNATIONALIZED)))
-            .build())
         .build();
   }
 }

core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java

@@ -53,7 +53,7 @@ import google.registry.model.poll.PollMessage;
 import google.registry.model.poll.PollMessage.Autorenew;
 import google.registry.model.rde.RdeMode;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
@@ -328,7 +328,7 @@ public class DomainBaseToXjcConverterTest {
                             .setParent(historyEntry)
                             .build())))
             .setTransferData(
-                new TransferData.Builder()
+                new DomainTransferData.Builder()
                     .setGainingClientId("gaining")
                     .setLosingClientId("losing")
                     .setPendingTransferExpirationTime(DateTime.parse("1925-04-20T00:00:00Z"))

core/src/test/java/google/registry/rde/RdeFixtures.java

@@ -47,7 +47,7 @@ import google.registry.model.host.HostResource;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.poll.PollMessage.Autorenew;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.testing.FakeClock;
 import google.registry.util.Idn;
@@ -170,7 +170,7 @@ final class RdeFixtures {
                             .setParent(historyEntry)
                             .build())))
             .setTransferData(
-                new TransferData.Builder()
+                new DomainTransferData.Builder()
                     .setGainingClientId("gaining")
                     .setLosingClientId("losing")
                     .setPendingTransferExpirationTime(DateTime.parse("1993-04-20T00:00:00Z"))

core/src/test/java/google/registry/testing/DatastoreHelper.java

@@ -91,6 +91,8 @@ import google.registry.model.registry.label.PremiumList.PremiumListEntry;
 import google.registry.model.registry.label.PremiumList.PremiumListRevision;
 import google.registry.model.registry.label.ReservedList;
 import google.registry.model.reporting.HistoryEntry;
+import google.registry.model.transfer.ContactTransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
@@ -384,9 +386,19 @@ public class DatastoreHelper {
         registrar.asBuilder().setAllowedTlds(difference(registrar.getAllowedTlds(), tld)).build());
   }
 
-  private static TransferData.Builder createTransferDataBuilder(
+  private static DomainTransferData.Builder createDomainTransferDataBuilder(
       DateTime requestTime, DateTime expirationTime) {
-    return new TransferData.Builder()
+    return new DomainTransferData.Builder()
+        .setTransferStatus(TransferStatus.PENDING)
+        .setGainingClientId("NewRegistrar")
+        .setTransferRequestTime(requestTime)
+        .setLosingClientId("TheRegistrar")
+        .setPendingTransferExpirationTime(expirationTime);
+  }
+
+  private static ContactTransferData.Builder createContactTransferDataBuilder(
+      DateTime requestTime, DateTime expirationTime) {
+    return new ContactTransferData.Builder()
         .setTransferStatus(TransferStatus.PENDING)
         .setGainingClientId("NewRegistrar")
         .setTransferRequestTime(requestTime)
@@ -402,7 +414,7 @@ public class DatastoreHelper {
       DateTime expirationTime,
       @Nullable DateTime extendedRegistrationExpirationTime) {
     TransferData transferData =
-        createTransferDataBuilder(requestTime, expirationTime)
+        createDomainTransferDataBuilder(requestTime, expirationTime)
             .setTransferredRegistrationExpirationTime(extendedRegistrationExpirationTime)
             .build();
     return new PollMessage.OneTime.Builder()
@@ -448,7 +460,7 @@ public class DatastoreHelper {
             .setPersistedCurrentSponsorClientId("TheRegistrar")
             .addStatusValue(StatusValue.PENDING_TRANSFER)
             .setTransferData(
-                createTransferDataBuilder(requestTime, expirationTime)
+                createContactTransferDataBuilder(requestTime, expirationTime)
                     .setPendingTransferExpirationTime(now.plus(getContactAutomaticTransferLength()))
                     .setServerApproveEntities(
                         ImmutableSet.of(
@@ -588,8 +600,8 @@ public class DatastoreHelper {
     } else {
       deleteResource(autorenewPollMessage);
     }
-    TransferData.Builder transferDataBuilder =
-        createTransferDataBuilder(requestTime, expirationTime);
+    DomainTransferData.Builder transferDataBuilder =
+        createDomainTransferDataBuilder(requestTime, expirationTime);
     return persistResource(
         domain
             .asBuilder()

core/src/test/java/google/registry/whois/WhoisActionTest.java

@@ -51,7 +51,7 @@ import google.registry.model.host.HostResource;
 import google.registry.model.ofy.Ofy;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registry.Registry;
-import google.registry.model.transfer.TransferData;
+import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
@@ -178,7 +178,7 @@ public class WhoisActionTest {
         makeDomainBaseWithRegistrar(registrar)
             .asBuilder()
             .setTransferData(
-                new TransferData.Builder()
+                new DomainTransferData.Builder()
                     .setGainingClientId("TheRegistrar")
                     .setLosingClientId("NewRegistrar")
                     .setTransferRequestTime(DateTime.parse("2009-05-29T20:13:00Z"))

core/src/test/resources/google/registry/model/schema.txt

@@ -114,7 +114,7 @@ class google.registry.model.contact.ContactResource {
   google.registry.model.contact.Disclose disclose;
   google.registry.model.contact.PostalInfo internationalizedPostalInfo;
   google.registry.model.contact.PostalInfo localizedPostalInfo;
-  google.registry.model.transfer.TransferData transferData;
+  google.registry.model.transfer.ContactTransferData transferData;
   java.lang.String contactId;
   java.lang.String creationClientId;
   java.lang.String currentSponsorClientId;
@@ -171,7 +171,7 @@ class google.registry.model.domain.DomainBase {
   google.registry.model.UpdateAutoTimestamp updateTimestamp;
   google.registry.model.domain.DomainAuthInfo authInfo;
   google.registry.model.domain.launch.LaunchNotice launchNotice;
-  google.registry.model.transfer.TransferData transferData;
+  google.registry.model.transfer.DomainTransferData transferData;
   java.lang.String creationClientId;
   java.lang.String currentSponsorClientId;
   java.lang.String fullyQualifiedDomainName;
@@ -715,7 +715,16 @@ class google.registry.model.tmch.TmchCrl {
   java.lang.String url;
   org.joda.time.DateTime updated;
 }
-class google.registry.model.transfer.TransferData {
+class google.registry.model.transfer.ContactTransferData {
+  google.registry.model.eppcommon.Trid transferRequestTrid;
+  google.registry.model.transfer.TransferStatus transferStatus;
+  java.lang.String gainingClientId;
+  java.lang.String losingClientId;
+  java.util.Set<google.registry.persistence.VKey<? extends google.registry.model.transfer.TransferData$TransferServerApproveEntity>> serverApproveEntities;
+  org.joda.time.DateTime pendingTransferExpirationTime;
+  org.joda.time.DateTime transferRequestTime;
+}
+class google.registry.model.transfer.DomainTransferData {
   google.registry.model.domain.Period transferPeriod;
   google.registry.model.eppcommon.Trid transferRequestTrid;
   google.registry.model.transfer.TransferStatus transferStatus;