From 1a664fe95b207c84b65dc0ed9de957fd324830c0 Mon Sep 17 00:00:00 2001 From: gbrodman Date: Wed, 12 May 2021 19:11:30 -0400 Subject: [PATCH] Populate the host in HostHistory objects in Host flows (#1129) * Populate the host in HostHistory objects in Host flows --- .../registry/flows/contact/ContactCreateFlow.java | 2 +- .../registry/flows/contact/ContactDeleteFlow.java | 2 +- .../flows/contact/ContactTransferApproveFlow.java | 2 +- .../flows/contact/ContactTransferCancelFlow.java | 2 +- .../flows/contact/ContactTransferRejectFlow.java | 2 +- .../flows/contact/ContactTransferRequestFlow.java | 2 +- .../registry/flows/contact/ContactUpdateFlow.java | 2 +- .../google/registry/flows/domain/DomainCreateFlow.java | 2 +- .../google/registry/flows/domain/DomainDeleteFlow.java | 2 +- .../google/registry/flows/domain/DomainRenewFlow.java | 2 +- .../flows/domain/DomainRestoreRequestFlow.java | 2 +- .../flows/domain/DomainTransferApproveFlow.java | 2 +- .../flows/domain/DomainTransferCancelFlow.java | 2 +- .../flows/domain/DomainTransferRejectFlow.java | 2 +- .../flows/domain/DomainTransferRequestFlow.java | 2 +- .../google/registry/flows/domain/DomainUpdateFlow.java | 2 +- .../google/registry/flows/host/HostCreateFlow.java | 10 ++++------ .../google/registry/flows/host/HostDeleteFlow.java | 2 +- .../google/registry/flows/host/HostUpdateFlow.java | 9 ++++----- .../google/registry/model/contact/ContactHistory.java | 2 +- .../google/registry/model/domain/DomainHistory.java | 2 +- .../java/google/registry/model/host/HostHistory.java | 5 ++++- .../google/registry/flows/ResourceFlowTestCase.java | 7 +++++-- .../flows/domain/DomainTransferCancelFlowTest.java | 2 +- .../google/registry/flows/host/HostCreateFlowTest.java | 6 ++++-- .../google/registry/flows/host/HostDeleteFlowTest.java | 1 + .../google/registry/flows/host/HostUpdateFlowTest.java | 1 + .../mapreduce/inputs/ChildEntityInputTest.java | 8 ++++---- .../google/registry/model/ImmutableObjectSubject.java | 4 ++++ .../registry/model/billing/BillingEventTest.java | 4 ++-- .../registry/model/domain/DomainBaseSqlTest.java | 4 ++-- .../registry/model/history/ContactHistoryTest.java | 4 ++-- .../registry/model/history/DomainHistoryTest.java | 5 ++--- .../google/registry/model/history/HostHistoryTest.java | 4 ++-- .../poll/PollMessageExternalKeyConverterTest.java | 2 +- .../registry/model/reporting/HistoryEntryDaoTest.java | 2 +- .../registry/model/reporting/HistoryEntryTest.java | 2 +- .../registry/rde/DomainBaseToXjcConverterTest.java | 2 +- .../java/google/registry/testing/DatabaseHelper.java | 4 ++-- .../google/registry/tools/UpdateDomainCommandTest.java | 2 +- 40 files changed, 68 insertions(+), 58 deletions(-) diff --git a/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java index 0bb731396..a3ce895ab 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java @@ -95,7 +95,7 @@ public final class ContactCreateFlow implements TransactionalFlow { .setType(HistoryEntry.Type.CONTACT_CREATE) .setModificationTime(now) .setXmlBytes(null) // We don't want to store contact details in the history entry. - .setContactBase(newContact); + .setContact(newContact); tm().insertAll( ImmutableSet.of( newContact, diff --git a/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java b/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java index 3fe179340..83170854b 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java @@ -125,7 +125,7 @@ public final class ContactDeleteFlow implements TransactionalFlow { historyBuilder .setType(historyEntryType) .setModificationTime(now) - .setContactBase(newContact) + .setContact(newContact) .build(); if (!tm().isOfy()) { handlePendingTransferOnDelete(existingContact, newContact, now, contactHistory); diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java index acf05f612..3e7fd21fc 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java @@ -91,7 +91,7 @@ public final class ContactTransferApproveFlow implements TransactionalFlow { historyBuilder .setType(HistoryEntry.Type.CONTACT_TRANSFER_APPROVE) .setModificationTime(now) - .setContactBase(newContact) + .setContact(newContact) .build(); // Create a poll message for the gaining client. PollMessage gainingPollMessage = diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java index 46b2f59e7..b1424c82f 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java @@ -87,7 +87,7 @@ public final class ContactTransferCancelFlow implements TransactionalFlow { historyBuilder .setType(HistoryEntry.Type.CONTACT_TRANSFER_CANCEL) .setModificationTime(now) - .setContactBase(newContact) + .setContact(newContact) .build(); // Create a poll message for the losing client. PollMessage losingPollMessage = diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java index 1c9003c08..34bb7c1c2 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java @@ -85,7 +85,7 @@ public final class ContactTransferRejectFlow implements TransactionalFlow { historyBuilder .setType(HistoryEntry.Type.CONTACT_TRANSFER_REJECT) .setModificationTime(now) - .setContactBase(newContact) + .setContact(newContact) .build(); PollMessage gainingPollMessage = createGainingTransferPollMessage( diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java index 1b115d402..473927ac0 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java @@ -153,7 +153,7 @@ public final class ContactTransferRequestFlow implements TransactionalFlow { tm().update(newContact); tm().insertAll( ImmutableSet.of( - historyBuilder.setContactBase(newContact).build(), + historyBuilder.setContact(newContact).build(), requestPollMessage, serverApproveGainingPollMessage, serverApproveLosingPollMessage)); diff --git a/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java index 120aed7b1..e8128c17f 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java @@ -149,7 +149,7 @@ public final class ContactUpdateFlow implements TransactionalFlow { .setType(HistoryEntry.Type.CONTACT_UPDATE) .setModificationTime(now) .setXmlBytes(null) // We don't want to store contact details in the history entry. - .setContactBase(newContact); + .setContact(newContact); tm().insert(historyBuilder.build()); tm().update(newContact); return responseBuilder.build(); diff --git a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java index 46031fb7a..0978d2eb7 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java @@ -502,7 +502,7 @@ public class DomainCreateFlow implements TransactionalFlow { .setType(HistoryEntry.Type.DOMAIN_CREATE) .setPeriod(period) .setModificationTime(now) - .setDomainContent(domain) + .setDomain(domain) .build(); } diff --git a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java index 6d16c027a..d3cde956d 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java @@ -331,7 +331,7 @@ public final class DomainDeleteFlow implements TransactionalFlow { return historyBuilder .setType(HistoryEntry.Type.DOMAIN_DELETE) .setModificationTime(now) - .setDomainContent(domain) + .setDomain(domain) .build(); } diff --git a/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java index 08ef87ded..05a909e44 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java @@ -233,7 +233,7 @@ public final class DomainRenewFlow implements TransactionalFlow { .setType(HistoryEntry.Type.DOMAIN_RENEW) .setPeriod(period) .setModificationTime(now) - .setDomainContent(newDomain) + .setDomain(newDomain) .setDomainTransactionRecords( ImmutableSet.of( DomainTransactionRecord.create( diff --git a/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java index 855386987..ddc4de010 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java @@ -190,7 +190,7 @@ public final class DomainRestoreRequestFlow implements TransactionalFlow { return historyBuilder .setType(HistoryEntry.Type.DOMAIN_RESTORE) .setModificationTime(now) - .setDomainContent(newDomain) + .setDomain(newDomain) .setDomainTransactionRecords( ImmutableSet.of( DomainTransactionRecord.create( diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java index 65590bbcf..b9fad6717 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java @@ -243,7 +243,7 @@ public final class DomainTransferApproveFlow implements TransactionalFlow { .setType(HistoryEntry.Type.DOMAIN_TRANSFER_APPROVE) .setModificationTime(now) .setOtherClientId(gainingClientId) - .setDomainContent(newDomain) + .setDomain(newDomain) .setDomainTransactionRecords( union( cancelingRecords, diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java index b5ef05258..625d3da1e 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java @@ -132,7 +132,7 @@ public final class DomainTransferCancelFlow implements TransactionalFlow { return historyBuilder .setType(HistoryEntry.Type.DOMAIN_TRANSFER_CANCEL) .setModificationTime(now) - .setDomainContent(newDomain) + .setDomain(newDomain) .setDomainTransactionRecords(cancelingRecords) .build(); } diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java index 1c8160028..0160288d8 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java @@ -137,7 +137,7 @@ public final class DomainTransferRejectFlow implements TransactionalFlow { union( cancelingRecords, DomainTransactionRecord.create(newDomain.getTld(), now, TRANSFER_NACKED, 1))) - .setDomainContent(newDomain) + .setDomain(newDomain) .build(); } } diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java index 509c4f0bf..87c4e5792 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -318,7 +318,7 @@ public final class DomainTransferRequestFlow implements TransactionalFlow { .setType(HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST) .setPeriod(period) .setModificationTime(now) - .setDomainContent(newDomain) + .setDomain(newDomain) .setDomainTransactionRecords( ImmutableSet.of( DomainTransactionRecord.create( diff --git a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java index cb238edcf..abf97d7ca 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java @@ -221,7 +221,7 @@ public final class DomainUpdateFlow implements TransactionalFlow { return historyBuilder .setType(HistoryEntry.Type.DOMAIN_UPDATE) .setModificationTime(now) - .setDomainContent(newDomain) + .setDomain(newDomain) .build(); } diff --git a/core/src/main/java/google/registry/flows/host/HostCreateFlow.java b/core/src/main/java/google/registry/flows/host/HostCreateFlow.java index 6a5a469e1..e7da3bedb 100644 --- a/core/src/main/java/google/registry/flows/host/HostCreateFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostCreateFlow.java @@ -45,6 +45,7 @@ import google.registry.model.eppinput.ResourceCommand; import google.registry.model.eppoutput.CreateData.HostCreateData; import google.registry.model.eppoutput.EppResponse; import google.registry.model.host.HostCommand.Create; +import google.registry.model.host.HostHistory; import google.registry.model.host.HostResource; import google.registry.model.index.EppResourceIndex; import google.registry.model.index.ForeignKeyIndex; @@ -85,7 +86,7 @@ public final class HostCreateFlow implements TransactionalFlow { @Inject ExtensionManager extensionManager; @Inject @ClientId String clientId; @Inject @TargetId String targetId; - @Inject HistoryEntry.Builder historyBuilder; + @Inject HostHistory.Builder historyBuilder; @Inject DnsQueue dnsQueue; @Inject EppResponse.Builder responseBuilder; @@ -128,14 +129,11 @@ public final class HostCreateFlow implements TransactionalFlow { .setRepoId(createRepoId(ObjectifyService.allocateId(), roidSuffix)) .setSuperordinateDomain(superordinateDomain.map(DomainBase::createVKey).orElse(null)) .build(); - historyBuilder - .setType(HistoryEntry.Type.HOST_CREATE) - .setModificationTime(now) - .setParent(Key.create(newHost)); + historyBuilder.setType(HistoryEntry.Type.HOST_CREATE).setModificationTime(now).setHost(newHost); ImmutableSet entitiesToSave = ImmutableSet.of( newHost, - historyBuilder.build().toChildHistoryEntity(), + historyBuilder.build(), ForeignKeyIndex.create(newHost, newHost.getDeletionTime()), EppResourceIndex.create(Key.create(newHost))); if (superordinateDomain.isPresent()) { diff --git a/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java b/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java index af488b4bb..1456e6ce3 100644 --- a/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java @@ -130,7 +130,7 @@ public final class HostDeleteFlow implements TransactionalFlow { historyEntryType = Type.HOST_DELETE; resultCode = SUCCESS; } - historyBuilder.setType(historyEntryType).setModificationTime(now).setHostBase(newHost); + historyBuilder.setType(historyEntryType).setModificationTime(now).setHost(newHost); tm().insert(historyBuilder.build()); tm().update(newHost); return responseBuilder.setResultFromCode(resultCode).build(); diff --git a/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java b/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java index 9776dbb24..e8395b3c3 100644 --- a/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java @@ -31,7 +31,6 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import static google.registry.util.CollectionUtils.isNullOrEmpty; import com.google.common.collect.ImmutableSet; -import com.googlecode.objectify.Key; import google.registry.batch.AsyncTaskEnqueuer; import google.registry.dns.DnsQueue; import google.registry.flows.EppException; @@ -55,6 +54,7 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.model.host.HostCommand.Update; import google.registry.model.host.HostCommand.Update.AddRemove; import google.registry.model.host.HostCommand.Update.Change; +import google.registry.model.host.HostHistory; import google.registry.model.host.HostResource; import google.registry.model.index.ForeignKeyIndex; import google.registry.model.reporting.HistoryEntry; @@ -116,7 +116,7 @@ public final class HostUpdateFlow implements TransactionalFlow { @Inject @ClientId String clientId; @Inject @TargetId String targetId; @Inject @Superuser boolean isSuperuser; - @Inject HistoryEntry.Builder historyBuilder; + @Inject HostHistory.Builder historyBuilder; @Inject AsyncTaskEnqueuer asyncTaskEnqueuer; @Inject DnsQueue dnsQueue; @Inject EppResponse.Builder responseBuilder; @@ -205,9 +205,8 @@ public final class HostUpdateFlow implements TransactionalFlow { historyBuilder .setType(HistoryEntry.Type.HOST_UPDATE) .setModificationTime(now) - .setParent(Key.create(existingHost)) - .build() - .toChildHistoryEntity()); + .setHost(newHost) + .build()); tm().updateAll(entitiesToUpdate.build()); tm().insertAll(entitiesToInsert.build()); return responseBuilder.build(); diff --git a/core/src/main/java/google/registry/model/contact/ContactHistory.java b/core/src/main/java/google/registry/model/contact/ContactHistory.java index c266244f3..564681759 100644 --- a/core/src/main/java/google/registry/model/contact/ContactHistory.java +++ b/core/src/main/java/google/registry/model/contact/ContactHistory.java @@ -197,7 +197,7 @@ public class ContactHistory extends HistoryEntry implements SqlEntity { super(instance); } - public Builder setContactBase(@Nullable ContactBase contactBase) { + public Builder setContact(@Nullable ContactBase contactBase) { // Nullable for the sake of pre-Registry-3.0 history objects if (contactBase == null) { return this; diff --git a/core/src/main/java/google/registry/model/domain/DomainHistory.java b/core/src/main/java/google/registry/model/domain/DomainHistory.java index eede8710d..9bd3780a0 100644 --- a/core/src/main/java/google/registry/model/domain/DomainHistory.java +++ b/core/src/main/java/google/registry/model/domain/DomainHistory.java @@ -345,7 +345,7 @@ public class DomainHistory extends HistoryEntry implements SqlEntity { super(instance); } - public Builder setDomainContent(@Nullable DomainContent domainContent) { + public Builder setDomain(@Nullable DomainContent domainContent) { // Nullable for the sake of pre-Registry-3.0 history objects if (domainContent == null) { return this; diff --git a/core/src/main/java/google/registry/model/host/HostHistory.java b/core/src/main/java/google/registry/model/host/HostHistory.java index c3821f656..fa71064b8 100644 --- a/core/src/main/java/google/registry/model/host/HostHistory.java +++ b/core/src/main/java/google/registry/model/host/HostHistory.java @@ -110,6 +110,9 @@ public class HostHistory extends HistoryEntry implements SqlEntity { if (hostBase != null && hostBase.getHostName() == null) { hostBase = null; } + if (hostBase != null && hostBase.getRepoId() == null) { + hostBase = hostBase.asBuilder().setRepoId(parent.getName()).build(); + } } // In Datastore, save as a HistoryEntry object regardless of this object's type @@ -195,7 +198,7 @@ public class HostHistory extends HistoryEntry implements SqlEntity { super(instance); } - public Builder setHostBase(@Nullable HostBase hostBase) { + public Builder setHost(@Nullable HostBase hostBase) { // Nullable for the sake of pre-Registry-3.0 history objects if (hostBase == null) { return this; diff --git a/core/src/test/java/google/registry/flows/ResourceFlowTestCase.java b/core/src/test/java/google/registry/flows/ResourceFlowTestCase.java index e0a1058f9..45943ff8b 100644 --- a/core/src/test/java/google/registry/flows/ResourceFlowTestCase.java +++ b/core/src/test/java/google/registry/flows/ResourceFlowTestCase.java @@ -196,7 +196,7 @@ public abstract class ResourceFlowTestCase ignoredFields) { isEqualExceptFields(expected, Iterables.toArray(ignoredFields, String.class)); diff --git a/core/src/test/java/google/registry/model/billing/BillingEventTest.java b/core/src/test/java/google/registry/model/billing/BillingEventTest.java index 325807cf4..a6b2d8c1f 100644 --- a/core/src/test/java/google/registry/model/billing/BillingEventTest.java +++ b/core/src/test/java/google/registry/model/billing/BillingEventTest.java @@ -77,7 +77,7 @@ public class BillingEventTest extends EntityTestCase { domainHistory = persistResource( new DomainHistory.Builder() - .setDomainContent(domain) + .setDomain(domain) .setModificationTime(now) .setRequestedByRegistrar(false) .setType(HistoryEntry.Type.DOMAIN_CREATE) @@ -86,7 +86,7 @@ public class BillingEventTest extends EntityTestCase { domainHistory2 = persistResource( new DomainHistory.Builder() - .setDomainContent(domain) + .setDomain(domain) .setModificationTime(now.plusDays(1)) .setRequestedByRegistrar(false) .setType(HistoryEntry.Type.DOMAIN_CREATE) diff --git a/core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java b/core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java index 73f597c3b..0f3942db8 100644 --- a/core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java +++ b/core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java @@ -522,7 +522,7 @@ public class DomainBaseSqlTest { .setTransferData(transferData) .setGracePeriods(gracePeriods) .build(); - historyEntry = historyEntry.asBuilder().setDomainContent(domain).build(); + historyEntry = historyEntry.asBuilder().setDomain(domain).build(); jpaTm().insert(historyEntry); jpaTm().insert(autorenewPollMessage); jpaTm().insert(billEvent); @@ -661,7 +661,7 @@ public class DomainBaseSqlTest { .setTransferData(transferData) .setGracePeriods(gracePeriods) .build(); - historyEntry = historyEntry.asBuilder().setDomainContent(domain).build(); + historyEntry = historyEntry.asBuilder().setDomain(domain).build(); jpaTm().insert(historyEntry); jpaTm().insert(autorenewPollMessage); jpaTm().insert(billEvent); diff --git a/core/src/test/java/google/registry/model/history/ContactHistoryTest.java b/core/src/test/java/google/registry/model/history/ContactHistoryTest.java index a47d370f3..cbdd7153e 100644 --- a/core/src/test/java/google/registry/model/history/ContactHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/ContactHistoryTest.java @@ -69,7 +69,7 @@ public class ContactHistoryTest extends EntityTestCase { ContactHistory contactHistory = createContactHistory(contactFromDb, contact.getRepoId()) .asBuilder() - .setContactBase(null) + .setContact(null) .build(); jpaTm().transact(() -> jpaTm().insert(contactHistory)); @@ -116,7 +116,7 @@ public class ContactHistoryTest extends EntityTestCase { .setBySuperuser(false) .setReason("reason") .setRequestedByRegistrar(true) - .setContactBase(contact) + .setContact(contact) .setContactRepoId(contactRepoId) .build(); } diff --git a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java index 9a0672a99..e8b149e33 100644 --- a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java @@ -86,8 +86,7 @@ public class DomainHistoryTest extends EntityTestCase { @TestSqlOnly void testLegacyPersistence_nullResource() { DomainBase domain = addGracePeriodForSql(createDomainWithContactsAndHosts()); - DomainHistory domainHistory = - createDomainHistory(domain).asBuilder().setDomainContent(null).build(); + DomainHistory domainHistory = createDomainHistory(domain).asBuilder().setDomain(null).build(); jpaTm().transact(() -> jpaTm().insert(domainHistory)); jpaTm() @@ -255,7 +254,7 @@ public class DomainHistoryTest extends EntityTestCase { .setBySuperuser(false) .setReason("reason") .setRequestedByRegistrar(true) - .setDomainContent(domain) + .setDomain(domain) .setDomainRepoId(domain.getRepoId()) .setDomainTransactionRecords(ImmutableSet.of(transactionRecord)) .setOtherClientId("otherClient") diff --git a/core/src/test/java/google/registry/model/history/HostHistoryTest.java b/core/src/test/java/google/registry/model/history/HostHistoryTest.java index e4ea3ffc1..6cd296e10 100644 --- a/core/src/test/java/google/registry/model/history/HostHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/HostHistoryTest.java @@ -67,7 +67,7 @@ public class HostHistoryTest extends EntityTestCase { HostResource hostFromDb = jpaTm().transact(() -> jpaTm().loadByKey(host.createVKey())); HostHistory hostHistory = - createHostHistory(hostFromDb, host.getRepoId()).asBuilder().setHostBase(null).build(); + createHostHistory(hostFromDb, host.getRepoId()).asBuilder().setHost(null).build(); jpaTm().transact(() -> jpaTm().insert(hostHistory)); jpaTm() @@ -121,7 +121,7 @@ public class HostHistoryTest extends EntityTestCase { .setBySuperuser(false) .setReason("reason") .setRequestedByRegistrar(true) - .setHostBase(hostBase) + .setHost(hostBase) .setHostRepoId(hostRepoId) .build(); } diff --git a/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java b/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java index 9a0aed562..3b9faa9dd 100644 --- a/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java +++ b/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java @@ -62,7 +62,7 @@ public class PollMessageExternalKeyConverterTest { historyEntry = persistResource( new DomainHistory.Builder() - .setDomainContent(persistActiveDomain("foo.foobar")) + .setDomain(persistActiveDomain("foo.foobar")) .setType(HistoryEntry.Type.DOMAIN_CREATE) .setPeriod(Period.create(1, Period.Unit.YEARS)) .setXmlBytes("".getBytes(UTF_8)) diff --git a/core/src/test/java/google/registry/model/reporting/HistoryEntryDaoTest.java b/core/src/test/java/google/registry/model/reporting/HistoryEntryDaoTest.java index e575b275e..d80b0647d 100644 --- a/core/src/test/java/google/registry/model/reporting/HistoryEntryDaoTest.java +++ b/core/src/test/java/google/registry/model/reporting/HistoryEntryDaoTest.java @@ -58,7 +58,7 @@ class HistoryEntryDaoTest extends EntityTestCase { // Set up a new persisted DomainHistory entity. domainHistory = new DomainHistory.Builder() - .setDomainContent(domain) + .setDomain(domain) .setType(HistoryEntry.Type.DOMAIN_CREATE) .setPeriod(Period.create(1, Period.Unit.YEARS)) .setXmlBytes("".getBytes(UTF_8)) diff --git a/core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java b/core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java index 781a5c61f..8f4f340dc 100644 --- a/core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java +++ b/core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java @@ -55,7 +55,7 @@ class HistoryEntryTest extends EntityTestCase { // Set up a new persisted HistoryEntry entity. domainHistory = new DomainHistory.Builder() - .setDomainContent(domain) + .setDomain(domain) .setType(HistoryEntry.Type.DOMAIN_CREATE) .setPeriod(Period.create(1, Period.Unit.YEARS)) .setXmlBytes("".getBytes(UTF_8)) diff --git a/core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java b/core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java index e655b7774..47ec369ef 100644 --- a/core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java +++ b/core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java @@ -224,7 +224,7 @@ public class DomainBaseToXjcConverterTest { new DomainHistory.Builder() .setModificationTime(clock.nowUtc()) .setType(HistoryEntry.Type.DOMAIN_CREATE) - .setDomainContent(domain) + .setDomain(domain) .build()); BillingEvent.OneTime billingEvent = persistResource( diff --git a/core/src/test/java/google/registry/testing/DatabaseHelper.java b/core/src/test/java/google/registry/testing/DatabaseHelper.java index a566e4451..b7a53d61a 100644 --- a/core/src/test/java/google/registry/testing/DatabaseHelper.java +++ b/core/src/test/java/google/registry/testing/DatabaseHelper.java @@ -636,7 +636,7 @@ public class DatabaseHelper { new DomainHistory.Builder() .setType(HistoryEntry.Type.DOMAIN_CREATE) .setModificationTime(now) - .setDomainContent(domain) + .setDomain(domain) .build()); BillingEvent.Recurring autorenewEvent = persistResource( @@ -677,7 +677,7 @@ public class DatabaseHelper { new DomainHistory.Builder() .setType(HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST) .setModificationTime(tm().transact(() -> tm().getTransactionTime())) - .setDomainContent(domain) + .setDomain(domain) .build()); BillingEvent.OneTime transferBillingEvent = persistResource( diff --git a/core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java b/core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java index 13e1368e8..4674f9fed 100644 --- a/core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java @@ -298,7 +298,7 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase