diff --git a/java/google/registry/backup/BackupUtils.java b/java/google/registry/backup/BackupUtils.java index 9282abe89..3982d4961 100644 --- a/java/google/registry/backup/BackupUtils.java +++ b/java/google/registry/backup/BackupUtils.java @@ -41,7 +41,7 @@ public class BackupUtils { } /** - * Converts the given {@link ImmutableObject} to a raw datastore entity and write it to an + * Converts the given {@link ImmutableObject} to a raw datastore entity and write it to an * {@link OutputStream} in delimited protocol buffer format. */ static void serializeEntity(ImmutableObject entity, OutputStream stream) throws IOException { diff --git a/java/google/registry/dns/DnsQueue.java b/java/google/registry/dns/DnsQueue.java index 94c1d4904..3dfc0e7c7 100644 --- a/java/google/registry/dns/DnsQueue.java +++ b/java/google/registry/dns/DnsQueue.java @@ -54,7 +54,7 @@ public class DnsQueue { @Inject @Config("dnsWriteLockTimeout") Duration writeLockTimeout; @Inject @Named(DNS_PULL_QUEUE_NAME) Queue queue; @Inject DnsQueue() {} - + long writeBatchSize = QueueConstants.maxLeaseCount(); /** diff --git a/java/google/registry/dns/ReadDnsQueueAction.java b/java/google/registry/dns/ReadDnsQueueAction.java index 7d6a9ed5f..4d9fc4bb7 100644 --- a/java/google/registry/dns/ReadDnsQueueAction.java +++ b/java/google/registry/dns/ReadDnsQueueAction.java @@ -98,7 +98,7 @@ public final class ReadDnsQueueAction implements Runnable { .result(); } } - + /** Leases all tasks from the pull queue and creates per-tld update actions for them. */ @Override public void run() { diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java index f0c3c5b23..c6dbea352 100644 --- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java +++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java @@ -134,7 +134,7 @@ public class DnsUpdateWriter implements DnsWriter { throw new RuntimeException("publishDomain failed: " + domainName, e); } } - + @Override public void publishDomain(String domainName) { publishDomain(domainName, null); diff --git a/java/google/registry/flows/domain/DomainCreateFlow.java b/java/google/registry/flows/domain/DomainCreateFlow.java index 0860b3b48..6a13cc481 100644 --- a/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/java/google/registry/flows/domain/DomainCreateFlow.java @@ -161,7 +161,7 @@ public class DomainCreateFlow extends DomainCreateOrAllocateFlow { .setParent(historyEntry) .build(); ofy().save().entity(createEvent); - + // Bill for EAP cost, if any. if (!commandOperations.getEapCost().isZero()) { BillingEvent.OneTime eapEvent = diff --git a/java/google/registry/flows/domain/RegistryExtraFlowLogic.java b/java/google/registry/flows/domain/RegistryExtraFlowLogic.java index 59a1f7d7f..2610dfe4b 100644 --- a/java/google/registry/flows/domain/RegistryExtraFlowLogic.java +++ b/java/google/registry/flows/domain/RegistryExtraFlowLogic.java @@ -32,7 +32,7 @@ public interface RegistryExtraFlowLogic { public List getExtensionFlags( DomainResource domainResource, String clientId, DateTime asOfDate); - /** Computes the expected creation fee, for use in fee challenges and the like. */ + /** Computes the expected creation fee, for use in fee challenges and the like. */ public BaseFee getCreateFeeOrCredit( String domainName, String clientId, @@ -63,7 +63,7 @@ public interface RegistryExtraFlowLogic { EppInput eppInput, HistoryEntry historyEntry) throws EppException; - /** Computes the expected renewal fee, for use in fee challenges and the like. */ + /** Computes the expected renewal fee, for use in fee challenges and the like. */ public BaseFee getRenewFeeOrCredit( DomainResource domain, String clientId, @@ -106,7 +106,7 @@ public interface RegistryExtraFlowLogic { EppInput eppInput, HistoryEntry historyEntry) throws EppException; - /** Computes the expected update fee, for use in fee challenges and the like. */ + /** Computes the expected update fee, for use in fee challenges and the like. */ public BaseFee getUpdateFeeOrCredit( DomainResource domain, String clientId, diff --git a/java/google/registry/flows/domain/RegistryExtraFlowLogicProxy.java b/java/google/registry/flows/domain/RegistryExtraFlowLogicProxy.java index b1f7f815e..b70af4eae 100644 --- a/java/google/registry/flows/domain/RegistryExtraFlowLogicProxy.java +++ b/java/google/registry/flows/domain/RegistryExtraFlowLogicProxy.java @@ -48,7 +48,7 @@ public class RegistryExtraFlowLogicProxy { return newInstanceForTld(domain.getTld()); } } - + public static Optional newInstanceForTld(String tld) throws EppException { if (extraLogicOverrideMap.containsKey(tld)) { diff --git a/java/google/registry/flows/domain/TldSpecificLogicProxy.java b/java/google/registry/flows/domain/TldSpecificLogicProxy.java index fd1aaf184..aab432831 100644 --- a/java/google/registry/flows/domain/TldSpecificLogicProxy.java +++ b/java/google/registry/flows/domain/TldSpecificLogicProxy.java @@ -256,7 +256,7 @@ public final class TldSpecificLogicProxy { } else { feeOrCredit = Fee.create(Money.zero(registry.getCurrency()).getAmount(), FeeType.UPDATE); } - + return new EppCommandOperations(currency, feeOrCredit); } @@ -268,7 +268,7 @@ public final class TldSpecificLogicProxy { /** * Checks whether a {@link Create} command has a valid {@link LrpToken} for a particular TLD, and * return that token (wrapped in an {@link Optional}) if one exists. - * + * *

This method has no knowledge of whether or not an auth code (interpreted here as an LRP * token) has already been checked against the reserved list for QLP (anchor tenant), as auth * codes are used for both types of registrations. diff --git a/java/google/registry/groups/DirectoryGroupsConnection.java b/java/google/registry/groups/DirectoryGroupsConnection.java index 3b64fa47e..36176cd76 100644 --- a/java/google/registry/groups/DirectoryGroupsConnection.java +++ b/java/google/registry/groups/DirectoryGroupsConnection.java @@ -134,7 +134,7 @@ public class DirectoryGroupsConnection implements GroupsConnection { } while (!Strings.isNullOrEmpty(listRequest.getPageToken())); return allMembers.build(); } catch (GoogleJsonResponseException e) { - if (e.getDetails() != null + if (e.getDetails() != null && e.getDetails().getCode() == SC_NOT_FOUND && e.getDetails().getMessage().equals(GROUP_NOT_FOUND_MSG)) { return ImmutableSet.of(); diff --git a/java/google/registry/model/common/Cursor.java b/java/google/registry/model/common/Cursor.java index f797a54bd..f0e0945d2 100644 --- a/java/google/registry/model/common/Cursor.java +++ b/java/google/registry/model/common/Cursor.java @@ -103,7 +103,7 @@ public class Cursor extends ImmutableObject { /** * Checks that the type of the scoped object (or null) matches the required type for the specified - * cursor (or null, if the cursor is a global cursor). + * cursor (or null, if the cursor is a global cursor). */ private static void checkValidCursorTypeForScope( CursorType cursorType, Key scope) { @@ -160,12 +160,12 @@ public class Cursor extends ImmutableObject { } /** - * Returns the current time for a given cursor, or {@code START_OF_TIME} if the cursor is null. + * Returns the current time for a given cursor, or {@code START_OF_TIME} if the cursor is null. */ public static DateTime getCursorTimeOrStartOfTime(Cursor cursor) { return cursor != null ? cursor.getCursorTime() : START_OF_TIME; } - + public DateTime getCursorTime() { return cursorTime; } diff --git a/java/google/registry/model/common/TimeOfYear.java b/java/google/registry/model/common/TimeOfYear.java index 53895e83c..0f05061c9 100644 --- a/java/google/registry/model/common/TimeOfYear.java +++ b/java/google/registry/model/common/TimeOfYear.java @@ -73,7 +73,7 @@ public class TimeOfYear extends ImmutableObject { /** * Returns an {@link Iterable} of {@link DateTime}s of every recurrence of this particular * time of year within a given {@link Range} (usually one spanning many years). - * + * *

WARNING: This can return a potentially very large {@link Iterable} if {@code END_OF_TIME} * is used as the upper endpoint of the range. */ diff --git a/java/google/registry/model/common/TimedTransitionProperty.java b/java/google/registry/model/common/TimedTransitionProperty.java index 0f8243f97..9908da626 100644 --- a/java/google/registry/model/common/TimedTransitionProperty.java +++ b/java/google/registry/model/common/TimedTransitionProperty.java @@ -171,7 +171,7 @@ public class TimedTransitionPropertyNormal callers should always use {@link #forBillingEvent} instead, assuming they do not diff --git a/java/google/registry/model/domain/LrpToken.java b/java/google/registry/model/domain/LrpToken.java index 21a5a7472..ac83ac4eb 100644 --- a/java/google/registry/model/domain/LrpToken.java +++ b/java/google/registry/model/domain/LrpToken.java @@ -25,7 +25,6 @@ import com.googlecode.objectify.annotation.Index; import google.registry.model.BackupGroupRoot; import google.registry.model.Buildable; import google.registry.model.reporting.HistoryEntry; - import java.util.Map; import java.util.Set; @@ -89,7 +88,7 @@ public class LrpToken extends BackupGroupRoot implements Buildable { public Map getMetadata() { return nullToEmptyImmutableCopy(metadata); } - + @Override public Builder asBuilder() { return new Builder(clone(this)); @@ -112,7 +111,7 @@ public class LrpToken extends BackupGroupRoot implements Buildable { getInstance().token = checkArgumentNotNull(token); return this; } - + public Builder setRedemptionHistoryEntry(Key redemptionHistoryEntry) { getInstance().redemptionHistoryEntry = checkArgumentNotNull(redemptionHistoryEntry); return this; diff --git a/java/google/registry/model/domain/fee/BaseFee.java b/java/google/registry/model/domain/fee/BaseFee.java index f8aa6d610..c2771fea5 100644 --- a/java/google/registry/model/domain/fee/BaseFee.java +++ b/java/google/registry/model/domain/fee/BaseFee.java @@ -41,7 +41,7 @@ public abstract class BaseFee extends ImmutableObject { @XmlEnumValue("delayed") DELAYED } - + /** Enum for the type of the fee. */ public enum FeeType { CREATE("create"), @@ -80,7 +80,7 @@ public abstract class BaseFee extends ImmutableObject { @XmlTransient FeeType type; - + @XmlTransient Range validDateRange; @@ -104,21 +104,21 @@ public abstract class BaseFee extends ImmutableObject { * According to the fee extension specification, a fee must always be non-negative, while a credit * must always be negative. Essentially, they are the same thing, just with different sign. * However, we need them to be separate classes for proper JAXB handling. - * + * * @see "https://tools.ietf.org/html/draft-brown-epp-fees-03#section-2.4" */ public BigDecimal getCost() { return cost; } - + public FeeType getType() { return type; } - + public boolean hasValidDateRange() { return validDateRange != null; } - + public Range getValidDateRange() { checkState(hasValidDateRange()); return validDateRange; @@ -128,7 +128,7 @@ public abstract class BaseFee extends ImmutableObject { checkState(type != null); description = type.renderDescription(args); } - + public boolean hasZeroCost() { return cost.signum() == 0; } diff --git a/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java b/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java index 86aa1dcae..375ac4b65 100644 --- a/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java +++ b/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java @@ -26,7 +26,7 @@ public interface FeeCheckCommandExtensionItem extends FeeQueryCommandExtensionIt /** The domain name being checked; throws an exception if domain names are not supported. */ public String getDomainName() throws UnsupportedOperationException; - + /** Create a builder for a matching fee check response item. */ public FeeCheckResponseExtensionItem.Builder createResponseBuilder(); } diff --git a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java b/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java index 8b859aa9e..d7e095c74 100644 --- a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java +++ b/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java @@ -32,6 +32,6 @@ public interface FeeCheckResponseExtension getItems(); } diff --git a/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java b/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java index a98d1a658..a279e86ba 100644 --- a/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java +++ b/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java @@ -56,7 +56,7 @@ public class FeeExtensionCommandDescriptor extends ImmutableObject { } return CommandName.UNKNOWN; } - + public static FeeExtensionCommandDescriptor create(CommandName commandName, String phase, String subphase) { FeeExtensionCommandDescriptor commandDescriptor = new FeeExtensionCommandDescriptor(); diff --git a/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItemImpl.java b/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItemImpl.java index 0fcb271cf..dac8917fc 100644 --- a/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItemImpl.java +++ b/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItemImpl.java @@ -42,13 +42,13 @@ public abstract class FeeQueryCommandExtensionItemImpl public CommandName getCommandName() { return command.getCommand(); } - + /** The command name before being parsed into an enum, for use in error strings. */ @Override public String getUnparsedCommandName() { return command.getUnparsedCommandName(); } - + /** The phase of the command being checked. */ @Override public String getPhase() { diff --git a/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java b/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java index 0a252ef8f..bdffedfb0 100644 --- a/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java +++ b/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java @@ -58,11 +58,11 @@ public interface FeeQueryResponseExtensionItem { public Builder setNotAfterDateIfSupported(DateTime notAfterDate); public Builder setCommand(CommandName commandName, String phase, String subphase); - + public Builder setPeriod(Period period); public Builder setFees(List fees); - + public Builder setClass(String feeClass); } } diff --git a/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItemImpl.java b/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItemImpl.java index 5c2d0c4d0..f500173ae 100644 --- a/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItemImpl.java +++ b/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItemImpl.java @@ -64,7 +64,7 @@ public class FeeQueryResponseExtensionItemImpl public abstract static class Builder> extends GenericBuilder implements FeeQueryResponseExtensionItem.Builder { - + @Override public B setCommand(CommandName commandName, String phase, String subphase) { getInstance().command = FeeExtensionCommandDescriptor.create(commandName, phase, subphase); diff --git a/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImpl.java b/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImpl.java index 855877292..28113f379 100644 --- a/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImpl.java +++ b/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImpl.java @@ -38,7 +38,7 @@ public class FeeTransformResponseExtensionImpl extends ImmutableObject */ @XmlElement(name = "fee") List fees; - + @XmlElement(name = "credit") List credits; @@ -46,7 +46,7 @@ public class FeeTransformResponseExtensionImpl extends ImmutableObject public abstract static class Builder> extends GenericBuilder implements FeeTransformResponseExtension.Builder { - + @Override public B setCurrency(CurrencyUnit currency) { getInstance().currency = currency; diff --git a/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImplNoCredits.java b/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImplNoCredits.java index 99f901057..068a06cf4 100644 --- a/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImplNoCredits.java +++ b/java/google/registry/model/domain/fee/FeeTransformResponseExtensionImplNoCredits.java @@ -40,12 +40,12 @@ public class FeeTransformResponseExtensionImplNoCredits extends ImmutableObject */ @XmlElement(name = "fee") List fees; - + /** Abstract builder for {@link FeeTransformResponseExtensionImplNoCredits}. */ public abstract static class Builder> extends GenericBuilder implements FeeTransformResponseExtension.Builder { - + @Override public B setCurrency(CurrencyUnit currency) { getInstance().currency = currency; diff --git a/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java b/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java index 1377aa468..71a9c9b69 100644 --- a/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java +++ b/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java @@ -26,31 +26,31 @@ public class FeeCheckResponseExtensionItemV06 extends FeeQueryResponseExtensionItemImpl implements FeeCheckResponseExtensionItem { /** The name of the domain that was checked, with an attribute indicating if it is premium. */ String name; - + CurrencyUnit currency; /** Builder for {@link FeeCheckResponseExtensionItemV06}. */ public static class Builder extends FeeQueryResponseExtensionItemImpl.Builder implements FeeCheckResponseExtensionItem.Builder { - + @Override public Builder setDomainNameIfSupported(String name) { getInstance().name = name; return this; } - + @Override public Builder setCurrencyIfSupported(CurrencyUnit currency) { getInstance().currency = currency; return this; } - + @Override public Builder setAvailIfSupported(boolean avail) { return this; } - + @Override public Builder setReasonIfSupported(String reason) { return this; diff --git a/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java b/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java index 0378fe7f5..ccb790e9c 100644 --- a/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java +++ b/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.joda.money.CurrencyUnit; /** - * An XML data object that represents version 0.6 of the fee extension that may be present on the + * An XML data object that represents version 0.6 of the fee extension that may be present on the * response to EPP domain check commands. */ @XmlRootElement(name = "chkData") @@ -33,7 +33,7 @@ public class FeeCheckResponseExtensionV06 /** Check responses. */ @XmlElement(name = "cd") ImmutableList items; - + @Override public void setCurrencyIfSupported(CurrencyUnit currency) { } diff --git a/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java b/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java index ef8f875f6..4d78e0cd9 100644 --- a/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java +++ b/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees"}) public class FeeCreateCommandExtensionV06 extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeCreateResponseExtensionV06.Builder(); diff --git a/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java b/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java index 93778a8e6..d018f4060 100644 --- a/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java +++ b/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java @@ -35,7 +35,7 @@ public class FeeInfoCommandExtensionV06 public CurrencyUnit getCurrency() { return currency; } - + @Override public Optional getEffectiveDate() { return Optional.absent(); diff --git a/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java b/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java index c51fe8e4c..717d8f148 100644 --- a/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java +++ b/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java @@ -30,18 +30,18 @@ import org.joda.time.DateTime; @XmlType(propOrder = {"currency", "command", "period", "fee", "feeClass"}) public class FeeInfoResponseExtensionV06 extends FeeQueryResponseExtensionItemImpl implements ResponseExtension { - + CurrencyUnit currency; - + /** Builder for {@link FeeInfoResponseExtensionV06}. */ public static class Builder extends FeeQueryResponseExtensionItemImpl.Builder { - + @Override public Builder setAvailIfSupported(boolean avail) { return this; } - + @Override public Builder setReasonIfSupported(String reason) { return this; diff --git a/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java b/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java index 33ea0066c..caeabd5f8 100644 --- a/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java +++ b/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees"}) public class FeeRenewCommandExtensionV06 extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeRenewResponseExtensionV06.Builder(); diff --git a/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java b/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java index 4d9cb3cd3..3f12e967c 100644 --- a/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java +++ b/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees"}) public class FeeTransferCommandExtensionV06 extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeTransferResponseExtensionV06.Builder(); diff --git a/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java b/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java index e637e39d3..cf3e67e5b 100644 --- a/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java +++ b/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees"}) public class FeeUpdateCommandExtensionV06 extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeUpdateResponseExtensionV06.Builder(); diff --git a/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java b/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java index e5a5803aa..6033e7195 100644 --- a/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java +++ b/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java @@ -66,7 +66,7 @@ public class FeeCheckCommandExtensionV11 extends ImmutableObject // This version of the fee extension does not have any items, and although the currency is // specified at the top level we've modeled it as a single fake item with the currency inside, // so there's no top level currency to return here. - return null; + return null; } @Override @@ -138,7 +138,7 @@ public class FeeCheckCommandExtensionV11 extends ImmutableObject public Builder createResponseBuilder() { return new FeeCheckResponseExtensionItemV11.Builder(); } - + @Override public Optional getEffectiveDate() { return Optional.absent(); diff --git a/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java b/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java index edd3759b3..4aadd0224 100644 --- a/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java +++ b/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java @@ -33,35 +33,35 @@ public class FeeCheckResponseExtensionItemV11 /** The domain that was checked. */ DomainObjectSpec object; - + CurrencyUnit currency; /** The reason that the check item cannot be calculated. */ String reason; - + /** Builder for {@link FeeCheckResponseExtensionItemV11}. */ public static class Builder extends FeeQueryResponseExtensionItemImpl.Builder implements FeeCheckResponseExtensionItem.Builder { - + @Override public Builder setDomainNameIfSupported(String name) { getInstance().object = new DomainObjectSpec(name); return this; } - + @Override public Builder setCurrencyIfSupported(CurrencyUnit currency) { getInstance().currency = currency; return this; } - + @Override public Builder setAvailIfSupported(boolean avail) { getInstance().avail = avail; return this; } - + @Override public Builder setReasonIfSupported(String reason) { getInstance().reason = reason; diff --git a/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java b/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java index d2d4b260b..9d63fb8f5 100644 --- a/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java +++ b/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.joda.money.CurrencyUnit; /** - * An XML data object that represents version 0.11 of the fee extension that may be present on the + * An XML data object that represents version 0.11 of the fee extension that may be present on the * response to EPP domain check commands. */ @XmlRootElement(name = "chkData") @@ -33,7 +33,7 @@ public class FeeCheckResponseExtensionV11 /** Check responses. */ @XmlElement(name = "cd") ImmutableList items; - + @Override public void setCurrencyIfSupported(CurrencyUnit currency) {} diff --git a/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java b/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java index 6930f52da..c79f7563b 100644 --- a/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java +++ b/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeCreateCommandExtensionV11 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeCreateResponseExtensionV11.Builder(); diff --git a/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java b/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java index c3fba922a..b5747f282 100644 --- a/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java +++ b/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeRenewCommandExtensionV11 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeRenewResponseExtensionV11.Builder(); diff --git a/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java b/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java index 222e1fc34..5b4a5b03c 100644 --- a/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java +++ b/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeTransferCommandExtensionV11 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeTransferResponseExtensionV11.Builder(); diff --git a/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java b/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java index 3b64b2c2b..769450a74 100644 --- a/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java +++ b/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeUpdateCommandExtensionV11 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeUpdateResponseExtensionV11.Builder(); diff --git a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java b/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java index 593363eab..e98a44d09 100644 --- a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java +++ b/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java @@ -62,7 +62,7 @@ public class FeeCheckResponseExtensionItemCommandV12 extends ImmutableObject { */ @XmlElement(name = "class") String feeClass; - + /** The effective date that the check is to be performed on (if specified in the query). */ @XmlElement(name = "date") DateTime effectiveDate; diff --git a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java b/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java index 2a5599e3e..ce46f16c6 100644 --- a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java +++ b/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java @@ -51,9 +51,9 @@ public class FeeCheckResponseExtensionItemV12 public static class Builder extends GenericBuilder implements FeeCheckResponseExtensionItem.Builder { - + final FeeCheckResponseExtensionItemCommandV12.Builder commandBuilder; - + Builder() { super(); commandBuilder = new FeeCheckResponseExtensionItemCommandV12.Builder(); @@ -96,12 +96,12 @@ public class FeeCheckResponseExtensionItemV12 public Builder setCurrencyIfSupported(CurrencyUnit currency) { return this; } - + @Override public Builder setAvailIfSupported(boolean avail) { return this; } - + @Override public Builder setReasonIfSupported(String reason) { return this; diff --git a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java b/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java index 9c02ed0b5..c377322d8 100644 --- a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java +++ b/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; /** - * An XML data object that represents version 0.12 of the fee extension that may be present on the + * An XML data object that represents version 0.12 of the fee extension that may be present on the * response to EPP domain check commands. */ @XmlRootElement(name = "chkData") @@ -33,7 +33,7 @@ public class FeeCheckResponseExtensionV12 extends ImmutableObject implements FeeCheckResponseExtension { CurrencyUnit currency; - + /** Check responses. */ @XmlElement(name = "cd") ImmutableList items; diff --git a/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java b/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java index 9c17ae7d8..03be3a1ab 100644 --- a/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java +++ b/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeCreateCommandExtensionV12 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeCreateResponseExtensionV12.Builder(); diff --git a/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java b/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java index b4402aca3..d75eeea4e 100644 --- a/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java +++ b/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeRenewCommandExtensionV12 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeRenewResponseExtensionV12.Builder(); diff --git a/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java b/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java index d7594fa9c..11d73dce1 100644 --- a/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java +++ b/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeTransferCommandExtensionV12 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeTransferResponseExtensionV12.Builder(); diff --git a/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java b/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java index ffc1ce719..6114d88e5 100644 --- a/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java +++ b/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(propOrder = {"currency", "fees", "credits"}) public class FeeUpdateCommandExtensionV12 extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension { - + @Override public FeeTransformResponseExtension.Builder createResponseBuilder() { return new FeeUpdateResponseExtensionV12.Builder(); diff --git a/java/google/registry/model/domain/flags/FlagsCreateCommandExtension.java b/java/google/registry/model/domain/flags/FlagsCreateCommandExtension.java index e73a618c2..91d18313b 100644 --- a/java/google/registry/model/domain/flags/FlagsCreateCommandExtension.java +++ b/java/google/registry/model/domain/flags/FlagsCreateCommandExtension.java @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class FlagsCreateCommandExtension implements CommandExtension { @XmlElement(name = "flag") List flags; - + public List getFlags() { return flags; } diff --git a/java/google/registry/model/domain/launch/LaunchPhase.java b/java/google/registry/model/domain/launch/LaunchPhase.java index 0efb4d381..abc94fe6d 100644 --- a/java/google/registry/model/domain/launch/LaunchPhase.java +++ b/java/google/registry/model/domain/launch/LaunchPhase.java @@ -36,7 +36,7 @@ import javax.xml.bind.annotation.XmlValue; */ @Embed public class LaunchPhase extends ImmutableObject { - + /** * The phase during which trademark holders can submit registrations or applications with * trademark information that can be validated by the server. @@ -65,8 +65,8 @@ public class LaunchPhase extends ImmutableObject { public static final LaunchPhase CUSTOM = create("custom", null); private static final Map LAUNCH_PHASES = initEnumMapping(); - - /** + + /** * Returns a map of the static final fields to their values, case-converted. */ private static final ImmutableMap initEnumMapping() { @@ -84,7 +84,7 @@ public class LaunchPhase extends ImmutableObject { instance.subphase = subphase; return instance; } - + @XmlValue String phase; @@ -94,15 +94,15 @@ public class LaunchPhase extends ImmutableObject { */ @XmlAttribute(name = "name") String subphase; - + public String getPhase() { return phase; } - + public String getSubphase() { return subphase; } - + public static LaunchPhase fromValue(String value) { return LAUNCH_PHASES.get(value); } diff --git a/java/google/registry/model/eppinput/EppInput.java b/java/google/registry/model/eppinput/EppInput.java index 16a660aab..fda76a3fa 100644 --- a/java/google/registry/model/eppinput/EppInput.java +++ b/java/google/registry/model/eppinput/EppInput.java @@ -131,7 +131,7 @@ public class EppInput extends ImmutableObject { } return null; } - + @SafeVarargs @Nullable public final diff --git a/java/google/registry/model/eppoutput/EppResponse.java b/java/google/registry/model/eppoutput/EppResponse.java index b15e3aabc..58014d80e 100644 --- a/java/google/registry/model/eppoutput/EppResponse.java +++ b/java/google/registry/model/eppoutput/EppResponse.java @@ -181,7 +181,7 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting { public ImmutableList getExtensions() { return extensions; } - + @Nullable public ResponseExtension getFirstExtensionOfType(Class clazz) { return FluentIterable.from(extensions).filter(clazz).first().orNull(); @@ -205,7 +205,7 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting { getFirstExtensionOfType(Class... classes) { return getFirstExtensionOfType(ImmutableList.copyOf(classes)); } - + public Result getResult() { return result; } diff --git a/java/google/registry/tools/CreateLrpTokensCommand.java b/java/google/registry/tools/CreateLrpTokensCommand.java index 206167bc0..ec14c5870 100644 --- a/java/google/registry/tools/CreateLrpTokensCommand.java +++ b/java/google/registry/tools/CreateLrpTokensCommand.java @@ -121,7 +121,7 @@ public final class CreateLrpTokensCommand implements RemoteApiCommand { /** * This function generates at MOST {@code count} tokens, after filtering out any token strings * that already exist. - * + * *

Note that in the incredibly rare case that all generated tokens already exist, this function * may return an empty set. */ diff --git a/java/google/registry/tools/params/EnumParameter.java b/java/google/registry/tools/params/EnumParameter.java index 3627f6128..fa07e9a6f 100644 --- a/java/google/registry/tools/params/EnumParameter.java +++ b/java/google/registry/tools/params/EnumParameter.java @@ -16,8 +16,8 @@ package google.registry.tools.params; import google.registry.util.TypeUtils.TypeInstantiator; -/** Base class for Enum-based parameters. - * +/** Base class for Enum-based parameters. + * *

This is not necessary for single-value Enum parameters (i.e. arity = 1) as JCommander natively * supports them, but is necessary for variable-arity ({@code List<Enum>}) parameters. */ diff --git a/java/google/registry/util/PipelineUtils.java b/java/google/registry/util/PipelineUtils.java index a095a08e1..2240b7ad5 100644 --- a/java/google/registry/util/PipelineUtils.java +++ b/java/google/registry/util/PipelineUtils.java @@ -20,7 +20,7 @@ public class PipelineUtils { private static final String URL_PREFIX = "/_ah/pipeline/status.html?root="; private PipelineUtils() {} - + public static String createJobPath(String jobId) { return URL_PREFIX + jobId; } diff --git a/java/google/registry/util/TeeOutputStream.java b/java/google/registry/util/TeeOutputStream.java index 208b08cbe..7f3cd2dbd 100644 --- a/java/google/registry/util/TeeOutputStream.java +++ b/java/google/registry/util/TeeOutputStream.java @@ -29,7 +29,7 @@ public final class TeeOutputStream extends OutputStream { private final ImmutableList outputs; private boolean isClosed; - + public TeeOutputStream(@WillNotClose Iterable outputs) { this.outputs = ImmutableList.copyOf(outputs); checkArgument(!this.outputs.isEmpty(), "must provide at least one output stream"); diff --git a/javatests/google/registry/flows/EppLoginUserTest.java b/javatests/google/registry/flows/EppLoginUserTest.java index affa90d16..f5867c246 100644 --- a/javatests/google/registry/flows/EppLoginUserTest.java +++ b/javatests/google/registry/flows/EppLoginUserTest.java @@ -70,7 +70,7 @@ public class EppLoginUserTest extends EppTestCase { assertCommandAndResponse("logout.xml", "logout_response.xml"); assertCommandAndResponse("login2_valid.xml", "login_response_unauthorized_role.xml"); } - + @Test public void testLoginLogout_wrongPasswordStillWorks() throws Exception { // For user-based logins the password in the epp xml is ignored. diff --git a/javatests/google/registry/rde/RdeStagingActionTest.java b/javatests/google/registry/rde/RdeStagingActionTest.java index e3274c062..3f0b5fffb 100644 --- a/javatests/google/registry/rde/RdeStagingActionTest.java +++ b/javatests/google/registry/rde/RdeStagingActionTest.java @@ -368,7 +368,7 @@ public class RdeStagingActionTest extends MapreduceTestCase { .containsExactly("New Registrar", "The Registrar"); assertThat(mapifyCounts(header)).containsEntry(RdeResourceType.REGISTRAR.getUri(), 2L); } - + assertThat( ofy().load().key(Cursor.createKey(RDE_STAGING, Registry.get("fop"))).now() .getCursorTime()) diff --git a/javatests/google/registry/testing/DeterministicStringGenerator.java b/javatests/google/registry/testing/DeterministicStringGenerator.java index 04a1e0860..84427d693 100644 --- a/javatests/google/registry/testing/DeterministicStringGenerator.java +++ b/javatests/google/registry/testing/DeterministicStringGenerator.java @@ -27,7 +27,7 @@ import javax.inject.Named; * A string generator that produces strings using sequential characters in its alphabet. This is * most useful in tests as a "fake" password generator (which would otherwise use * {@link RandomStringGenerator}. - * + * *

Note that consecutive calls to createString will continue where the last call left off in * the alphabet. */ diff --git a/javatests/google/registry/tools/CreateLrpTokensCommandTest.java b/javatests/google/registry/tools/CreateLrpTokensCommandTest.java index dd02fb9a6..2c865e025 100644 --- a/javatests/google/registry/tools/CreateLrpTokensCommandTest.java +++ b/javatests/google/registry/tools/CreateLrpTokensCommandTest.java @@ -142,7 +142,7 @@ public class CreateLrpTokensCommandTest extends CommandTestCase