diff --git a/java/google/registry/flows/ResourceFlowUtils.java b/java/google/registry/flows/ResourceFlowUtils.java index 7f1c6bd08..4e488cc07 100644 --- a/java/google/registry/flows/ResourceFlowUtils.java +++ b/java/google/registry/flows/ResourceFlowUtils.java @@ -209,9 +209,8 @@ public final class ResourceFlowUtils { /** * Create a {@link TransferData} object representing a resolved transfer. * - *

This clears all the server-approve fields on the {@link TransferData} including the extended - * registration years field, sets the status field, and sets the expiration time of the last - * pending transfer to now. + *

This clears all the server-approve fields on the {@link TransferData}, sets the status + * field, and sets the expiration time of the last pending transfer to now. */ public static TransferData createResolvedTransferData( TransferData oldTransferData, TransferStatus transferStatus, DateTime now) { @@ -229,16 +228,15 @@ public final class ResourceFlowUtils { /** * Turn a resource into a builder with its pending transfer resolved. * - *

This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the - * {@link TransferStatus}, clears all the server-approve fields on the {@link TransferData} - * including the extended registration years field, and sets the expiration time of the last - * pending transfer to now. + *

This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the {@link + * TransferStatus}, clears all the server-approve fields on the {@link TransferData}, and sets the + * expiration time of the last pending transfer to now. */ @SuppressWarnings("unchecked") public static < - R extends EppResource & ResourceWithTransferData, - B extends EppResource.Builder & BuilderWithTransferData> B resolvePendingTransfer( - R resource, TransferStatus transferStatus, DateTime now) { + R extends EppResource & ResourceWithTransferData, + B extends EppResource.Builder & BuilderWithTransferData> + B resolvePendingTransfer(R resource, TransferStatus transferStatus, DateTime now) { checkState( resource.getStatusValues().contains(StatusValue.PENDING_TRANSFER), "Resource is not in pending transfer status."); @@ -251,15 +249,15 @@ public final class ResourceFlowUtils { /** * Resolve a pending transfer by awarding it to the gaining client. * - *

This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the - * {@link TransferStatus}, clears all the server-approve fields on the {@link TransferData} - * including the extended registration years field, and sets the expiration time of the last - * pending transfer to now. + *

This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the {@link + * TransferStatus}, clears all the server-approve fields on the {@link TransferData}, sets the new + * client id, and sets the last transfer time and the expiration time of the last pending transfer + * to now. */ public static < - R extends EppResource & ResourceWithTransferData, - B extends Builder & BuilderWithTransferData> - R approvePendingTransfer(R resource, TransferStatus transferStatus, DateTime now) { + R extends EppResource & ResourceWithTransferData, + B extends Builder & BuilderWithTransferData> + R approvePendingTransfer(R resource, TransferStatus transferStatus, DateTime now) { B builder = ResourceFlowUtils.resolvePendingTransfer(resource, transferStatus, now); return builder .setLastTransferTime(now) @@ -270,10 +268,9 @@ public final class ResourceFlowUtils { /** * Resolve a pending transfer by denying it. * - *

This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the - * {@link TransferStatus}, clears all the server-approve fields on the {@link TransferData} - * including the extended registration years field, sets the new client id, and sets the last - * transfer time and the expiration time of the last pending transfer to now. + *

This removes the {@link StatusValue#PENDING_TRANSFER} status, sets the {@link + * TransferStatus}, clears all the server-approve fields on the {@link TransferData}, and sets the + * expiration time of the last pending transfer to now. */ public static R denyPendingTransfer( R resource, TransferStatus transferStatus, DateTime now) { diff --git a/java/google/registry/flows/domain/DomainTransferUtils.java b/java/google/registry/flows/domain/DomainTransferUtils.java index fdaf48e34..590fdd26c 100644 --- a/java/google/registry/flows/domain/DomainTransferUtils.java +++ b/java/google/registry/flows/domain/DomainTransferUtils.java @@ -218,14 +218,14 @@ public final class DomainTransferUtils { * *

If the domain will be in the auto-renew grace period at the automatic transfer time, then * the transfer will subsume the autorenew. This means that we "cancel" the 1-year extension of - * the autorenew before applying the extra transfer years, which in effect means reducing the - * transfer extended registration years by one. Since the gaining registrar will still be billed - * for the full extended registration years, we must issue a cancellation for the autorenew, so - * that the losing registrar will not be charged (essentially, the gaining registrar takes on the - * cost of the year of registration that the autorenew just added). + * the autorenew before adding the extra transfer year, which results in zero net change in the + * expiration time. Since the gaining registrar will still be billed for the transfer's 1-year + * renewal, we must issue a cancellation for the autorenew, so that the losing registrar will not + * be charged (essentially, the gaining registrar takes on the cost of the year of registration + * that the autorenew just added). * - *

For details on the policy justification, see b/19430703#comment17 and - * this ICANN advisory. + *

For details on the policy justification, see b/19430703#comment17 and this ICANN advisory. */ private static Optional createOptionalAutorenewCancellation( DateTime automaticTransferTime,