diff --git a/java/google/registry/flows/domain/DomainAllocateFlow.java b/java/google/registry/flows/domain/DomainAllocateFlow.java index 5509042bc..c25e6d72f 100644 --- a/java/google/registry/flows/domain/DomainAllocateFlow.java +++ b/java/google/registry/flows/domain/DomainAllocateFlow.java @@ -14,7 +14,6 @@ package google.registry.flows.domain; -import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.flows.domain.DomainFlowUtils.getReservationType; import static google.registry.model.EppResourceUtils.loadDomainApplication; import static google.registry.model.ofy.ObjectifyService.ofy; @@ -137,19 +136,7 @@ public class DomainAllocateFlow extends DomainCreateOrAllocateFlow { DomainPendingActionNotificationResponse.create( application.getFullyQualifiedDomainName(), true, - // If the creation TRID is not present on the application (this can happen for - // older applications written before this field was added), then we must read - // the earliest history entry for the application to retrieve it. - application.getCreationTrid() == null - ? checkNotNull(ofy() - .load() - .type(HistoryEntry.class) - .ancestor(application) - .order("modificationTime") - .first() - .now() - .getTrid()) - : application.getCreationTrid(), + application.getCreationTrid(), now))) .setResponseExtensions(ImmutableList.of( new LaunchInfoResponseExtension.Builder() diff --git a/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java b/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java index 2b4842526..53972f752 100644 --- a/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java @@ -107,6 +107,7 @@ public class DomainAllocateFlowTest "collision-label,NAME_COLLISION")).build()); String domainName = getUniqueIdFromCommand(); application = persistResource(newDomainApplication(domainName).asBuilder() + .setCreationTrid(TRID) .setEncodedSignedMarks(ImmutableList.of(EncodedSignedMark.create("base64", "abcdef"))) .build()); for (int i = 1; i <= 14; ++i) { @@ -114,14 +115,6 @@ public class DomainAllocateFlowTest } persistActiveContact("jd1234"); persistActiveContact("sh8013"); - // Add a history entry under this application that corresponds to its creation. - persistResource( - new HistoryEntry.Builder() - .setParent(application) - .setType(HistoryEntry.Type.DOMAIN_APPLICATION_CREATE) - .setModificationTime(APPLICATION_TIME) - .setTrid(TRID) - .build()); clock.setTo(DateTime.parse("2010-09-16T10:00:00.0Z")); } @@ -145,7 +138,7 @@ public class DomainAllocateFlowTest DomainApplication application = loadDomainApplication(applicationId, clock.nowUtc()); assertAboutApplications().that(application) .hasApplicationStatus(ApplicationStatus.ALLOCATED).and() - .hasHistoryEntryAtIndex(1) + .hasHistoryEntryAtIndex(0) .which().hasType(HistoryEntry.Type.DOMAIN_APPLICATION_STATUS_UPDATE); String domainName = getUniqueIdFromCommand();