diff --git a/java/google/registry/flows/domain/DomainDeleteFlow.java b/java/google/registry/flows/domain/DomainDeleteFlow.java index e6e6c745d..e1d08d1a8 100644 --- a/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/java/google/registry/flows/domain/DomainDeleteFlow.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.flows.FlowUtils.validateClientIsLoggedIn; import static google.registry.flows.ResourceFlowUtils.handlePendingTransferOnDelete; import static google.registry.flows.ResourceFlowUtils.loadAndVerifyExistence; -import static google.registry.flows.ResourceFlowUtils.resolvePendingTransfer; import static google.registry.flows.ResourceFlowUtils.updateForeignKeyIndexDeletionTime; import static google.registry.flows.ResourceFlowUtils.verifyNoDisallowedStatuses; import static google.registry.flows.ResourceFlowUtils.verifyOptionalAuthInfo; @@ -43,6 +42,7 @@ import google.registry.flows.ExtensionManager; import google.registry.flows.FlowModule.ClientId; import google.registry.flows.FlowModule.Superuser; import google.registry.flows.FlowModule.TargetId; +import google.registry.flows.ResourceFlowUtils; import google.registry.flows.SessionMetadata; import google.registry.flows.TransactionalFlow; import google.registry.model.ImmutableObject; @@ -120,7 +120,9 @@ public final class DomainDeleteFlow implements TransactionalFlow { Registry registry = Registry.get(existingDomain.getTld()); verifyDeleteAllowed(existingDomain, registry, now); HistoryEntry historyEntry = buildHistoryEntry(existingDomain, now); - Builder builder = resolvePendingTransfer(existingDomain, TransferStatus.SERVER_CANCELLED, null); + Builder builder = + ResourceFlowUtils.resolvePendingTransfer( + existingDomain, TransferStatus.SERVER_CANCELLED, null); builder.setDeletionTime(now).setStatusValues(null); // If the domain is in the Add Grace Period, we delete it immediately, which is already // reflected in the builder we just prepared. Otherwise we give it a PENDING_DELETE status. diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java index cfe20850e..0990452a7 100644 --- a/javatests/google/registry/request/RequestHandlerTest.java +++ b/javatests/google/registry/request/RequestHandlerTest.java @@ -164,7 +164,7 @@ public final class RequestHandlerTest { // Initialize here, not inline, so that we pick up the mocked UserService. handler = RequestHandler.createForTest( Component.class, - Providers.of(new Builder() { + Providers.of(new Builder() { @Override public Component build() { // Use a fake Builder that returns the single component instance that uses the mocks.