Convert entire project to strict lexicographical import sort ordering

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=127234970

java/google/registry/model/Buildable.java

@@ -19,10 +19,8 @@ import static com.google.common.base.Preconditions.checkState;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.google.common.base.Optional;
-
 import google.registry.model.ofy.ObjectifyService;
 import google.registry.util.TypeUtils.TypeInstantiator;
-
 import java.lang.reflect.Field;
 
 /** Interface for {@link ImmutableObject} subclasses that have a builder. */

java/google/registry/model/CreateAutoTimestamp.java

@@ -15,7 +15,6 @@
 package google.registry.model;
 
 import google.registry.model.translators.CreateAutoTimestampTranslatorFactory;
-
 import org.joda.time.DateTime;
 
 /**

java/google/registry/model/EntityClasses.java

@@ -16,9 +16,7 @@ package google.registry.model;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
-
 import com.googlecode.objectify.Key;
-
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.RegistrarBillingEntry;
 import google.registry.model.billing.RegistrarCredit;

java/google/registry/model/EppResource.java

@@ -25,22 +25,17 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
-
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppoutput.EppResponse.ResponseData;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.transfer.TransferData;
-
-import org.joda.time.DateTime;
-
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
+import org.joda.time.DateTime;
 
 /** An Epp entity object such as a contact or a host. */
 @XmlTransient

java/google/registry/model/EppResourceUtils.java

@@ -24,12 +24,10 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 import static google.registry.util.DateTimeUtils.latestOf;
 
 import com.google.common.base.Function;
-
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.Result;
 import com.googlecode.objectify.util.ResultNow;
-
 import google.registry.config.RegistryEnvironment;
 import google.registry.model.EppResource.Builder;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
@@ -43,15 +41,12 @@ import google.registry.model.ofy.CommitLogMutation;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.util.FormattingLogger;
-
-import org.joda.time.DateTime;
-import org.joda.time.Interval;
-
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import javax.annotation.Nullable;
+import org.joda.time.DateTime;
+import org.joda.time.Interval;
 
 /** Utilities for working with {@link EppResource}. */
 public final class EppResourceUtils {

java/google/registry/model/ImmutableObject.java

@@ -22,17 +22,13 @@ import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Maps;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Ignore;
-
 import google.registry.model.domain.ReferenceUnion;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-
 import javax.annotation.concurrent.Immutable;
 import javax.xml.bind.annotation.XmlTransient;
 

java/google/registry/model/JsonMapBuilder.java

@@ -17,11 +17,9 @@ package google.registry.model;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.collect.FluentIterable;
-
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.annotation.Nullable;
 
 /**

java/google/registry/model/ModelUtils.java

@@ -38,13 +38,11 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
-
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Ignore;
 import com.googlecode.objectify.annotation.Parent;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

java/google/registry/model/RoidSuffixes.java

@@ -21,9 +21,7 @@ import static google.registry.util.CacheUtils.memoizeWithShortExpiration;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.HashBiMap;
-
 import com.googlecode.objectify.Work;
-
 import google.registry.model.registry.Registry;
 
 /** Utility class for dealing with EPP ROID suffixes. */

java/google/registry/model/SchemaVersion.java

@@ -21,7 +21,6 @@ import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
-
 import java.util.ArrayDeque;
 import java.util.Queue;
 import java.util.SortedSet;

java/google/registry/model/UpdateAutoTimestamp.java

@@ -17,9 +17,7 @@ package google.registry.model;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 
 import com.google.common.base.Optional;
-
 import google.registry.model.translators.UpdateAutoTimestampTranslatorFactory;
-
 import org.joda.time.DateTime;
 
 /**

java/google/registry/model/annotations/NotBackedUp.java

@@ -15,7 +15,6 @@
 package google.registry.model.annotations;
 
 import com.googlecode.objectify.annotation.Entity;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

java/google/registry/model/annotations/VirtualEntity.java

@@ -15,7 +15,6 @@
 package google.registry.model.annotations;
 
 import com.googlecode.objectify.annotation.Entity;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

java/google/registry/model/billing/BillingEvent.java

@@ -26,7 +26,6 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
@@ -36,7 +35,6 @@ import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.annotation.OnLoad;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.condition.IfNull;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.common.TimeOfYear;
@@ -44,12 +42,10 @@ import google.registry.model.domain.GracePeriod;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
-
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-
 import java.util.Objects;
 import java.util.Set;
+import org.joda.money.Money;
+import org.joda.time.DateTime;
 
 /** A billable event in a domain's lifecycle. */
 public abstract class BillingEvent extends ImmutableObject

java/google/registry/model/billing/RegistrarBillingEntry.java

@@ -25,21 +25,17 @@ import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.annotation.Parent;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.JsonMapBuilder;
 import google.registry.model.Jsonifiable;
 import google.registry.model.registrar.Registrar;
-
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
 /**
  * Log of monthly invoices and payments for a Registrar customer.
  *

java/google/registry/model/billing/RegistrarBillingUtils.java

@@ -24,19 +24,15 @@ import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps.EntryTransformer;
 import com.google.common.collect.Ordering;
-
 import com.googlecode.objectify.cmd.Query;
-
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registry.Registries;
 import google.registry.model.registry.Registry;
 import google.registry.util.CacheUtils;
-
+import java.util.Map;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 
-import java.util.Map;
-
 /** Utilities for managing the billing of {@link Registrar} customers. */
 public final class RegistrarBillingUtils {
 

java/google/registry/model/billing/RegistrarCredit.java

@@ -25,17 +25,14 @@ import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Parent;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registry.Registry;
-
 import org.joda.money.CurrencyUnit;
 import org.joda.time.DateTime;
 

java/google/registry/model/billing/RegistrarCreditBalance.java

@@ -26,22 +26,18 @@ import com.google.common.collect.ForwardingNavigableMap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
-
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.impl.ref.DeadRef;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
-
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.joda.money.Money;
+import org.joda.time.DateTime;
 
 /**
  * The balance of a {@link RegistrarCredit} at a given point in time.

java/google/registry/model/common/CrossTldSingleton.java

@@ -19,7 +19,6 @@ import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Parent;
-
 import google.registry.model.ImmutableObject;
 
 /** A singleton entity in the datastore. */

java/google/registry/model/common/Cursor.java

@@ -24,10 +24,8 @@ import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Parent;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.registry.Registry;
-
 import org.joda.time.DateTime;
 
 /**

java/google/registry/model/common/EntityGroupRoot.java

@@ -17,7 +17,6 @@ package google.registry.model.common;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
-
 import google.registry.model.BackupGroupRoot;
 
 /**

java/google/registry/model/common/GaeUserIdConverter.java

@@ -19,12 +19,10 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.google.appengine.api.users.User;
 import com.google.common.base.Splitter;
-
 import com.googlecode.objectify.VoidWork;
 import com.googlecode.objectify.Work;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;

java/google/registry/model/common/PersistedRangeLong.java

@@ -16,9 +16,7 @@ package google.registry.model.common;
 
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Range;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
 
 /** An object that's equivalent to a {@code Range<Long>} that can be persisted to datastore. */

java/google/registry/model/common/TimeOfYear.java

@@ -26,15 +26,11 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.ContiguousSet;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Range;
-
 import com.googlecode.objectify.annotation.Embed;
 import com.googlecode.objectify.annotation.Index;
-
 import google.registry.model.ImmutableObject;
-
-import org.joda.time.DateTime;
-
 import java.util.List;
+import org.joda.time.DateTime;
 
 /**
  * A time of year (month, day, millis of day) that can be stored in a sort-friendly format.

java/google/registry/model/common/TimedTransitionProperty.java

@@ -24,18 +24,13 @@ import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
-
 import com.googlecode.objectify.mapper.Mapper;
-
 import google.registry.model.ImmutableObject;
 import google.registry.util.TypeUtils;
-
-import org.joda.time.DateTime;
-
 import java.util.NavigableMap;
 import java.util.TreeMap;
-
 import javax.annotation.Nullable;
+import org.joda.time.DateTime;
 
 /**
  * An entity property whose value transitions over time.  Each value it takes on becomes active

java/google/registry/model/contact/ContactAddress.java

@@ -15,7 +15,6 @@
 package google.registry.model.contact;
 
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.eppcommon.Address;
 
 /**

java/google/registry/model/contact/ContactAuthInfo.java

@@ -17,10 +17,8 @@ package google.registry.model.contact;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.EppResource;
 import google.registry.model.eppcommon.AuthInfo;
-
 import javax.xml.bind.annotation.XmlType;
 
 /** A version of authInfo specifically for contacts. */

java/google/registry/model/contact/ContactCommand.java

@@ -19,7 +19,6 @@ import static google.registry.util.CollectionUtils.nullToEmpty;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.contact.ContactResource.Builder;
 import google.registry.model.contact.PostalInfo.Type;
@@ -28,10 +27,8 @@ import google.registry.model.eppinput.ResourceCommand.ResourceCheck;
 import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange;
 import google.registry.model.eppinput.ResourceCommand.ResourceUpdate;
 import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
-
 import java.util.List;
 import java.util.Map;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;

java/google/registry/model/contact/ContactPhoneNumber.java

@@ -15,7 +15,6 @@
 package google.registry.model.contact;
 
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.eppcommon.PhoneNumber;
 
 /**

java/google/registry/model/contact/ContactResource.java

@@ -21,28 +21,23 @@ import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION;
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Lists;
-
 import com.googlecode.objectify.annotation.Cache;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.condition.IfNull;
-
 import google.registry.model.EppResource;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.contact.PostalInfo.Type;
 import google.registry.model.eppcommon.AuthInfo;
-
-import org.joda.time.DateTime;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.joda.time.DateTime;
 
 /** A persistable Contact resource including mutable and non-mutable fields. */
 @XmlRootElement(name = "infData")

java/google/registry/model/contact/Disclose.java

@@ -18,15 +18,11 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppcommon.PresenceMarker;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/contact/PostalInfo.java

@@ -17,13 +17,10 @@ package google.registry.model.contact;
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.common.base.Optional;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.Buildable;
 import google.registry.model.Buildable.Overlayable;
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlEnumValue;

java/google/registry/model/contact/package-info.java

@@ -21,7 +21,6 @@
 package google.registry.model.contact;
 
 import google.registry.xml.UtcDateTimeAdapter;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;

java/google/registry/model/domain/DesignatedContact.java

@@ -15,14 +15,11 @@
 package google.registry.model.domain;
 
 import com.google.common.annotations.VisibleForTesting;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Embed;
 import com.googlecode.objectify.annotation.Index;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.contact.ContactResource;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlValue;

java/google/registry/model/domain/DomainApplication.java

@@ -18,24 +18,19 @@ import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.collect.ImmutableList;
-
 import com.googlecode.objectify.annotation.Cache;
 import com.googlecode.objectify.annotation.EntitySubclass;
-
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.domain.launch.ApplicationStatus;
 import google.registry.model.domain.launch.LaunchPhase;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.smd.EncodedSignedMark;
-
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
+import org.joda.money.Money;
+import org.joda.time.DateTime;
 
 /** An application to create a domain. */
 @XmlRootElement(name = "infData")

java/google/registry/model/domain/DomainAuthInfo.java

@@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.EppResource;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.eppcommon.AuthInfo;

java/google/registry/model/domain/DomainBase.java

@@ -35,13 +35,11 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.condition.IfNull;
-
 import google.registry.model.EppResource;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DesignatedContact.Type;
@@ -49,9 +47,7 @@ import google.registry.model.domain.launch.LaunchNotice;
 import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.eppcommon.AuthInfo;
 import google.registry.model.host.HostResource;
-
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlTransient;

java/google/registry/model/domain/DomainCommand.java

@@ -30,10 +30,8 @@ import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.Work;
-
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.contact.ContactResource;
@@ -45,13 +43,8 @@ import google.registry.model.eppinput.ResourceCommand.ResourceUpdate;
 import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
 import google.registry.model.host.HostResource;
 import google.registry.model.index.ForeignKeyIndex;
-
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-
 import java.util.Map;
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
@@ -60,6 +53,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 /** A collection of {@link DomainResource} commands. */
 public class DomainCommand {

java/google/registry/model/domain/DomainRenewData.java

@@ -15,12 +15,10 @@
 package google.registry.model.domain;
 
 import google.registry.model.eppoutput.EppResponse.ResponseData;
-
-import org.joda.time.DateTime;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import org.joda.time.DateTime;
 
 /** The {@link ResponseData} returned when renewing a domain. */
 @XmlRootElement(name = "renData")

java/google/registry/model/domain/DomainResource.java

@@ -27,14 +27,12 @@ import static google.registry.util.DateTimeUtils.leapSafeAddYears;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
-
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Cache;
 import com.googlecode.objectify.annotation.EntitySubclass;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.condition.IfNull;
-
 import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.billing.BillingEvent;
@@ -44,17 +42,14 @@ import google.registry.model.poll.PollMessage;
 import google.registry.model.registry.Registry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
-
-import org.joda.time.DateTime;
-import org.joda.time.Interval;
-
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
+import org.joda.time.DateTime;
+import org.joda.time.Interval;
 
 /** A persistable domain resource including mutable and non-mutable fields. */
 @XmlRootElement(name = "infData")

java/google/registry/model/domain/ForeignKeyedDesignatedContact.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain;
 
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlValue;
 

java/google/registry/model/domain/GracePeriod.java

@@ -19,14 +19,11 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.domain.rgp.GracePeriodStatus;
-
-import org.joda.time.DateTime;
-
 import javax.annotation.Nullable;
+import org.joda.time.DateTime;
 
 /**
  * A domain grace period with an expiration time.

java/google/registry/model/domain/Period.java

@@ -16,9 +16,7 @@ package google.registry.model.domain;
 
 
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlValue;

java/google/registry/model/domain/ReferenceUnion.java

@@ -17,7 +17,6 @@ package google.registry.model.domain;
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Embed;
 import com.googlecode.objectify.annotation.Index;
-
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 

java/google/registry/model/domain/allocate/AllocateCreateExtension.java

@@ -17,10 +17,8 @@ package google.registry.model.domain.allocate;
 import google.registry.model.ImmutableObject;
 import google.registry.model.domain.launch.LaunchNotice;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
-import org.joda.time.DateTime;
-
 import javax.xml.bind.annotation.XmlRootElement;
+import org.joda.time.DateTime;
 
 /**
  * An XML data object that represents an allocate extension that will be present on EPP commands to

java/google/registry/model/domain/allocate/package-info.java

@@ -21,7 +21,6 @@
 package google.registry.model.domain.allocate;
 
 import google.registry.xml.UtcDateTimeAdapter;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;

java/google/registry/model/domain/fee/BaseFee.java

@@ -18,16 +18,13 @@ import static com.google.common.base.MoreObjects.firstNonNull;
 
 import google.registry.model.ImmutableObject;
 import google.registry.xml.PeriodAdapter;
-
-import org.joda.time.Period;
-
 import java.math.BigDecimal;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.joda.time.Period;
 
 /** Base class for the fee and credit types. */
 @XmlTransient

java/google/registry/model/domain/fee/BaseFeeCommand.java

@@ -15,13 +15,10 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.ImmutableObject;
-
-import org.joda.money.CurrencyUnit;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
+import org.joda.money.CurrencyUnit;
 
 /** Base class for general transform commands with fees (create, renew, update, transfer). */
 @XmlTransient

java/google/registry/model/domain/fee/BaseFeeCommandResponse.java

@@ -15,15 +15,11 @@
 package google.registry.model.domain.fee;
 
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.Buildable.GenericBuilder;
 import google.registry.model.ImmutableObject;
-
-import org.joda.money.CurrencyUnit;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlTransient;
+import org.joda.money.CurrencyUnit;
 
 /** Base class for fee responses on general transform commands (create, update, renew, transfer). */
 @XmlTransient

java/google/registry/model/domain/fee/BaseFeeRequest.java

@@ -15,13 +15,10 @@
 package google.registry.model.domain.fee;
 
 import com.google.common.base.Optional;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.domain.Period;
-
-import org.joda.money.CurrencyUnit;
-
 import javax.xml.bind.annotation.XmlTransient;
+import org.joda.money.CurrencyUnit;
 
 /** Base class for the fee requests on check and info. */
 @XmlTransient

java/google/registry/model/domain/fee/BaseFeeResponse.java

@@ -17,17 +17,13 @@ package google.registry.model.domain.fee;
 import static google.registry.util.CollectionUtils.forceEmptyToNull;
 
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.Buildable.GenericBuilder;
 import google.registry.model.ImmutableObject;
 import google.registry.model.domain.Period;
-
-import org.joda.money.CurrencyUnit;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
+import org.joda.money.CurrencyUnit;
 
 /** Base class for the fee responses on check and info. */
 @XmlTransient

java/google/registry/model/domain/fee/EapFee.java

@@ -17,7 +17,6 @@ package google.registry.model.domain.fee;
 import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
 import com.google.common.collect.Range;
-
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 

java/google/registry/model/domain/fee/FeeCheckExtension.java

@@ -17,13 +17,10 @@ package google.registry.model.domain.fee;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.collect.ImmutableSet;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.domain.Period;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/fee/FeeCheckResponseExtension.java

@@ -16,10 +16,8 @@ package google.registry.model.domain.fee;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/fee/FeeCommandDescriptor.java

@@ -15,9 +15,7 @@
 package google.registry.model.domain.fee;
 
 import com.google.common.base.CharMatcher;
-
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlValue;
 

java/google/registry/model/domain/fee/FeeCreateExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeCreateResponseExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java

@@ -15,17 +15,13 @@
 package google.registry.model.domain.fee;
 
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.Buildable.GenericBuilder;
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
-import org.joda.money.CurrencyUnit;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import org.joda.money.CurrencyUnit;
 
 /**
  * An XML data object that represents a fee extension that may be present on the response to EPP

java/google/registry/model/domain/fee/FeeInfoExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeInfoResponseExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeRenewExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeRenewResponseExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeTransferExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeTransferResponseExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeUpdateExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/fee/package-info.java

@@ -21,7 +21,6 @@
 package google.registry.model.domain.fee;
 
 import google.registry.model.translators.CurrencyUnitAdapter;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;

java/google/registry/model/domain/launch/ApplicationStatus.java

@@ -19,7 +19,6 @@ import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
 
 import google.registry.model.translators.EnumToAttributeAdapter;
 import google.registry.model.translators.EnumToAttributeAdapter.EppEnum;
-
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**

java/google/registry/model/domain/launch/LaunchCheckExtension.java

@@ -18,7 +18,6 @@ import static com.google.common.base.MoreObjects.firstNonNull;
 
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlRootElement;

java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java

@@ -16,10 +16,8 @@ package google.registry.model.domain.launch;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

java/google/registry/model/domain/launch/LaunchCreateExtension.java

@@ -17,14 +17,11 @@ package google.registry.model.domain.launch;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.eppinput.EppInput.CommandExtension;
 import google.registry.model.smd.AbstractSignedMark;
 import google.registry.model.smd.EncodedSignedMark;
 import google.registry.model.smd.SignedMark;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlElementRefs;

java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java

@@ -15,7 +15,6 @@
 package google.registry.model.domain.launch;
 
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/launch/LaunchExtension.java

@@ -16,7 +16,6 @@ package google.registry.model.domain.launch;
 
 import google.registry.model.Buildable.GenericBuilder;
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 

java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java

@@ -15,14 +15,10 @@
 package google.registry.model.domain.launch;
 
 import com.google.common.collect.ImmutableList;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.mark.Mark;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/launch/LaunchNotice.java

@@ -23,19 +23,15 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Optional;
 import com.google.common.primitives.Ints;
-
 import com.googlecode.objectify.annotation.Embed;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.condition.IfNull;
-
 import google.registry.model.ImmutableObject;
-
-import org.joda.time.DateTime;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
+import org.joda.time.DateTime;
 
 /** The claims notice id from the claims phase. */
 @Embed

java/google/registry/model/domain/launch/LaunchPhase.java

@@ -20,15 +20,11 @@ import static google.registry.util.TypeUtils.getTypesafeEnumMapping;
 import static java.util.Objects.hash;
 
 import com.google.common.collect.ImmutableMap;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
-
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlValue;
 

java/google/registry/model/domain/launch/package-info.java

@@ -21,7 +21,6 @@
 package google.registry.model.domain.launch;
 
 import google.registry.xml.UtcDateTimeAdapter;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;

java/google/registry/model/domain/metadata/MetadataExtension.java

@@ -16,7 +16,6 @@ package google.registry.model.domain.metadata;
 
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 

java/google/registry/model/domain/package-info.java

@@ -24,7 +24,6 @@ package google.registry.model.domain;
 
 import google.registry.xml.DateAdapter;
 import google.registry.xml.UtcDateTimeAdapter;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;

java/google/registry/model/domain/rgp/GracePeriodStatus.java

@@ -16,7 +16,6 @@ package google.registry.model.domain.rgp;
 
 import google.registry.model.translators.EnumToAttributeAdapter;
 import google.registry.model.translators.EnumToAttributeAdapter.EppEnum;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 

java/google/registry/model/domain/rgp/RgpInfoExtension.java

@@ -15,10 +15,8 @@
 package google.registry.model.domain.rgp;
 
 import com.google.common.collect.ImmutableSet;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 
 /** The EPP registry grace period extension to be returned with domain info commands. */

java/google/registry/model/domain/rgp/RgpUpdateExtension.java

@@ -16,7 +16,6 @@ package google.registry.model.domain.rgp;
 
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 
 /** The EPP RGP extension that may be present on domain update commands. */

java/google/registry/model/domain/secdns/DelegationSignerData.java

@@ -15,11 +15,8 @@
 package google.registry.model.domain.secdns;
 
 import com.google.common.annotations.VisibleForTesting;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;

java/google/registry/model/domain/secdns/SecDnsCreateExtension.java

@@ -17,12 +17,9 @@ package google.registry.model.domain.secdns;
 import static google.registry.util.CollectionUtils.nullSafeImmutableCopy;
 
 import com.google.common.collect.ImmutableSet;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/domain/secdns/SecDnsInfoExtension.java

@@ -15,12 +15,9 @@
 package google.registry.model.domain.secdns;
 
 import com.google.common.collect.ImmutableSet;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
 import javax.xml.bind.annotation.XmlRootElement;
 
 /** The EPP secDNS extension to be returned with domain info commands. */

java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java

@@ -17,12 +17,9 @@ package google.registry.model.domain.secdns;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.collect.ImmutableSet;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

java/google/registry/model/eppcommon/Address.java

@@ -19,15 +19,12 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.JsonMapBuilder;
 import google.registry.model.Jsonifiable;
-
 import java.util.List;
 import java.util.Map;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;

java/google/registry/model/eppcommon/AuthInfo.java

@@ -15,10 +15,8 @@
 package google.registry.model.eppcommon;
 
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/eppcommon/PhoneNumber.java

@@ -17,10 +17,8 @@ package google.registry.model.eppcommon;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.VisibleForTesting;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlValue;

java/google/registry/model/eppcommon/PresenceMarker.java

@@ -15,11 +15,8 @@
 package google.registry.model.eppcommon;
 
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
-
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlTransient;
 
 /**

java/google/registry/model/eppcommon/ProtocolDefinition.java

@@ -21,7 +21,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-
 import google.registry.model.domain.allocate.AllocateCreateExtension;
 import google.registry.model.domain.fee.FeeCheckExtension;
 import google.registry.model.domain.launch.LaunchCreateExtension;
@@ -29,10 +28,8 @@ import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.domain.rgp.RgpUpdateExtension;
 import google.registry.model.domain.secdns.SecDnsCreateExtension;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-
 import java.util.EnumSet;
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlSchema;
 
 /** Constants that define the EPP protocol version we support. */

java/google/registry/model/eppcommon/StatusValue.java

@@ -20,7 +20,6 @@ import static com.google.common.base.Strings.nullToEmpty;
 
 import google.registry.model.translators.EnumToAttributeAdapter.EppEnum;
 import google.registry.model.translators.StatusValueAdapter;
-
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**

java/google/registry/model/eppcommon/Trid.java

@@ -16,15 +16,11 @@ package google.registry.model.eppcommon;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.BaseEncoding;
-
 import com.googlecode.objectify.annotation.Embed;
-
 import google.registry.model.ImmutableObject;
-
 import java.nio.ByteBuffer;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 

java/google/registry/model/eppinput/EppInput.java

@@ -20,7 +20,6 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.contact.ContactCommand;
 import google.registry.model.domain.DomainCommand;
@@ -43,10 +42,8 @@ import google.registry.model.domain.secdns.SecDnsUpdateExtension;
 import google.registry.model.eppinput.ResourceCommand.ResourceCheck;
 import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
 import google.registry.model.host.HostCommand;
-
 import java.util.List;
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;

java/google/registry/model/eppinput/ResourceCommand.java

@@ -20,17 +20,14 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-
 import google.registry.model.Buildable.Builder;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppcommon.AuthInfo;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.util.TypeUtils.TypeInstantiator;
-
 import java.util.List;
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlTransient;

java/google/registry/model/eppoutput/CheckData.java

@@ -15,10 +15,8 @@
 package google.registry.model.eppoutput;
 
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppoutput.EppResponse.ResponseData;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;

java/google/registry/model/eppoutput/CreateData.java

@@ -15,13 +15,11 @@
 package google.registry.model.eppoutput;
 
 import google.registry.model.eppoutput.EppResponse.ResponseData;
-
-import org.joda.time.DateTime;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
+import org.joda.time.DateTime;
 
 /** The {@link ResponseData} returned when creating a resource. */
 @XmlTransient

java/google/registry/model/eppoutput/EppOutput.java

@@ -15,9 +15,7 @@
 package google.registry.model.eppoutput;
 
 import com.google.common.annotations.VisibleForTesting;
-
 import google.registry.model.ImmutableObject;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlRootElement;

java/google/registry/model/eppoutput/EppResponse.java

@@ -15,7 +15,6 @@
 package google.registry.model.eppoutput;
 
 import com.google.common.collect.ImmutableList;
-
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.contact.ContactResource;
@@ -48,15 +47,13 @@ import google.registry.model.poll.PendingActionNotificationResponse.ContactPendi
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.transfer.TransferResponse.ContactTransferResponse;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
-
-import org.joda.time.DateTime;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlElementRefs;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
+import org.joda.time.DateTime;
 
 /**
  * The EppResponse class represents an EPP response message.

java/google/registry/model/eppoutput/Greeting.java

@@ -18,13 +18,10 @@ import google.registry.model.ImmutableObject;
 import google.registry.model.eppcommon.PresenceMarker;
 import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.model.eppoutput.EppOutput.ResponseOrGreeting;
-
-import org.joda.time.DateTime;
-
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
+import org.joda.time.DateTime;
 
 /**
  * A greeting, defined in {@link "http://tools.ietf.org/html/rfc5730"}.