From 57bcd6b1ebbc946681181579c1e159df75e2d010 Mon Sep 17 00:00:00 2001 From: bbilbo Date: Tue, 5 Sep 2017 13:48:02 -0700 Subject: [PATCH] Declare types in ImmutableSet.of() usage ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=167625611 --- .../registry/flows/domain/DomainTransferApproveFlow.java | 2 +- .../registry/flows/domain/DomainTransferRequestFlow.java | 5 +++-- java/google/registry/model/domain/DomainResource.java | 2 +- .../flows/domain/DomainTransferRequestFlowTest.java | 7 ++++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/java/google/registry/flows/domain/DomainTransferApproveFlow.java index ae3db2e52..a2cf9bc56 100644 --- a/java/google/registry/flows/domain/DomainTransferApproveFlow.java +++ b/java/google/registry/flows/domain/DomainTransferApproveFlow.java @@ -119,7 +119,7 @@ public final class DomainTransferApproveFlow implements TransactionalFlow { // the transfer period to zero. There is not a transfer cost if the transfer period is zero. Optional billingEvent = (transferData.getTransferPeriod().getValue() == 0) - ? Optional.absent() + ? Optional.absent() : Optional.of( new BillingEvent.OneTime.Builder() .setReason(Reason.TRANSFER) diff --git a/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/java/google/registry/flows/domain/DomainTransferRequestFlow.java index 9a06e6a09..9ca47075e 100644 --- a/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -75,6 +75,7 @@ import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.model.transfer.TransferStatus; import javax.inject.Inject; +import org.joda.money.Money; import org.joda.time.DateTime; /** @@ -162,7 +163,7 @@ public final class DomainTransferRequestFlow implements TransactionalFlow { // If the period is zero, then there is no fee for the transfer. Optional feesAndCredits = (period.getValue() == 0) - ? Optional.absent() + ? Optional.absent() : Optional.of(pricingLogic.getTransferPrice(registry, targetId, now)); if (feesAndCredits.isPresent()) { validateFeeChallenge(targetId, tld, now, feeTransfer, feesAndCredits.get()); @@ -206,7 +207,7 @@ public final class DomainTransferRequestFlow implements TransactionalFlow { gainingClientId, (feesAndCredits.isPresent()) ? Optional.of(feesAndCredits.get().getTotalCost()) - : Optional.absent(), + : Optional.absent(), now); // Create the transfer data that represents the pending transfer. TransferData pendingTransferData = diff --git a/java/google/registry/model/domain/DomainResource.java b/java/google/registry/model/domain/DomainResource.java index b57a7b7c6..56b93493c 100644 --- a/java/google/registry/model/domain/DomainResource.java +++ b/java/google/registry/model/domain/DomainResource.java @@ -277,7 +277,7 @@ public class DomainResource extends DomainBase transferData.getServerApproveBillingEvent()))); } else { // There won't be a billing event, so we don't need a grace period - builder.setGracePeriods(ImmutableSet.of()); + builder.setGracePeriods(ImmutableSet.of()); } // Set all remaining transfer properties. setAutomaticTransferSuccessProperties(builder, transferData); diff --git a/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java index 26dc15028..678f435fd 100644 --- a/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java @@ -183,7 +183,7 @@ public class DomainTransferRequestFlowTest final HistoryEntry historyEntryTransferRequest = getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_REQUEST); subordinateHost = reloadResourceAndCloneAtTime(subordinateHost, clock.nowUtc()); - assertTransferRequested(domain, Optional.absent()); + assertTransferRequested(domain, Optional.absent()); assertAboutDomains().that(domain) .hasPendingTransferExpirationTime(implicitTransferTime).and() .hasOneHistoryEntryEachOfTypes(DOMAIN_CREATE, DOMAIN_TRANSFER_REQUEST); @@ -201,10 +201,11 @@ public class DomainTransferRequestFlowTest originalGracePeriods, extraExpectedBillingEvents); - assertPollMessagesEmitted(expectedExpirationTime, implicitTransferTime, Optional.absent()); + assertPollMessagesEmitted( + expectedExpirationTime, implicitTransferTime, Optional.absent()); assertAboutDomainAfterAutomaticTransfer( - expectedExpirationTime, implicitTransferTime, Optional.absent()); + expectedExpirationTime, implicitTransferTime, Optional.absent()); } private void assertHistoryEntriesContainBillingEventsAndGracePeriods(