zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 08:27:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix Nomulus build type inference error on resolvePendingTransfer()

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=139219997
This commit is contained in:
mcilwain 2016-11-15 10:49:28 -08:00 • committed by Ben McIlwain
parent e0dbc1cb12
commit 3942f0768b
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
java/google/registry/flows/domain/DomainDeleteFlow.java
View file

@ -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.<DomainResource, DomainResource.Builder>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.

2
javatests/google/registry/request/RequestHandlerTest.java
View file

@ -164,7 +164,7 @@ public final class RequestHandlerTest {
// Initialize here, not inline, so that we pick up the mocked UserService.
handler = RequestHandler.<Component, Builder>createForTest(
Component.class,
Providers.of(new Builder() {
Providers.<Builder>of(new Builder() {
@Override
public Component build() {
// Use a fake Builder that returns the single component instance that uses the mocks.